paulononato/backstage
1
0
Fork 0
Code Issues Pull Requests Actions 15 Packages Projects Releases Wiki Activity

chore: migrate three packages to MSW v2

Browse Source 
Migrates test files in config-loader, events-node and kubernetes-react
packages from MSW 1.x to MSW 2.x API to fix compatibility issues with
Jest 30 and JSDOM v26.

Changes:
- Updated msw dependency from ^1.0.0 to ^2.0.0
- Changed imports from `rest` to `http` and `HttpResponse`
- Converted handler syntax from `res(ctx.*)` to `HttpResponse.*`
- Changed `toStrictEqual` to `toEqual` for response assertions

Affected packages:
- @backstage/config-loader
- @backstage/plugin-events-node
- @backstage/plugin-kubernetes-react

Signed-off-by: Johan Persson <johanopersson@gmail.com>
This commit is contained in:
Johan Persson
2025-12-02 15:52:05 +01:00
parent cd0b8a11a3
commit e70ff47db3
8 changed files with 182 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/events-node/src/api/DefaultEventsService.test.ts
+52 -57
View File
@@ -17,7 +17,7 @@
import { DefaultEventsService } from './DefaultEventsService';
import { EventParams } from './EventParams';
import { EVENTS_NOTIFY_TIMEOUT_HEADER } from './EventsService';
import { rest } from 'msw';
import { http, HttpResponse } from 'msw';
import { setupServer } from 'msw/node';
import {
mockServices,
@@ -129,18 +129,18 @@ describe('DefaultEventsService', () => {
});
mswServer.use(
rest.put(
http.put(
'http://localhost:0/api/events/bus/v1/subscriptions/a.tester',
(_req, res, ctx) => res(ctx.status(200)),
() => new HttpResponse(null, { status: 200 }),
),
rest.get(
http.get(
'http://localhost:0/api/events/bus/v1/subscriptions/a.tester/events',
(_req, res, ctx) =>
res(
ctx.status(200),
ctx.json({
() =>
HttpResponse.json(
{
events: [{ topic: 'test', payload: { foo: 'bar' } }],
}),
},
{ status: 200 },
),
),
);
@@ -180,38 +180,36 @@ describe('DefaultEventsService', () => {
});
mswServer.use(
rest.put(
http.put(
'http://localhost:0/api/events/bus/v1/subscriptions/a.tester',
(_req, res, ctx) => res(ctx.status(200)),
() => new HttpResponse(null, { status: 200 }),
),
// The first and third calls result in a blocking 202 that is resolved after 100ms
// The second and fourth calls result in a 200 with an event
// The fifth call blocks until the end of the test
// No more than 5 calls should be made
rest.get(
http.get(
'http://localhost:0/api/events/bus/v1/subscriptions/a.tester/events',
(_req, res, ctx) => {
() => {
callCount += 1;
if (callCount === 1 || callCount === 3) {
return res(
ctx.status(202),
ctx.body(
new ReadableStream({
start(controller) {
setTimeout(() => controller.close(), 100);
},
}),
),
return new HttpResponse(
new ReadableStream({
start(controller) {
setTimeout(() => controller.close(), 100);
},
}),
{ status: 202 },
);
} else if (callCount === 2 || callCount === 4) {
return res(
ctx.status(200),
ctx.json({
return HttpResponse.json(
{
events: [{ topic: 'test', payload: { callCount } }],
}),
},
{ status: 200 },
);
} else if (callCount === 5) {
return res(ctx.status(202), ctx.body(blockingStream));
return new HttpResponse(blockingStream, { status: 202 });
}
throw new Error(`events endpoint called too many times`);
},
@@ -268,45 +266,42 @@ describe('DefaultEventsService', () => {
});
mswServer.use(
rest.put(
http.put(
'http://localhost:0/api/events/bus/v1/subscriptions/a.tester',
(_req, res, ctx) => res(ctx.status(200)),
() => new HttpResponse(null, { status: 200 }),
),
// The first and third calls result in a blocking 202 that is resolved after 100ms
// The second and fourth calls result in a 200 with an event
// The fifth call blocks until the end of the test
// No more than 5 calls should be made
rest.get(
http.get(
'http://localhost:0/api/events/bus/v1/subscriptions/a.tester/events',
(_req, res, ctx) => {
() => {
callCount += 1;
if (callCount === 1 || callCount === 3) {
return res(
ctx.status(202),
ctx.body(
new ReadableStream({
start(controller) {
setTimeout(() => controller.close(), 100);
},
}),
),
return new HttpResponse(
new ReadableStream({
start(controller) {
setTimeout(() => controller.close(), 100);
},
}),
{ status: 202 },
);
} else if (callCount === 2 || callCount === 4) {
return res(
ctx.status(200),
ctx.json({
return HttpResponse.json(
{
events: [{ topic: 'test', payload: { callCount } }],
}),
},
{ status: 200 },
);
} else if (callCount === 5) {
// 5th call has a timeout header so polling should proceed to the next call
return res(
ctx.set(EVENTS_NOTIFY_TIMEOUT_HEADER, '100'),
ctx.status(202),
ctx.body(blockingStream),
);
return new HttpResponse(blockingStream, {
status: 202,
headers: { [EVENTS_NOTIFY_TIMEOUT_HEADER]: '100' },
});
} else if (callCount === 6) {
return res(ctx.status(202), ctx.body(blockingStream));
return new HttpResponse(blockingStream, { status: 202 });
}
throw new Error(`events endpoint called too many times`);
},
@@ -358,11 +353,11 @@ describe('DefaultEventsService', () => {
let calledApi = false;
mswServer.use(
rest.put(
http.put(
'http://localhost:0/api/events/bus/v1/subscriptions/a.tester',
(_req, res, ctx) => {
() => {
calledApi = true;
res(ctx.status(200));
return new HttpResponse(null, { status: 200 });
},
),
);
@@ -393,9 +388,9 @@ describe('DefaultEventsService', () => {
});
mswServer.use(
rest.put(
http.put(
'http://localhost:0/api/events/bus/v1/subscriptions/a.tester',
(_req, res, ctx) => res(ctx.status(404)),
() => new HttpResponse(null, { status: 404 }),
),
);
@@ -432,9 +427,9 @@ describe('DefaultEventsService', () => {
});
mswServer.use(
rest.put(
http.put(
'http://localhost:0/api/events/bus/v1/subscriptions/a.tester',
(_req, res, ctx) => res(ctx.status(404)),
() => new HttpResponse(null, { status: 404 }),
),
);