Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,16 @@
"@types/semver": "^7.7.0",
"@types/xml2js": "^0.4.14",
"@types/yargs": "^17.0.33",
"eslint": "10.11.0",
"eslint": "10.12.0",
"eslint-config-prettier": "^10.1.8",
"globals": "^17.7.0",
"husky": "^9.1.7",
"lint-staged": "^17.3.0",
"msw": "^2.7.5",
"prettier": "3.9.9",
"msw": "^3.0.3",

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Migrate test imports before adopting MSW 3

When the mocked test suites start against this version, they cannot load because they still import http and HttpResponse from the msw root (for example, src/tests/result-upload.spec.ts:1), while MSW 3 moved those exports to msw/http; the three strict mock servers also still use onUnhandledRequest, which was renamed to onUnhandledFrame. The official 2.x→3.x migration guide documents both breaking changes. Migrate these call sites as part of this bump or retain MSW 2; otherwise pnpm test fails during module loading and the intended unhandled-request enforcement is lost.

Useful? React with 👍 / 👎.

"prettier": "3.9.10",
"ts-add-js-extension": "^1.6.6",
"typescript": "^6.0.3",
"typescript-eslint": "8.70.1",
"typescript-eslint": "8.71.2",
"vite": "^8.2.1",
"vitest": "^5.0.0"
},
Expand Down
914 changes: 394 additions & 520 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/tests/api/test-helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
afterAll,
afterEach,
} from 'vitest'
import { setupServer, type SetupServerApi } from 'msw/node'
import { setupServer, type SetupServer } from 'msw/node'
import type { RequestHandler } from 'msw'
import { createApi } from '../../api/index'
import { randomBytes } from 'node:crypto'
Expand Down Expand Up @@ -84,7 +84,7 @@ function mockConsoleLog() {
return spy
}

export function useMockServer(...handlers: RequestHandler[]): SetupServerApi {
export function useMockServer(...handlers: RequestHandler[]): SetupServer {
const server = setupServer(...handlers)
beforeAll(() => server.listen())
afterAll(() => server.close())
Expand Down
2 changes: 1 addition & 1 deletion src/tests/auth-e2e.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ async function runCommand(args: string) {
return freshRun(args.split(' '))
}

beforeAll(() => server.listen({ onUnhandledRequest: 'error' }))
beforeAll(() => server.listen({ onUnhandledFrame: 'error' }))
afterAll(() => server.close())

beforeEach(() => {
Expand Down
2 changes: 1 addition & 1 deletion src/tests/bearer-upload.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ async function runFresh(args: string) {
await run(args.split(' '))
}

beforeAll(() => server.listen({ onUnhandledRequest: 'error' }))
beforeAll(() => server.listen({ onUnhandledFrame: 'error' }))
afterAll(() => server.close())

beforeEach(() => {
Expand Down
2 changes: 1 addition & 1 deletion src/tests/result-upload.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ const server = setupServer(
)

beforeAll(() => {
server.listen({ onUnhandledRequest: 'error' })
server.listen({ onUnhandledFrame: 'error' })
})
afterAll(() => {
server.close()
Expand Down
4 changes: 2 additions & 2 deletions src/tests/utils.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { SetupServerApi } from 'msw/node'
import { SetupServer } from 'msw/node'

export const countMockedApiCalls = (
server: SetupServerApi,
server: SetupServer,
url: string | RegExp | ((req: Request) => boolean)
) => {
let count = 0
Expand Down
Loading