Skip to content

Commit 7baa9a0

Browse files
committed
refactor(test): replace getOne with getOneOrFail to eliminate non-null assertions
1 parent 77db4e7 commit 7baa9a0

55 files changed

Lines changed: 955 additions & 977 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎test/functional/columns/virtual-columns/virtual-columns.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,9 +281,9 @@ describe("column > virtual columns", () => {
281281
// "employees.timesheets.id": "DESC",
282282
// //"employees.timesheets.totalActivityHours": "ASC",
283283
//})
284-
.getOne()
284+
.getOneOrFail()
285285

286-
const foundEmployee = companyQueryData!.employees.find(
286+
const foundEmployee = companyQueryData.employees.find(
287287
(e) => e.name === company.employees[0].name,
288288
)!
289289
const [foundEmployeeTimeSheet] = foundEmployee.timesheets

‎test/functional/decorators/relation-id/relation-id-many-to-many/relation-id-decorator-many-to-many.test.ts‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@ describe("decorators > relation-id-decorator > many-to-many", () => {
6464
const loadedPost = await dataSource.manager
6565
.createQueryBuilder(Post, "post")
6666
.where("post.id = :id", { id: 1 })
67-
.getOne()
67+
.getOneOrFail()
6868

69-
expect(loadedPost!.categoryIds).to.not.be.eql([])
70-
expect(loadedPost!.categoryIds[0]).to.be.equal(1)
71-
expect(loadedPost!.categoryIds[1]).to.be.equal(2)
69+
expect(loadedPost.categoryIds).to.not.be.eql([])
70+
expect(loadedPost.categoryIds[0]).to.be.equal(1)
71+
expect(loadedPost.categoryIds[1]).to.be.equal(2)
7272
}),
7373
))
7474

@@ -118,11 +118,11 @@ describe("decorators > relation-id-decorator > many-to-many", () => {
118118
const loadedPost = await dataSource.manager
119119
.createQueryBuilder(Post, "post")
120120
.where("post.id = :id", { id: 1 })
121-
.getOne()
121+
.getOneOrFail()
122122

123-
expect(loadedPost!.removedCategoryIds).to.not.be.eql([])
124-
expect(loadedPost!.removedCategoryIds.length).to.be.equal(1)
125-
expect(loadedPost!.removedCategoryIds[0]).to.be.equal(2)
123+
expect(loadedPost.removedCategoryIds).to.not.be.eql([])
124+
expect(loadedPost.removedCategoryIds.length).to.be.equal(1)
125+
expect(loadedPost.removedCategoryIds[0]).to.be.equal(2)
126126
}),
127127
))
128128

@@ -148,11 +148,11 @@ describe("decorators > relation-id-decorator > many-to-many", () => {
148148
const loadedPost = await dataSource.manager
149149
.createQueryBuilder(Post, "post")
150150
.where("post.id = :id", { id: 1 })
151-
.getOne()
151+
.getOneOrFail()
152152

153-
expect(loadedPost!.subcategoryIds).to.not.be.eql([])
154-
expect(loadedPost!.subcategoryIds[0]).to.be.equal(1)
155-
expect(loadedPost!.subcategoryIds[1]).to.be.equal(2)
153+
expect(loadedPost.subcategoryIds).to.not.be.eql([])
154+
expect(loadedPost.subcategoryIds[0]).to.be.equal(1)
155+
expect(loadedPost.subcategoryIds[1]).to.be.equal(2)
156156
}),
157157
))
158158

@@ -179,11 +179,11 @@ describe("decorators > relation-id-decorator > many-to-many", () => {
179179
const loadedPost = await dataSource.manager
180180
.createQueryBuilder(Post, "post")
181181
.where("post.id = :id", { id: 1 })
182-
.getOne()
182+
.getOneOrFail()
183183

184-
expect(loadedPost!.removedSubcategoryIds).to.not.be.eql([])
185-
expect(loadedPost!.removedSubcategoryIds.length).to.be.equal(1)
186-
expect(loadedPost!.removedSubcategoryIds[0]).to.be.equal(2)
184+
expect(loadedPost.removedSubcategoryIds).to.not.be.eql([])
185+
expect(loadedPost.removedSubcategoryIds.length).to.be.equal(1)
186+
expect(loadedPost.removedSubcategoryIds[0]).to.be.equal(2)
187187
}),
188188
))
189189

@@ -210,11 +210,11 @@ describe("decorators > relation-id-decorator > many-to-many", () => {
210210
const loadedCategory = await dataSource.manager
211211
.createQueryBuilder(Category, "category")
212212
.where("category.id = :id", { id: 1 })
213-
.getOne()
213+
.getOneOrFail()
214214

215-
expect(loadedCategory!.postIds).to.not.be.eql([])
216-
expect(loadedCategory!.postIds[0]).to.be.equal(1)
217-
expect(loadedCategory!.postIds[1]).to.be.equal(2)
215+
expect(loadedCategory.postIds).to.not.be.eql([])
216+
expect(loadedCategory.postIds[0]).to.be.equal(1)
217+
expect(loadedCategory.postIds[1]).to.be.equal(2)
218218
}),
219219
))
220220

@@ -242,11 +242,11 @@ describe("decorators > relation-id-decorator > many-to-many", () => {
242242
const loadedCategory = await dataSource.manager
243243
.createQueryBuilder(Category, "category")
244244
.where("category.id = :id", { id: 1 })
245-
.getOne()
245+
.getOneOrFail()
246246

247-
expect(loadedCategory!.removedPostIds).to.not.be.eql([])
248-
expect(loadedCategory!.removedPostIds.length).to.be.equal(1)
249-
expect(loadedCategory!.removedPostIds[0]).to.be.equal(2)
247+
expect(loadedCategory.removedPostIds).to.not.be.eql([])
248+
expect(loadedCategory.removedPostIds.length).to.be.equal(1)
249+
expect(loadedCategory.removedPostIds[0]).to.be.equal(2)
250250
}),
251251
))
252252

@@ -329,17 +329,17 @@ describe("decorators > relation-id-decorator > many-to-many", () => {
329329
.leftJoinAndSelect("post.categories", "categories")
330330
.addOrderBy("post.id, categories.id")
331331
.where("post.id = :id", { id: 1 })
332-
.getOne()
333-
334-
expect(loadedPost!.categories).to.not.be.eql([])
335-
expect(loadedPost!.categoryIds).to.not.be.eql([])
336-
expect(loadedPost!.categoryIds.length).to.be.equal(2)
337-
expect(loadedPost!.categoryIds[0]).to.be.equal(1)
338-
expect(loadedPost!.categoryIds[1]).to.be.equal(2)
339-
expect(loadedPost!.categories[0].imageIds).to.not.be.eql([])
340-
expect(loadedPost!.categories[0].imageIds.length).to.be.equal(2)
341-
expect(loadedPost!.categories[0].imageIds[0]).to.be.equal(1)
342-
expect(loadedPost!.categories[0].imageIds[1]).to.be.equal(2)
332+
.getOneOrFail()
333+
334+
expect(loadedPost.categories).to.not.be.eql([])
335+
expect(loadedPost.categoryIds).to.not.be.eql([])
336+
expect(loadedPost.categoryIds.length).to.be.equal(2)
337+
expect(loadedPost.categoryIds[0]).to.be.equal(1)
338+
expect(loadedPost.categoryIds[1]).to.be.equal(2)
339+
expect(loadedPost.categories[0].imageIds).to.not.be.eql([])
340+
expect(loadedPost.categories[0].imageIds.length).to.be.equal(2)
341+
expect(loadedPost.categories[0].imageIds[0]).to.be.equal(1)
342+
expect(loadedPost.categories[0].imageIds[1]).to.be.equal(2)
343343
}),
344344
))
345345

@@ -378,9 +378,9 @@ describe("decorators > relation-id-decorator > many-to-many", () => {
378378
.where("post.id = :id", { id: 1 })
379379
.setParameter("categoryCode", 2)
380380
.addOrderBy("post.id, categories.id")
381-
.getOne()
381+
.getOneOrFail()
382382

383-
expect(loadedPost!.categories).to.be.eql([])
383+
expect(loadedPost.categories).to.be.eql([])
384384
}),
385385
))
386386

@@ -473,21 +473,21 @@ describe("decorators > relation-id-decorator > many-to-many", () => {
473473
.leftJoinAndSelect("post.categories", "categories")
474474
.addOrderBy("post.id, categories.id")
475475
.where("post.id = :id", { id: 1 })
476-
.getOne()
476+
.getOneOrFail()
477477

478-
expect(loadedPost!.categories).to.not.be.eql([])
479-
expect(loadedPost!.categoryIds).to.not.be.eql([])
480-
expect(loadedPost!.removedCategoryIds.length).to.be.equal(1)
481-
expect(loadedPost!.removedCategoryIds[0]).to.be.equal(2)
482-
expect(loadedPost!.categories[0].removedImageIds).to.not.be.eql(
478+
expect(loadedPost.categories).to.not.be.eql([])
479+
expect(loadedPost.categoryIds).to.not.be.eql([])
480+
expect(loadedPost.removedCategoryIds.length).to.be.equal(1)
481+
expect(loadedPost.removedCategoryIds[0]).to.be.equal(2)
482+
expect(loadedPost.categories[0].removedImageIds).to.not.be.eql(
483483
[],
484484
)
485485
expect(
486-
loadedPost!.categories[0].removedImageIds.length,
486+
loadedPost.categories[0].removedImageIds.length,
487487
).to.be.equal(1)
488-
expect(
489-
loadedPost!.categories[0].removedImageIds[0],
490-
).to.be.equal(2)
488+
expect(loadedPost.categories[0].removedImageIds[0]).to.be.equal(
489+
2,
490+
)
491491
}),
492492
))
493493
})

‎test/functional/decorators/relation-id/relation-id-many-to-one/relation-id-decorator-many-to-one.test.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,12 @@ describe("decorators > relation-id-decorator > many-to-one", () => {
7373
const loadedPost = await dataSource.manager
7474
.createQueryBuilder(Post, "post")
7575
.where("post.id = :id", { id: 1 })
76-
.getOne()
76+
.getOneOrFail()
7777

78-
expect(loadedPost!.categoryId).to.not.be.undefined
79-
expect(loadedPost!.categoryId).to.be.equal(1)
80-
expect(loadedPost!.categoryName).to.not.be.undefined
81-
expect(loadedPost!.categoryName).to.be.equal("BMW")
78+
expect(loadedPost.categoryId).to.not.be.undefined
79+
expect(loadedPost.categoryId).to.be.equal(1)
80+
expect(loadedPost.categoryName).to.not.be.undefined
81+
expect(loadedPost.categoryName).to.be.equal("BMW")
8282
}),
8383
))
8484
})

‎test/functional/decorators/relation-id/relation-id-one-to-many/relation-id-decorator-one-to-many.test.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@ describe("decorators > relation-id > one-to-many", () => {
6464
const loadedCategory = await dataSource.manager
6565
.createQueryBuilder(Category, "category")
6666
.where("category.id = :id", { id: 1 })
67-
.getOne()
67+
.getOneOrFail()
6868

69-
expect(loadedCategory!.postIds.length).to.be.equal(2)
70-
expect(loadedCategory!.postIds[0]).to.be.equal(1)
71-
expect(loadedCategory!.postIds[1]).to.be.equal(2)
69+
expect(loadedCategory.postIds.length).to.be.equal(2)
70+
expect(loadedCategory.postIds[0]).to.be.equal(1)
71+
expect(loadedCategory.postIds[1]).to.be.equal(2)
7272
}),
7373
))
7474

@@ -120,11 +120,11 @@ describe("decorators > relation-id > one-to-many", () => {
120120
const loadedCategory = await dataSource.manager
121121
.createQueryBuilder(Category, "category")
122122
.where("category.id = :id", { id: 1 })
123-
.getOne()
123+
.getOneOrFail()
124124

125-
expect(loadedCategory!.removedPostIds).to.not.be.eql([])
126-
expect(loadedCategory!.removedPostIds.length).to.be.equal(1)
127-
expect(loadedCategory!.removedPostIds[0]).to.be.equal(2)
125+
expect(loadedCategory.removedPostIds).to.not.be.eql([])
126+
expect(loadedCategory.removedPostIds.length).to.be.equal(1)
127+
expect(loadedCategory.removedPostIds[0]).to.be.equal(2)
128128
}),
129129
))
130130
})

‎test/functional/decorators/relation-id/relation-id-one-to-one/relation-id-decorator-one-to-one.test.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,12 @@ describe("decorators > relation-id > one-to-one", () => {
7373
const loadedPost = await dataSource.manager
7474
.createQueryBuilder(Post, "post")
7575
.where("post.id = :id", { id: 1 })
76-
.getOne()
76+
.getOneOrFail()
7777

78-
expect(loadedPost!.categoryId).to.not.be.undefined
79-
expect(loadedPost!.categoryId).to.be.equal(1)
80-
expect(loadedPost!.categoryName).to.not.be.undefined
81-
expect(loadedPost!.categoryName).to.be.equal("BMW")
78+
expect(loadedPost.categoryId).to.not.be.undefined
79+
expect(loadedPost.categoryId).to.be.equal(1)
80+
expect(loadedPost.categoryName).to.not.be.undefined
81+
expect(loadedPost.categoryName).to.be.equal("BMW")
8282
}),
8383
))
8484

@@ -120,10 +120,10 @@ describe("decorators > relation-id > one-to-one", () => {
120120
const loadedCategory = await dataSource.manager
121121
.createQueryBuilder(Category, "category")
122122
.where("category.id = :id", { id: 1 })
123-
.getOne()
123+
.getOneOrFail()
124124

125-
expect(loadedCategory!.postId).to.not.be.undefined
126-
expect(loadedCategory!.postId).to.be.equal(1)
125+
expect(loadedCategory.postId).to.not.be.undefined
126+
expect(loadedCategory.postId).to.be.equal(1)
127127
}),
128128
))
129129
})

‎test/functional/embedded/embedded-listeners/embedded-listeners.test.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ describe("other issues > entity listeners must work in embeddeds as well", () =>
2929
const loadedPost = await dataSource.manager
3030
.createQueryBuilder(Post, "post")
3131
.where("post.id = :id", { id: post.id })
32-
.getOne()
32+
.getOneOrFail()
3333

3434
expect(loadedPost).not.to.be.null
35-
expect(loadedPost!.title).not.to.be.undefined
36-
expect(loadedPost!.text).not.to.be.undefined
37-
loadedPost!.title.should.be.equal("Super title")
38-
loadedPost!.text.should.be.equal("About this post")
35+
expect(loadedPost.title).not.to.be.undefined
36+
expect(loadedPost.text).not.to.be.undefined
37+
loadedPost.title.should.be.equal("Super title")
38+
loadedPost.text.should.be.equal("About this post")
3939
}),
4040
))
4141
})

‎test/functional/embedded/embedded-many-to-many-case1/embedded-many-to-many-case1.test.ts‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -137,10 +137,10 @@ describe("embedded > embedded-many-to-many-case1", () => {
137137
)
138138
.orderBy("likedUser.id")
139139
.where("post.id = :id", { id: 1 })
140-
.getOne()
140+
.getOneOrFail()
141141

142142
expect(
143-
loadedPost!.should.be.eql({
143+
loadedPost.should.be.eql({
144144
id: 1,
145145
title: "About cars",
146146
counters: {
@@ -166,10 +166,10 @@ describe("embedded > embedded-many-to-many-case1", () => {
166166
}),
167167
)
168168

169-
loadedPost!.counters.favorites += 1
170-
loadedPost!.counters.subcounters.watches += 1
171-
loadedPost!.counters.likedUsers = [user1]
172-
await postRepository.save(loadedPost!)
169+
loadedPost.counters.favorites += 1
170+
loadedPost.counters.subcounters.watches += 1
171+
loadedPost.counters.likedUsers = [user1]
172+
await postRepository.save(loadedPost)
173173

174174
const loadedPost2 = await dataSource.manager
175175
.createQueryBuilder(Post, "post")
@@ -179,10 +179,10 @@ describe("embedded > embedded-many-to-many-case1", () => {
179179
)
180180
.orderBy("likedUser.id")
181181
.where("post.id = :id", { id: 1 })
182-
.getOne()
182+
.getOneOrFail()
183183

184184
expect(
185-
loadedPost2!.should.be.eql({
185+
loadedPost2.should.be.eql({
186186
id: 1,
187187
title: "About cars",
188188
counters: {
@@ -204,7 +204,7 @@ describe("embedded > embedded-many-to-many-case1", () => {
204204
}),
205205
)
206206

207-
await postRepository.remove(loadedPost2!)
207+
await postRepository.remove(loadedPost2)
208208

209209
const loadedPosts2 = (await postRepository.find())!
210210
expect(loadedPosts2.length).to.be.equal(1)
@@ -354,10 +354,10 @@ describe("embedded > embedded-many-to-many-case1", () => {
354354
.leftJoinAndSelect("user.likedPosts", "likedPost")
355355
.orderBy("likedPost.id")
356356
.where("user.id = :id", { id: 1 })
357-
.getOne()
357+
.getOneOrFail()
358358

359359
expect(
360-
loadedUser!.should.be.eql({
360+
loadedUser.should.be.eql({
361361
id: 1,
362362
name: "Alice",
363363
likedPosts: [
@@ -393,19 +393,19 @@ describe("embedded > embedded-many-to-many-case1", () => {
393393
}),
394394
)
395395

396-
loadedUser!.name = "Anna"
397-
loadedUser!.likedPosts = [post1]
398-
await dataSource.getRepository(User).save(loadedUser!)
396+
loadedUser.name = "Anna"
397+
loadedUser.likedPosts = [post1]
398+
await dataSource.getRepository(User).save(loadedUser)
399399

400400
const loadedUser2 = await dataSource.manager
401401
.createQueryBuilder(User, "user")
402402
.leftJoinAndSelect("user.likedPosts", "likedPost")
403403
.orderBy("likedPost.id")
404404
.where("user.id = :id", { id: 1 })
405-
.getOne()
405+
.getOneOrFail()
406406

407407
expect(
408-
loadedUser2!.should.be.eql({
408+
loadedUser2.should.be.eql({
409409
id: 1,
410410
name: "Anna",
411411
likedPosts: [
@@ -427,7 +427,7 @@ describe("embedded > embedded-many-to-many-case1", () => {
427427
}),
428428
)
429429

430-
await dataSource.getRepository(User).remove(loadedUser2!)
430+
await dataSource.getRepository(User).remove(loadedUser2)
431431

432432
const loadedUsers2 = (await dataSource
433433
.getRepository(User)

0 commit comments

Comments
 (0)