Merge pull request #33891 from backstage/rugvip/move-registermswtesthooks-to-test-utils

integration: use registerMswTestHooks from backend-test-utils

.changeset/move-registermswtesthooks-to-test-utils.md

@@ -0,0 +1,5 @@
+---
+'@backstage/integration': patch
+---
+
+Moved `registerMswTestHooks` to test files.

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"

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,

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,

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,

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,

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', () => {

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,

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());
-}

yarn.lock

@@ -3939,6 +3939,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:^"