Skip to content

refactor(test): replace findOne with findOneOrFail to eliminate non-null assertions #12325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pkuczynski merged 10 commits into from
Apr 8, 2026
Merged

refactor(test): replace findOne with findOneOrFail to eliminate non-null assertions #12325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
98f01ad
refactor(test): replace findOne with findOneOrFail to eliminate non-n…
pkuczynski Apr 8, 2026
77db4e7
fix(test): revert findOneOrFail where test expects null after rollback
pkuczynski Apr 8, 2026
7baa9a0
refactor(test): replace getOne with getOneOrFail to eliminate non-nul…
pkuczynski Apr 8, 2026
f56ffb3
fix(test): revert getOneOrFail where test expects null result
pkuczynski Apr 8, 2026
9aa1f35
fix(test): revert more OrFail calls where tests expect null results
pkuczynski Apr 8, 2026
0b899dd
Merge remote-tracking branch 'origin/master' into refactor/tests-use-…
pkuczynski Apr 8, 2026
3b72167
fix(test): rename loadedfeature to loadedFeature for camelCase conven…
pkuczynski Apr 8, 2026
3860eb0
fix(test): replace non-null assertions with optional chaining per Son…
pkuczynski Apr 8, 2026
bb6302c
refactor(test): simplify findOneOrFail({ where }) to findOneByOrFail
pkuczynski Apr 8, 2026
a32636f
fix(test): remove unnecessary non-null assertions on OrFail results
pkuczynski Apr 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions test/core/column-kinds/create-date-column/create-date-column.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,11 @@ describe("column kinds > create date column", () => {
await postRepository.save(post)

// load and check if createdAt is a date (generated by db)
const loadedPost = await postRepository.findOneBy({
const loadedPost = await postRepository.findOneByOrFail({
id: post.id,
})
expect(loadedPost).to.be.not.empty
expect(loadedPost!.title).to.be.eql("Post")
expect(loadedPost!.createdAt).to.be.instanceOf(Date)
expect(loadedPost.title).to.be.eql("Post")
expect(loadedPost.createdAt).to.be.instanceOf(Date)
}),
))

Expand All @@ -55,12 +54,11 @@ describe("column kinds > create date column", () => {
await postRepository.save(post)

// load and check if createdAt was a value set by us
const loadedPost = await postRepository.findOneBy({
const loadedPost = await postRepository.findOneByOrFail({
id: post.id,
})
expect(loadedPost).to.be.not.empty
expect(loadedPost!.title).to.be.eql("Post")
expect(loadedPost!.createdAt).to.be.eql(createdAt)
expect(loadedPost.title).to.be.eql("Post")
expect(loadedPost.createdAt).to.be.eql(createdAt)
}),
))

Expand All @@ -75,9 +73,10 @@ describe("column kinds > create date column", () => {
await postRepository.save(post)

// load to get created date we had after first save
const loadedPostBeforeUpdate = await postRepository.findOneBy({
id: post.id,
})
const loadedPostBeforeUpdate =
await postRepository.findOneByOrFail({
id: post.id,
})

// wait a second
await scheduler.wait(1010)
Expand All @@ -87,11 +86,12 @@ describe("column kinds > create date column", () => {
await postRepository.save(post)

// check if date was created
const loadedPostAfterUpdate = await postRepository.findOneBy({
id: post.id,
})
expect(loadedPostAfterUpdate!.createdAt.toString()).to.be.eql(
loadedPostBeforeUpdate!.createdAt.toString(),
const loadedPostAfterUpdate =
await postRepository.findOneByOrFail({
id: post.id,
})
expect(loadedPostAfterUpdate.createdAt.toString()).to.be.eql(
loadedPostBeforeUpdate.createdAt.toString(),
)
}),
))
Expand All @@ -115,10 +115,10 @@ describe("column kinds > create date column", () => {
await postRepository.save(post)

// check if date was created
const loadedPost = await postRepository.findOneBy({
const loadedPost = await postRepository.findOneByOrFail({
id: post.id,
})
expect(loadedPost!.createdAt).to.be.eql(createdAt)
expect(loadedPost.createdAt).to.be.eql(createdAt)
}),
))
})
42 changes: 18 additions & 24 deletions test/core/column-kinds/geometry-column/geometry-column.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,11 @@ describe("column kinds > geometry column", () => {
await featureRepository.save(feature)

// load and check if createdAt was a value set by us
const loadedfeature = await featureRepository.findOneBy({
const loadedFeature = await featureRepository.findOneByOrFail({
id: feature.id,
})
expect(loadedfeature).to.be.not.empty
expect(loadedfeature!.name).to.be.eql("feature")
expect(loadedfeature!.shape).to.be.eql(
expect(loadedFeature.name).to.be.eql("feature")
expect(loadedFeature.shape).to.be.eql(
"POINT (828365.16700000037 823377.14699999988)",
)
}),
Expand All @@ -56,25 +55,23 @@ describe("column kinds > geometry column", () => {
await featureRepository.save(feature)

// load and check if createdAt was a value set by us
const loadedfeature = await featureRepository.findOneBy({
const loadedFeature = await featureRepository.findOneByOrFail({
id: feature.id,
})
expect(loadedfeature).to.be.not.empty
expect(loadedfeature!.name).to.be.eql("feature")
expect(loadedfeature!.shape).to.be.eql(
expect(loadedFeature.name).to.be.eql("feature")
expect(loadedFeature.shape).to.be.eql(
"POINT (828365.16700000037 823377.14699999988)",
)

feature.shape = "POINT (728365.16700000037 723377.14699999988)"
await featureRepository.save(feature)

// load and check if createdAt is a date (generated by db)
const updatedfeature = await featureRepository.findOneBy({
const updatedFeature = await featureRepository.findOneByOrFail({
id: feature.id,
})
expect(updatedfeature).to.be.not.empty
expect(updatedfeature!.name).to.be.eql("feature")
expect(updatedfeature!.shape).to.be.eql(
expect(updatedFeature.name).to.be.eql("feature")
expect(updatedFeature.shape).to.be.eql(
"POINT (728365.16700000037 723377.14699999988)",
)
}),
Expand All @@ -93,12 +90,11 @@ describe("column kinds > geometry column", () => {
await featureRepository.save(feature)

// load and check if createdAt is a date (generated by db)
const loadedfeature = await featureRepository.findOneBy({
const loadedFeature = await featureRepository.findOneByOrFail({
id: feature.id,
})
expect(loadedfeature).to.be.not.empty
expect(loadedfeature!.name).to.be.eql("feature")
expect(loadedfeature!.shape).to.be.eql("POINT (0 0)")
expect(loadedFeature.name).to.be.eql("feature")
expect(loadedFeature.shape).to.be.eql("POINT (0 0)")
}),
))

Expand All @@ -115,23 +111,21 @@ describe("column kinds > geometry column", () => {
await featureRepository.save(feature)

// load and check if createdAt is a date (generated by db)
const loadedfeature = await featureRepository.findOneBy({
const loadedFeature = await featureRepository.findOneByOrFail({
id: feature.id,
})
expect(loadedfeature).to.be.not.empty
expect(loadedfeature!.name).to.be.eql("feature")
expect(loadedfeature!.shape).to.be.eql("POINT (0 0)")
expect(loadedFeature.name).to.be.eql("feature")
expect(loadedFeature.shape).to.be.eql("POINT (0 0)")

feature.shape = "POINT (0.5 0.5)"
await featureRepository.save(feature)

// load and check if createdAt is a date (generated by db)
const updatedfeature = await featureRepository.findOneBy({
const updatedFeature = await featureRepository.findOneByOrFail({
id: feature.id,
})
expect(updatedfeature).to.be.not.empty
expect(updatedfeature!.name).to.be.eql("feature")
expect(updatedfeature!.shape).to.be.eql("POINT (0.5 0.5)")
expect(updatedFeature.name).to.be.eql("feature")
expect(updatedFeature.shape).to.be.eql("POINT (0.5 0.5)")
}),
))
})
24 changes: 11 additions & 13 deletions test/core/column-kinds/update-date-column/update-date-column.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,11 @@ describe("column kinds > update date column", () => {
await postRepository.save(post)

// load and check if updatedAt is a date (generated by db)
const loadedPost = await postRepository.findOneBy({
const loadedPost = await postRepository.findOneByOrFail({
id: post.id,
})
expect(loadedPost).to.be.not.empty
expect(loadedPost!.title).to.be.eql("Post")
expect(loadedPost!.updatedAt).to.be.instanceOf(Date)
expect(loadedPost.title).to.be.eql("Post")
expect(loadedPost.updatedAt).to.be.instanceOf(Date)
}),
))

Expand All @@ -56,13 +55,13 @@ describe("column kinds > update date column", () => {
await postRepository.save(loadedPost1)

// load and check if version was a value set by us
const loadedPost2 = await postRepository.findOneBy({
const loadedPost2 = await postRepository.findOneByOrFail({
id: post.id,
})

// make sure version is the same
expect(loadedPost2!.title).to.be.eql("Post")
expect(loadedPost2!.updatedAt).to.be.eql(loadedPost1.updatedAt)
expect(loadedPost2.title).to.be.eql("Post")
expect(loadedPost2.updatedAt).to.be.eql(loadedPost1.updatedAt)
}),
))

Expand All @@ -82,12 +81,11 @@ describe("column kinds > update date column", () => {
await postRepository.save(post)

// load and check if updatedAt was a value set by us
const loadedPost = await postRepository.findOneBy({
const loadedPost = await postRepository.findOneByOrFail({
id: post.id,
})
expect(loadedPost).to.be.not.empty
expect(loadedPost!.title).to.be.eql("Post")
expect(loadedPost!.updatedAt).to.be.eql(updatedAt)
expect(loadedPost.title).to.be.eql("Post")
expect(loadedPost.updatedAt).to.be.eql(updatedAt)
}),
))

Expand Down Expand Up @@ -144,10 +142,10 @@ describe("column kinds > update date column", () => {
await postRepository.save(post)

// check if date was updated
const loadedPost = await postRepository.findOneBy({
const loadedPost = await postRepository.findOneByOrFail({
id: post.id,
})
expect(loadedPost!.updatedAt).to.be.eql(updatedAt)
expect(loadedPost.updatedAt).to.be.eql(updatedAt)
}),
))
})
33 changes: 16 additions & 17 deletions test/core/column-kinds/version-column/version-column.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,11 @@ describe("column kinds > version column", () => {
await postRepository.save(post)

// load and check if version is a date (generated by db)
const loadedPost = await postRepository.findOneBy({
const loadedPost = await postRepository.findOneByOrFail({
id: post.id,
})
expect(loadedPost).to.be.not.empty
expect(loadedPost!.title).to.be.eql("Post")
expect(loadedPost!.version).to.be.eql(1)
expect(loadedPost.title).to.be.eql("Post")
expect(loadedPost.version).to.be.eql(1)
}),
))

Expand All @@ -55,13 +54,13 @@ describe("column kinds > version column", () => {
await postRepository.save(loadedPost1)

// load and check if version was a value set by us
const loadedPost2 = await postRepository.findOneBy({
const loadedPost2 = await postRepository.findOneByOrFail({
id: post.id,
})

// make sure version is the same
expect(loadedPost2!.title).to.be.eql("Post")
expect(loadedPost2!.version).to.be.eql(1)
expect(loadedPost2.title).to.be.eql("Post")
expect(loadedPost2.version).to.be.eql(1)
}),
))

Expand All @@ -77,12 +76,11 @@ describe("column kinds > version column", () => {
await postRepository.save(post)

// load and check if version was a value set by us
const loadedPost = await postRepository.findOneBy({
const loadedPost = await postRepository.findOneByOrFail({
id: post.id,
})
expect(loadedPost).to.be.not.empty
expect(loadedPost!.title).to.be.eql("Post")
expect(loadedPost!.version).to.be.eql(5)
expect(loadedPost.title).to.be.eql("Post")
expect(loadedPost.version).to.be.eql(5)
}),
))

Expand All @@ -101,10 +99,11 @@ describe("column kinds > version column", () => {
await postRepository.save(post)

// check if date was updated
const loadedPostAfterUpdate = await postRepository.findOneBy({
id: post.id,
})
expect(loadedPostAfterUpdate!.version).to.be.eql(2)
const loadedPostAfterUpdate =
await postRepository.findOneByOrFail({
id: post.id,
})
expect(loadedPostAfterUpdate.version).to.be.eql(2)
}),
))

Expand All @@ -124,10 +123,10 @@ describe("column kinds > version column", () => {
await postRepository.save(post)

// check if date was updated
const loadedPost = await postRepository.findOneBy({
const loadedPost = await postRepository.findOneByOrFail({
id: post.id,
})
expect(loadedPost!.version).to.be.eql(6)
expect(loadedPost.version).to.be.eql(6)
}),
))
})
6 changes: 3 additions & 3 deletions test/functional/columns/date-utc/date-utc.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@ describe("columns > date utc flag", () => {
event.utcDate = testDate

const savedEvent = await dataSource.manager.save(event)
const result = await dataSource.manager.findOneBy(Event, {
const result = await dataSource.manager.findOneByOrFail(Event, {
id: savedEvent.id,
})

// UTC flag true: should save as 2025-06-01 (UTC date)
expect(result!.utcDate).to.equal("2025-06-01")
expect(result.utcDate).to.equal("2025-06-01")
// UTC flag false (default): should save as 2025-05-31 (local timezone)
expect(result!.localDate).to.equal("2025-05-31")
expect(result.localDate).to.equal("2025-05-31")
}),
))
})
Loading
Loading