From 047a2175e37d985a03b27568174945cb180f313c Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Tue, 14 Apr 2026 14:13:06 +0200 Subject: [PATCH 1/3] integration: use registerMswTestHooks from backend-test-utils Removed the test-only `registerMswTestHooks` function from `helpers.ts` and replaced it with the shared version from `@backstage/backend-test-utils`. Signed-off-by: Patrik Oldsberg Made-with: Cursor --- packages/integration/package.json | 1 + .../integration/src/bitbucketCloud/core.test.ts | 2 +- .../src/bitbucketServer/core.test.ts | 2 +- packages/integration/src/gerrit/core.test.ts | 2 +- packages/integration/src/gitea/core.test.ts | 2 +- .../src/gitlab/GitLabIntegration.test.ts | 2 +- packages/integration/src/harness/core.test.ts | 2 +- packages/integration/src/helpers.ts | 17 ----------------- yarn.lock | 1 + 9 files changed, 8 insertions(+), 23 deletions(-) diff --git a/packages/integration/package.json b/packages/integration/package.json index cff4293c29..fcc030c3fa 100644 --- a/packages/integration/package.json +++ b/packages/integration/package.json @@ -50,6 +50,7 @@ "p-throttle": "^4.1.1" }, "devDependencies": { + "@backstage/backend-test-utils": "workspace:^", "@backstage/cli": "workspace:^", "@backstage/config-loader": "workspace:^", "msw": "^1.0.0" diff --git a/packages/integration/src/bitbucketCloud/core.test.ts b/packages/integration/src/bitbucketCloud/core.test.ts index 4f46b5ad42..cbd5c0588d 100644 --- a/packages/integration/src/bitbucketCloud/core.test.ts +++ b/packages/integration/src/bitbucketCloud/core.test.ts @@ -16,7 +16,7 @@ import { rest } from 'msw'; import { setupServer } from 'msw/node'; -import { registerMswTestHooks } from '../helpers'; +import { registerMswTestHooks } from '@backstage/backend-test-utils'; import { BitbucketCloudIntegrationConfig } from './config'; import { getBitbucketCloudDefaultBranch, diff --git a/packages/integration/src/bitbucketServer/core.test.ts b/packages/integration/src/bitbucketServer/core.test.ts index c1c72b38dd..08deba7c34 100644 --- a/packages/integration/src/bitbucketServer/core.test.ts +++ b/packages/integration/src/bitbucketServer/core.test.ts @@ -16,7 +16,7 @@ import { rest } from 'msw'; import { setupServer } from 'msw/node'; -import { registerMswTestHooks } from '../helpers'; +import { registerMswTestHooks } from '@backstage/backend-test-utils'; import { BitbucketServerIntegrationConfig } from './config'; import { getBitbucketServerDefaultBranch, diff --git a/packages/integration/src/gerrit/core.test.ts b/packages/integration/src/gerrit/core.test.ts index b22b5f2caf..bc5b8c4f53 100644 --- a/packages/integration/src/gerrit/core.test.ts +++ b/packages/integration/src/gerrit/core.test.ts @@ -17,7 +17,7 @@ import { rest } from 'msw'; import { setupServer } from 'msw/node'; import fetch from 'cross-fetch'; -import { registerMswTestHooks } from '../helpers'; +import { registerMswTestHooks } from '@backstage/backend-test-utils'; import { GerritIntegrationConfig } from './config'; import { buildGerritGitilesArchiveUrlFromLocation, diff --git a/packages/integration/src/gitea/core.test.ts b/packages/integration/src/gitea/core.test.ts index e9d7c592f0..c2c9eef4a0 100644 --- a/packages/integration/src/gitea/core.test.ts +++ b/packages/integration/src/gitea/core.test.ts @@ -15,7 +15,7 @@ */ import { setupServer } from 'msw/node'; -import { registerMswTestHooks } from '../helpers'; +import { registerMswTestHooks } from '@backstage/backend-test-utils'; import { GiteaIntegrationConfig } from './config'; import { getGiteaArchiveUrl, diff --git a/packages/integration/src/gitlab/GitLabIntegration.test.ts b/packages/integration/src/gitlab/GitLabIntegration.test.ts index 7489badb8c..7132849a7c 100644 --- a/packages/integration/src/gitlab/GitLabIntegration.test.ts +++ b/packages/integration/src/gitlab/GitLabIntegration.test.ts @@ -22,7 +22,7 @@ import { replaceGitLabUrlType, sleep, } from './GitLabIntegration'; -import { registerMswTestHooks } from '../helpers'; +import { registerMswTestHooks } from '@backstage/backend-test-utils'; // Mock pThrottle to make testing easier jest.mock('p-throttle', () => { diff --git a/packages/integration/src/harness/core.test.ts b/packages/integration/src/harness/core.test.ts index 90f37aaa08..cb4b06f2da 100644 --- a/packages/integration/src/harness/core.test.ts +++ b/packages/integration/src/harness/core.test.ts @@ -15,7 +15,7 @@ */ import { setupServer } from 'msw/node'; -import { registerMswTestHooks } from '../helpers'; +import { registerMswTestHooks } from '@backstage/backend-test-utils'; import { HarnessIntegrationConfig } from './config'; import { getHarnessArchiveUrl, diff --git a/packages/integration/src/helpers.ts b/packages/integration/src/helpers.ts index 9a7012d9ce..9ac2769b76 100644 --- a/packages/integration/src/helpers.ts +++ b/packages/integration/src/helpers.ts @@ -138,20 +138,3 @@ export function defaultScmResolveUrl(options: { } return updated.toString(); } - -/** - * Sets up handlers for request mocking - * - * Copied from test-utils, as that is a frontend-only package - * - * @param worker - service worker - */ -export function registerMswTestHooks(worker: { - listen: (t: any) => void; - close: () => void; - resetHandlers: () => void; -}) { - beforeAll(() => worker.listen({ onUnhandledRequest: 'error' })); - afterAll(() => worker.close()); - afterEach(() => worker.resetHandlers()); -} diff --git a/yarn.lock b/yarn.lock index 294105994d..e71b475b5e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3937,6 +3937,7 @@ __metadata: dependencies: "@azure/identity": "npm:^4.0.0" "@azure/storage-blob": "npm:^12.5.0" + "@backstage/backend-test-utils": "workspace:^" "@backstage/cli": "workspace:^" "@backstage/config": "workspace:^" "@backstage/config-loader": "workspace:^" From b62781fc82336263025cbe748ce34f4f5e54c365 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Wed, 15 Apr 2026 21:03:52 +0200 Subject: [PATCH 2/3] Add changeset for integration package Signed-off-by: Patrik Oldsberg Made-with: Cursor --- .changeset/move-registermswtesthooks-to-test-utils.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/move-registermswtesthooks-to-test-utils.md diff --git a/.changeset/move-registermswtesthooks-to-test-utils.md b/.changeset/move-registermswtesthooks-to-test-utils.md new file mode 100644 index 0000000000..10d78fe767 --- /dev/null +++ b/.changeset/move-registermswtesthooks-to-test-utils.md @@ -0,0 +1,5 @@ +--- +'@backstage/integration': patch +--- + +Moved `registerMswTestHooks` out of production code and into test files using `@backstage/backend-test-utils` instead. From e0dc6f98de44c5153c71bba87c3db2e47b0bee8e Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Wed, 15 Apr 2026 23:03:41 +0200 Subject: [PATCH 3/3] Simplify changeset message Signed-off-by: Patrik Oldsberg Made-with: Cursor --- .changeset/move-registermswtesthooks-to-test-utils.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/move-registermswtesthooks-to-test-utils.md b/.changeset/move-registermswtesthooks-to-test-utils.md index 10d78fe767..aa4de48ab4 100644 --- a/.changeset/move-registermswtesthooks-to-test-utils.md +++ b/.changeset/move-registermswtesthooks-to-test-utils.md @@ -2,4 +2,4 @@ '@backstage/integration': patch --- -Moved `registerMswTestHooks` out of production code and into test files using `@backstage/backend-test-utils` instead. +Moved `registerMswTestHooks` to test files.