Skip to content

fix(test): repair main build — health spec timestamp (post #86/#93 merge)#102

Merged
EmeditWeb merged 1 commit into
mainfrom
hotfix/health-spec-timestamp
Jul 22, 2026
Merged

fix(test): repair main build — health spec timestamp (post #86/#93 merge)#102
EmeditWeb merged 1 commit into
mainfrom
hotfix/health-spec-timestamp

Conversation

@EmeditWeb

Copy link
Copy Markdown
Member

Main's build broke after merging #86 and #93. Both edited health.service.spec.ts; they auto-merged textually with no conflict markers, but the result is type-broken — #86 made checkDatabase's return type require timestamp, while the surviving line-66 mock omits it (TS2345, nest build fails).

One-line fix: add timestamp to the mock. Verified locally: build exit 0, full suite 317/317 pass.

This is a semantic merge collision (each PR green alone, red combined) — following up by adding build && test re-verification on post-merge main to the merge process.

main build broke after #86 and #93 both edited health.service.spec.ts:
they auto-merged textually but #86 made checkDatabase's return require
`timestamp` while the line-66 mock (from #93) omitted it — a semantic
merge collision green in each PR but red on main. Restores tsc build.
@EmeditWeb
EmeditWeb merged commit 7bfe4da into main Jul 22, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant