refactor(test-utils): rename setupRequestMockHandlers to setupMswHandler

Signed-off-by: Camila Belo <camilaibs@gmail.com>

plugins/auth-backend-module-aws-alb-provider/src/helpers.test.ts

@@ -19,7 +19,7 @@ import { JWTHeaderParameters, UnsecuredJWT } from 'jose';
 import NodeCache from 'node-cache';
 import { http, HttpResponse } from 'msw';
 import { setupServer } from 'msw/node';
-import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
+import { setupMswHandlers } from '@backstage/backend-test-utils';
 import { PassportProfile } from '@backstage/plugin-auth-node';
 import { makeProfileInfo, provisionKeyCache } from './helpers';
 
@@ -34,7 +34,7 @@ describe.each([
   ],
 ])('helpers', (region, url) => {
   const server = setupServer();
-  setupRequestMockHandlers(server);
+  setupMswHandlers(server);
 
   const nodeCache = jest.fn() as unknown as NodeCache;
   nodeCache.set = jest.fn();

plugins/auth-backend-module-cloudflare-access-provider/src/helpers.test.ts

@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-import {
-  mockServices,
-  setupRequestMockHandlers,
-} from '@backstage/backend-test-utils';
+import { mockServices, setupMswHandlers } from '@backstage/backend-test-utils';
 import { ConfigReader } from '@backstage/config';
 import { SignJWT, exportJWK, generateKeyPair } from 'jose';
 import { HttpResponse, http } from 'msw';
@@ -89,7 +86,7 @@ describe('helpers', () => {
   const tokenFactory = new MockTokenFactory();
   const cache = mockServices.cache.mock();
   const server = setupServer();
-  setupRequestMockHandlers(server);
+  setupMswHandlers(server);
 
   beforeEach(() => {
     jest.clearAllMocks();

plugins/auth-backend-module-microsoft-provider/src/authenticator.test.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
+import { setupMswHandlers } from '@backstage/backend-test-utils';
 import { ConfigReader } from '@backstage/config';
 import {
   encodeOAuthState,
@@ -43,7 +43,7 @@ describe('microsoftAuthenticator', () => {
   const microsoftApi = new FakeMicrosoftAPI();
 
   const server = setupServer();
-  setupRequestMockHandlers(server);
+  setupMswHandlers(server);
 
   let implementation: {
     domainHint: string | undefined;

plugins/auth-backend-module-oidc-provider/src/authenticator.test.ts

@@ -23,7 +23,7 @@ import {
 } from '@backstage/plugin-auth-node';
 import { oidcAuthenticator } from './authenticator';
 import { setupServer } from 'msw/node';
-import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
+import { setupMswHandlers } from '@backstage/backend-test-utils';
 import { ConfigReader } from '@backstage/config';
 import { JWK, SignJWT, exportJWK, generateKeyPair } from 'jose';
 import { rest } from 'msw';
@@ -38,7 +38,7 @@ describe('oidcAuthenticator', () => {
   const revokedTokenMap: Record<string, boolean> = {};
 
   const mswServer = setupServer();
-  setupRequestMockHandlers(mswServer);
+  setupMswHandlers(mswServer);
 
   const issuerMetadata = {
     issuer: 'https://oidc.test',

plugins/auth-backend-module-oidc-provider/src/module.test.ts

@@ -20,7 +20,7 @@ import { setupServer } from 'msw/node';
 import { rest } from 'msw';
 import {
   mockServices,
-  setupRequestMockHandlers,
+  setupMswHandlers,
   startTestBackend,
 } from '@backstage/backend-test-utils';
 import { Server } from 'http';
@@ -35,7 +35,7 @@ describe('authModuleOidcProvider', () => {
   let publicKey: JWK;
 
   const mswServer = setupServer();
-  setupRequestMockHandlers(mswServer);
+  setupMswHandlers(mswServer);
 
   const issuerMetadata = {
     issuer: 'https://oidc.test',

plugins/auth-backend-module-pinniped-provider/src/authenticator.test.ts

@@ -23,7 +23,7 @@ import {
 } from '@backstage/plugin-auth-node';
 import { pinnipedAuthenticator } from './authenticator';
 import { setupServer } from 'msw/node';
-import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
+import { setupMswHandlers } from '@backstage/backend-test-utils';
 import { ConfigReader } from '@backstage/config';
 import { JWK, SignJWT, exportJWK, generateKeyPair } from 'jose';
 import { rest } from 'msw';
@@ -37,7 +37,7 @@ describe('pinnipedAuthenticator', () => {
   let publicKey: JWK;
 
   const mswServer = setupServer();
-  setupRequestMockHandlers(mswServer);
+  setupMswHandlers(mswServer);
 
   const issuerMetadata = {
     issuer: 'https://pinniped.test',

plugins/auth-backend-module-pinniped-provider/src/module.test.ts

@@ -15,7 +15,7 @@
  */
 import {
   mockServices,
-  setupRequestMockHandlers,
+  setupMswHandlers,
   startTestBackend,
 } from '@backstage/backend-test-utils';
 import { Server } from 'http';
@@ -32,7 +32,7 @@ describe('authModulePinnipedProvider', () => {
   let publicKey: JWK;
 
   const mswServer = setupServer();
-  setupRequestMockHandlers(mswServer);
+  setupMswHandlers(mswServer);
 
   const issuerMetadata = {
     issuer: 'https://pinniped.test',

plugins/auth-backend-module-vmware-cloud-provider/src/authenticator.test.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
+import { setupMswHandlers } from '@backstage/backend-test-utils';
 import { ConfigReader } from '@backstage/config';
 import {
   AuthResolverContext,
@@ -37,7 +37,7 @@ jest.mock('uid2', () => jest.fn().mockReturnValue('sessionid'));
 
 describe('vmwareCloudAuthenticator', () => {
   const server = setupServer();
-  setupRequestMockHandlers(server);
+  setupMswHandlers(server);
 
   let oAuthState: OAuthState = {
     nonce: 'nonce',

plugins/auth-backend/src/providers/bitbucketServer/provider.test.ts

@@ -22,7 +22,7 @@ import {
   BitbucketServerOAuthResult,
 } from './provider';
 import { setupServer } from 'msw/node';
-import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
+import { setupMswHandlers } from '@backstage/backend-test-utils';
 import { rest } from 'msw';
 import { AuthResolverContext } from '@backstage/plugin-auth-node';
 
@@ -131,7 +131,7 @@ describe('BitbucketServerAuthProvider', () => {
 
   describe('when transforming to type OAuthResponse', () => {
     const server = setupServer();
-    setupRequestMockHandlers(server);
+    setupMswHandlers(server);
 
     it('should map to a valid response', async () => {
       server.use(whoAmIHandler(), getUserHandler());
@@ -311,7 +311,7 @@ describe('BitbucketServerAuthProvider', () => {
 
   describe('when authenticating', () => {
     const server = setupServer();
-    setupRequestMockHandlers(server);
+    setupMswHandlers(server);
 
     it('should forward the refresh token', async () => {
       server.use(whoAmIHandler(), getUserHandler());

plugins/auth-backend/src/providers/oidc/provider.test.ts

@@ -13,10 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {
-  mockServices,
-  setupRequestMockHandlers,
-} from '@backstage/backend-test-utils';
+import { mockServices, setupMswHandlers } from '@backstage/backend-test-utils';
 import { LoggerService } from '@backstage/backend-plugin-api';
 import { Config, ConfigReader } from '@backstage/config';
 import {
@@ -38,7 +35,7 @@ describe('oidc.create', () => {
     nonce: 'foo',
   };
   const server = setupServer();
-  setupRequestMockHandlers(server);
+  setupMswHandlers(server);
 
   let publicKey: JWK;
   let tokenset: object;

plugins/auth-node/src/identity/IdentityClient.test.ts

@@ -15,7 +15,7 @@
  */
 
 import { PluginEndpointDiscovery } from '@backstage/backend-common';
-import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
+import { setupMswHandlers } from '@backstage/backend-test-utils';
 import {
   decodeProtectedHeader,
   exportJWK,
@@ -102,7 +102,7 @@ describe('IdentityClient', () => {
   let factory: FakeTokenFactory;
   const keyDurationSeconds = 5;
 
-  setupRequestMockHandlers(server);
+  setupMswHandlers(server);
 
   beforeEach(() => {
     client = IdentityClient.create({ discovery, issuer: mockBaseUrl });

plugins/catalog-backend-module-azure/src/lib/azure.test.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
+import { setupMswHandlers } from '@backstage/backend-test-utils';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
 import { codeSearch, CodeSearchResponse } from './azure';
@@ -26,7 +26,7 @@ import { ConfigReader } from '@backstage/config';
 
 describe('azure', () => {
   const server = setupServer();
-  setupRequestMockHandlers(server);
+  setupMswHandlers(server);
 
   const createFixture = (host: string, token: string) => {
     const azureConfig = {

plugins/catalog-backend-module-bitbucket-cloud/src/providers/BitbucketCloudEntityProvider.test.ts

@@ -20,10 +20,7 @@ import {
   TaskInvocationDefinition,
   TaskRunner,
 } from '@backstage/backend-tasks';
-import {
-  mockServices,
-  setupRequestMockHandlers,
-} from '@backstage/backend-test-utils';
+import { mockServices, setupMswHandlers } from '@backstage/backend-test-utils';
 import { CatalogApi } from '@backstage/catalog-client';
 import { Entity, LocationEntity } from '@backstage/catalog-model';
 import { ConfigReader } from '@backstage/config';
@@ -62,7 +59,7 @@ const logger = mockServices.logger.mock();
 const server = setupServer();
 
 describe('BitbucketCloudEntityProvider', () => {
-  setupRequestMockHandlers(server);
+  setupMswHandlers(server);
 
   const simpleConfig = new ConfigReader({
     catalog: {

plugins/catalog-backend-module-bitbucket-server/src/lib/BitbucketServerClient.test.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
+import { setupMswHandlers } from '@backstage/backend-test-utils';
 import { BitbucketServerIntegrationConfig } from '@backstage/integration';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
@@ -50,7 +50,7 @@ describe('BitbucketServerClient', () => {
     config: config,
   });
 
-  setupRequestMockHandlers(server);
+  setupMswHandlers(server);
 
   it('listProjects', async () => {
     server.use(

plugins/catalog-backend-module-bitbucket-server/src/providers/BitbucketServerEntityProvider.test.ts

@@ -19,10 +19,7 @@ import {
   TaskInvocationDefinition,
   TaskRunner,
 } from '@backstage/backend-tasks';
-import {
-  mockServices,
-  setupRequestMockHandlers,
-} from '@backstage/backend-test-utils';
+import { mockServices, setupMswHandlers } from '@backstage/backend-test-utils';
 import { ConfigReader } from '@backstage/config';
 import { EntityProviderConnection } from '@backstage/plugin-catalog-node';
 import { rest } from 'msw';
@@ -103,7 +100,7 @@ function setupStubs(projects: Project[], baseUrl: string) {
 }
 
 describe('BitbucketServerEntityProvider', () => {
-  setupRequestMockHandlers(server);
+  setupMswHandlers(server);
   afterEach(() => {
     jest.clearAllMocks();
   });

plugins/catalog-backend-module-gerrit/src/providers/GerritEntityProvider.test.ts

@@ -19,10 +19,7 @@ import {
   TaskInvocationDefinition,
   TaskRunner,
 } from '@backstage/backend-tasks';
-import {
-  mockServices,
-  setupRequestMockHandlers,
-} from '@backstage/backend-test-utils';
+import { mockServices, setupMswHandlers } from '@backstage/backend-test-utils';
 import { ConfigReader } from '@backstage/config';
 import { EntityProviderConnection } from '@backstage/plugin-catalog-node';
 import fs from 'fs-extra';
@@ -57,7 +54,7 @@ class PersistingTaskRunner implements TaskRunner {
 const logger = mockServices.logger.mock();
 
 describe('GerritEntityProvider', () => {
-  setupRequestMockHandlers(server);
+  setupMswHandlers(server);
 
   afterEach(() => {
     jest.clearAllMocks();

plugins/catalog-backend-module-github/src/analyzers/GithubLocationAnalyzer.test.ts

@@ -34,10 +34,7 @@ jest.mock('@octokit/rest', () => {
 
 import { PluginEndpointDiscovery } from '@backstage/backend-common';
 import { GithubLocationAnalyzer } from './GithubLocationAnalyzer';
-import {
-  setupRequestMockHandlers,
-  mockServices,
-} from '@backstage/backend-test-utils';
+import { setupMswHandlers, mockServices } from '@backstage/backend-test-utils';
 import { setupServer } from 'msw/node';
 import { rest } from 'msw';
 import { ConfigReader } from '@backstage/config';
@@ -63,7 +60,7 @@ describe('GithubLocationAnalyzer', () => {
     },
   });
 
-  setupRequestMockHandlers(server);
+  setupMswHandlers(server);
 
   beforeEach(() => {
     server.use(

plugins/catalog-backend-module-github/src/lib/github.test.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
+import { setupMswHandlers } from '@backstage/backend-test-utils';
 import { GroupEntity, UserEntity } from '@backstage/catalog-model';
 import { graphql as graphqlOctokit } from '@octokit/graphql';
 import { graphql as graphqlMsw } from 'msw';
@@ -39,7 +39,7 @@ describe('github', () => {
   const graphql = graphqlOctokit.defaults({ request: { fetch } });
 
   const server = setupServer();
-  setupRequestMockHandlers(server);
+  setupMswHandlers(server);
 
   describe('getOrganizationUsers using defaultUserMapper', () => {
     it('reads members', async () => {

plugins/catalog-backend-module-gitlab/src/GitLabDiscoveryProcessor.test.ts

@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-import {
-  mockServices,
-  setupRequestMockHandlers,
-} from '@backstage/backend-test-utils';
+import { mockServices, setupMswHandlers } from '@backstage/backend-test-utils';
 import { ConfigReader } from '@backstage/config';
 import { LocationSpec } from '@backstage/plugin-catalog-node';
 import { rest, RestRequest } from 'msw';
@@ -157,7 +154,7 @@ function getProcessor({
 }
 
 describe('GitlabDiscoveryProcessor', () => {
-  setupRequestMockHandlers(server);
+  setupMswHandlers(server);
 
   beforeAll(() => {
     jest.useFakeTimers();

plugins/catalog-backend-module-gitlab/src/lib/client.test.ts

@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-import {
-  mockServices,
-  setupRequestMockHandlers,
-} from '@backstage/backend-test-utils';
+import { mockServices, setupMswHandlers } from '@backstage/backend-test-utils';
 import { ConfigReader } from '@backstage/config';
 import { readGitLabIntegrationConfig } from '@backstage/integration';
 import { setupServer } from 'msw/node';
@@ -27,7 +24,7 @@ import { GitLabClient, paginated } from './client';
 import { GitLabGroup, GitLabUser } from './types';
 
 const server = setupServer(...handlers);
-setupRequestMockHandlers(server);
+setupMswHandlers(server);
 
 describe('GitLabClient', () => {
   describe('isSelfManaged', () => {

plugins/catalog-backend-module-gitlab/src/providers/GitlabDiscoveryEntityProvider.test.ts

@@ -19,10 +19,7 @@ import {
   TaskInvocationDefinition,
   TaskRunner,
 } from '@backstage/backend-tasks';
-import {
-  mockServices,
-  setupRequestMockHandlers,
-} from '@backstage/backend-test-utils';
+import { mockServices, setupMswHandlers } from '@backstage/backend-test-utils';
 import { ConfigReader } from '@backstage/config';
 import { EntityProviderConnection } from '@backstage/plugin-catalog-node';
 import { DefaultEventsService } from '@backstage/plugin-events-node';
@@ -32,7 +29,7 @@ import * as mock from '../__testUtils__/mocks';
 import { GitlabDiscoveryEntityProvider } from './GitlabDiscoveryEntityProvider';
 
 const server = setupServer(...handlers);
-setupRequestMockHandlers(server);
+setupMswHandlers(server);
 afterEach(() => jest.clearAllMocks());
 
 class PersistingTaskRunner implements TaskRunner {

plugins/catalog-backend-module-gitlab/src/providers/GitlabOrgDiscoveryEntityProvider.test.ts

@@ -19,10 +19,7 @@ import {
   TaskInvocationDefinition,
   TaskRunner,
 } from '@backstage/backend-tasks';
-import {
-  mockServices,
-  setupRequestMockHandlers,
-} from '@backstage/backend-test-utils';
+import { mockServices, setupMswHandlers } from '@backstage/backend-test-utils';
 import { ConfigReader } from '@backstage/config';
 import { EntityProviderConnection } from '@backstage/plugin-catalog-node';
 import { DefaultEventsService } from '@backstage/plugin-events-node';
@@ -33,7 +30,7 @@ import { GroupNameTransformerOptions } from '../lib/types';
 import { GitlabOrgDiscoveryEntityProvider } from './GitlabOrgDiscoveryEntityProvider';
 
 const server = setupServer(...handlers);
-setupRequestMockHandlers(server);
+setupMswHandlers(server);
 afterEach(() => jest.clearAllMocks());
 
 class PersistingTaskRunner implements TaskRunner {

plugins/catalog-backend-module-msgraph/src/microsoftGraph/client.test.ts

@@ -15,7 +15,7 @@
  */
 
 import { TokenCredential } from '@azure/identity';
-import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
+import { setupMswHandlers } from '@backstage/backend-test-utils';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
 import { MicrosoftGraphClient } from './client';
@@ -27,7 +27,7 @@ describe('MicrosoftGraphClient', () => {
   let client: MicrosoftGraphClient;
   const worker = setupServer();
 
-  setupRequestMockHandlers(worker);
+  setupMswHandlers(worker);
 
   beforeEach(() => {
     tokenCredential.getToken.mockResolvedValue({

plugins/catalog-backend-module-puppetdb/src/puppet/read.test.ts

@@ -20,14 +20,14 @@ import {
   PuppetDbEntityProviderConfig,
 } from '../providers';
 import { DEFAULT_NAMESPACE } from '@backstage/catalog-model';
-import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
+import { setupMswHandlers } from '@backstage/backend-test-utils';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
 import { ANNOTATION_PUPPET_CERTNAME, ENDPOINT_FACTSETS } from './constants';
 
 describe('readPuppetNodes', () => {
   const worker = setupServer();
-  setupRequestMockHandlers(worker);
+  setupMswHandlers(worker);
 
   beforeEach(() => {
     jest.clearAllMocks();

plugins/catalog-backend/src/modules/core/UrlReaderProcessor.test.ts

@@ -15,10 +15,7 @@
  */
 
 import { UrlReader, UrlReaders } from '@backstage/backend-common';
-import {
-  mockServices,
-  setupRequestMockHandlers,
-} from '@backstage/backend-test-utils';
+import { mockServices, setupMswHandlers } from '@backstage/backend-test-utils';
 import { ConfigReader } from '@backstage/config';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
@@ -39,7 +36,7 @@ describe('UrlReaderProcessor', () => {
     set: jest.fn(),
   };
   const server = setupServer();
-  setupRequestMockHandlers(server);
+  setupMswHandlers(server);
 
   beforeEach(() => {
     jest.resetAllMocks();

plugins/catalog-backend/src/search/DefaultCatalogCollator.test.ts

@@ -18,7 +18,7 @@ import {
   PluginEndpointDiscovery,
   TokenManager,
 } from '@backstage/backend-common';
-import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
+import { setupMswHandlers } from '@backstage/backend-test-utils';
 import { Entity } from '@backstage/catalog-model';
 import { DefaultCatalogCollator } from './DefaultCatalogCollator';
 import { setupServer } from 'msw/node';
@@ -62,7 +62,7 @@ describe('DefaultCatalogCollator', () => {
   let mockTokenManager: jest.Mocked<TokenManager>;
   let collator: DefaultCatalogCollator;
 
-  setupRequestMockHandlers(server);
+  setupMswHandlers(server);
   beforeAll(() => {
     mockDiscoveryApi = {
       getBaseUrl: jest.fn().mockResolvedValue('http://localhost:7007'),

plugins/catalog-import/src/api/AzureRepoApiClient.test.ts

@@ -26,7 +26,7 @@ import {
   RepoApiClient,
 } from './AzureRepoApiClient';
 import { setupServer } from 'msw/node';
-import { setupRequestMockHandlers } from '@backstage/test-utils';
+import { setupMswHandlers } from '@backstage/test-utils';
 
 function mockRepoEndpoint() {
   return rest.get(
@@ -153,7 +153,7 @@ function mockPrEndpoint() {
 
 describe('RepoApiClient', () => {
   const server = setupServer();
-  setupRequestMockHandlers(server);
+  setupMswHandlers(server);
   const testToken = new Date().toString();
   const sut = new RepoApiClient({
     project: 'project',

plugins/catalog-import/src/api/CatalogImportClient.test.ts

@@ -57,7 +57,7 @@ import { ConfigReader, UrlPatternDiscovery } from '@backstage/core-app-api';
 import { ScmIntegrations } from '@backstage/integration';
 import { ScmAuthApi } from '@backstage/integration-react';
 import { CatalogApi } from '@backstage/plugin-catalog-react';
-import { MockFetchApi, setupRequestMockHandlers } from '@backstage/test-utils';
+import { MockFetchApi, setupMswHandlers } from '@backstage/test-utils';
 import { Octokit } from '@octokit/rest';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
@@ -70,7 +70,7 @@ import {
 
 describe('CatalogImportClient', () => {
   const server = setupServer();
-  setupRequestMockHandlers(server);
+  setupMswHandlers(server);
 
   const mockBaseUrl = 'http://backstage:9191/api/catalog';
   const discoveryApi = UrlPatternDiscovery.compile(mockBaseUrl);

plugins/kubernetes-backend/src/service/KubernetesBuilder.test.ts

@@ -38,7 +38,7 @@ import {
   ServiceMock,
   mockCredentials,
   mockServices,
-  setupRequestMockHandlers,
+  setupMswHandlers,
   startTestBackend,
 } from '@backstage/backend-test-utils';
 import { rest } from 'msw';
@@ -508,7 +508,7 @@ describe('API integration tests', () => {
 
   describe('/proxy', () => {
     const worker = setupServer();
-    setupRequestMockHandlers(worker);
+    setupMswHandlers(worker);
 
     beforeEach(() => {
       worker.use(

plugins/kubernetes-backend/src/service/KubernetesFanOutHandler.test.ts

@@ -26,10 +26,7 @@ import { KubernetesFanOutHandler } from './KubernetesFanOutHandler';
 import { KubernetesClientBasedFetcher } from './KubernetesFetcher';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
-import {
-  mockServices,
-  setupRequestMockHandlers,
-} from '@backstage/backend-test-utils';
+import { mockServices, setupMswHandlers } from '@backstage/backend-test-utils';
 import {
   FetchResponse,
   KubernetesRequestAuth,
@@ -1128,7 +1125,7 @@ describe('KubernetesFanOutHandler', () => {
 
     describe('with a real fetcher', () => {
       const worker = setupServer();
-      setupRequestMockHandlers(worker);
+      setupMswHandlers(worker);
 
       it('fetch error short-circuits requests to a single cluster, recovering across the fleet', async () => {
         const pods = [{ metadata: { name: 'pod-name' } }];

plugins/kubernetes-backend/src/service/KubernetesFetcher.test.ts

@@ -28,7 +28,7 @@ import { setupServer } from 'msw/node';
 import {
   createMockDirectory,
   mockServices,
-  setupRequestMockHandlers,
+  setupMswHandlers,
 } from '@backstage/backend-test-utils';
 import { Config } from '@kubernetes/client-node';
 
@@ -71,7 +71,7 @@ const POD_METRICS_FIXTURE = [
 
 describe('KubernetesFetcher', () => {
   const worker = setupServer();
-  setupRequestMockHandlers(worker);
+  setupMswHandlers(worker);
 
   const labels = (req: MockedRequest): object => {
     const selectorParam = req.url.searchParams.get('labelSelector');

plugins/kubernetes-backend/src/service/KubernetesProxy.test.ts

@@ -20,7 +20,7 @@ import { errorHandler } from '@backstage/backend-common';
 import {
   createMockDirectory,
   mockServices,
-  setupRequestMockHandlers,
+  setupMswHandlers,
 } from '@backstage/backend-test-utils';
 import { NotFoundError } from '@backstage/errors';
 import {
@@ -90,7 +90,7 @@ describe('KubernetesProxy', () => {
     getExternalBaseUrl: jest.fn(),
   };
 
-  setupRequestMockHandlers(worker);
+  setupMswHandlers(worker);
 
   const buildMockRequest = (clusterName: any, path: string): Request => {
     const req = getMockReq({

plugins/kubernetes-node/src/auth/PinnipedHelper.test.ts

@@ -18,7 +18,7 @@ import { ExtendedHttpServer } from '@backstage/backend-app-api';
 import { ClusterDetails } from '../types';
 import {
   mockServices,
-  setupRequestMockHandlers,
+  setupMswHandlers,
   startTestBackend,
 } from '@backstage/backend-test-utils';
 import { createBackendModule } from '@backstage/backend-plugin-api';
@@ -43,7 +43,7 @@ describe('Pinniped - tokenCredentialRequest', () => {
   const logger = loggerToWinstonLogger(mockServices.logger.mock());
   let httpsRequest: jest.SpyInstance;
   const worker = setupServer();
-  setupRequestMockHandlers(worker);
+  setupMswHandlers(worker);
 
   beforeAll(() => {
     httpsRequest = jest.spyOn(

plugins/kubernetes-react/src/api/KubernetesBackendClient.test.ts

@@ -19,7 +19,7 @@ import { KubernetesBackendClient } from './KubernetesBackendClient';
 import { rest } from 'msw';
 import { UrlPatternDiscovery } from '@backstage/core-app-api';
 import { setupServer } from 'msw/node';
-import { MockFetchApi, setupRequestMockHandlers } from '@backstage/test-utils';
+import { MockFetchApi, setupMswHandlers } from '@backstage/test-utils';
 import {
   CustomObjectsByEntityRequest,
   KubernetesRequestBody,
@@ -36,7 +36,7 @@ describe('KubernetesBackendClient', () => {
   };
   let mockResponse: ObjectsByEntityResponse;
   const worker = setupServer();
-  setupRequestMockHandlers(worker);
+  setupMswHandlers(worker);
 
   const identityApi = {
     getCredentials: jest.fn(),

plugins/notifications-node/src/service/DefaultNotificationService.test.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { setupRequestMockHandlers } from '@backstage/test-utils';
+import { setupMswHandlers } from '@backstage/test-utils';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
 import { NotificationPayload } from '@backstage/plugin-notifications-common';
@@ -32,7 +32,7 @@ const testNotification: NotificationPayload = {
 
 describe('DefaultNotificationService', () => {
   const server = setupServer();
-  setupRequestMockHandlers(server);
+  setupMswHandlers(server);
 
   const discovery = mockServices.discovery.mock({
     getBaseUrl: jest.fn().mockResolvedValue('http://example.com'),

plugins/notifications/src/api/NotificationsClient.test.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { MockFetchApi, setupRequestMockHandlers } from '@backstage/test-utils';
+import { MockFetchApi, setupMswHandlers } from '@backstage/test-utils';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
 import { NotificationsClient } from './NotificationsClient';
@@ -33,7 +33,7 @@ const testNotification: Partial<Notification> = {
 };
 
 describe('NotificationsClient', () => {
-  setupRequestMockHandlers(server);
+  setupMswHandlers(server);
   const mockBaseUrl = 'http://backstage/api/notifications';
   const discoveryApi = { getBaseUrl: async () => mockBaseUrl };
   const fetchApi = new MockFetchApi();

plugins/permission-node/src/ServerPermissionClient.test.ts

@@ -25,7 +25,7 @@ import {
 import {
   mockCredentials,
   mockServices,
-  setupRequestMockHandlers,
+  setupMswHandlers,
 } from '@backstage/backend-test-utils';
 import { ConfigReader } from '@backstage/config';
 import { setupServer } from 'msw/node';
@@ -54,7 +54,7 @@ const config = new ConfigReader({
 });
 
 describe('ServerPermissionClient', () => {
-  setupRequestMockHandlers(server);
+  setupMswHandlers(server);
 
   const discovery = mockServices.discovery.mock();
 

plugins/proxy-backend/src/service/router.config.test.ts

@@ -19,7 +19,7 @@ import {
   createServiceFactory,
 } from '@backstage/backend-plugin-api';
 import {
-  setupRequestMockHandlers,
+  setupMswHandlers,
   startTestBackend,
 } from '@backstage/backend-test-utils';
 import {
@@ -36,7 +36,7 @@ import fetch from 'node-fetch';
 
 describe('createRouter reloadable configuration', () => {
   const server = setupServer();
-  setupRequestMockHandlers(server);
+  setupMswHandlers(server);
 
   it('should be able to observe the config', async () => {
     // Grab the subscriber function and use mutable config data to mock a config file change

plugins/proxy-backend/src/service/router.credentials.test.ts

@@ -20,7 +20,7 @@ import {
 } from '@backstage/backend-app-api';
 import {
   mockServices,
-  setupRequestMockHandlers,
+  setupMswHandlers,
   startTestBackend,
 } from '@backstage/backend-test-utils';
 import { ResponseError } from '@backstage/errors';
@@ -34,7 +34,7 @@ import fetch from 'node-fetch';
 
 describe('credentials', () => {
   const worker = setupServer();
-  setupRequestMockHandlers(worker);
+  setupMswHandlers(worker);
 
   it('handles all valid credentials settings', async () => {
     const config = {

plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloud.examples.test.ts

@@ -29,7 +29,7 @@ jest.mock('@backstage/plugin-scaffolder-node', () => {
 import { createPublishBitbucketCloudAction } from './bitbucketCloud';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
-import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
+import { setupMswHandlers } from '@backstage/backend-test-utils';
 import { ScmIntegrations } from '@backstage/integration';
 import { ConfigReader } from '@backstage/config';
 import { initRepoAndPush } from '@backstage/plugin-scaffolder-node';
@@ -66,7 +66,7 @@ describe('publish:bitbucketCloud', () => {
     },
   });
   const server = setupServer();
-  setupRequestMockHandlers(server);
+  setupMswHandlers(server);
 
   beforeEach(() => {
     jest.resetAllMocks();

plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloud.test.ts

@@ -29,7 +29,7 @@ jest.mock('@backstage/plugin-scaffolder-node', () => {
 import { createPublishBitbucketCloudAction } from './bitbucketCloud';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
-import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
+import { setupMswHandlers } from '@backstage/backend-test-utils';
 import { ScmIntegrations } from '@backstage/integration';
 import { ConfigReader } from '@backstage/config';
 import { initRepoAndPush } from '@backstage/plugin-scaffolder-node';
@@ -56,7 +56,7 @@ describe('publish:bitbucketCloud', () => {
     },
   });
   const server = setupServer();
-  setupRequestMockHandlers(server);
+  setupMswHandlers(server);
 
   beforeEach(() => {
     jest.resetAllMocks();

plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloudPipelinesRun.examples.test.ts

@@ -21,7 +21,7 @@ import yaml from 'yaml';
 import { examples } from './bitbucketCloudPipelinesRun.examples';
 import { ConfigReader } from '@backstage/config';
 import { ScmIntegrations } from '@backstage/integration';
-import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
+import { setupMswHandlers } from '@backstage/backend-test-utils';
 import { createMockActionContext } from '@backstage/plugin-scaffolder-node-test-utils';
 
 describe('bitbucket:pipelines:run', () => {
@@ -48,7 +48,7 @@ describe('bitbucket:pipelines:run', () => {
     build_number: 1,
   };
   const worker = setupServer();
-  setupRequestMockHandlers(worker);
+  setupMswHandlers(worker);
 
   beforeEach(() => {
     jest.resetAllMocks();

plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloudPipelinesRun.test.ts

@@ -16,7 +16,7 @@
 
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
-import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
+import { setupMswHandlers } from '@backstage/backend-test-utils';
 import { createBitbucketPipelinesRunAction } from './bitbucketCloudPipelinesRun';
 import { ConfigReader } from '@backstage/config';
 import { ScmIntegrations } from '@backstage/integration';
@@ -48,7 +48,7 @@ describe('bitbucket:pipelines:run', () => {
     build_number: 1,
   };
   const worker = setupServer();
-  setupRequestMockHandlers(worker);
+  setupMswHandlers(worker);
 
   beforeEach(() => {
     jest.clearAllMocks();

plugins/scaffolder-backend-module-bitbucket-server/src/actions/bitbucketServer.examples.test.ts

@@ -29,7 +29,7 @@ jest.mock('@backstage/plugin-scaffolder-node', () => {
 import { createPublishBitbucketServerAction } from './bitbucketServer';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
-import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
+import { setupMswHandlers } from '@backstage/backend-test-utils';
 import { ScmIntegrations } from '@backstage/integration';
 import { ConfigReader } from '@backstage/config';
 import yaml from 'yaml';
@@ -68,7 +68,7 @@ describe('publish:bitbucketServer', () => {
     },
   });
   const server = setupServer();
-  setupRequestMockHandlers(server);
+  setupMswHandlers(server);
 
   beforeEach(() => {
     jest.resetAllMocks();

plugins/scaffolder-backend-module-bitbucket-server/src/actions/bitbucketServer.test.ts

@@ -29,7 +29,7 @@ jest.mock('@backstage/plugin-scaffolder-node', () => {
 import { createPublishBitbucketServerAction } from './bitbucketServer';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
-import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
+import { setupMswHandlers } from '@backstage/backend-test-utils';
 import { ScmIntegrations } from '@backstage/integration';
 import { ConfigReader } from '@backstage/config';
 import { initRepoAndPush } from '@backstage/plugin-scaffolder-node';
@@ -66,7 +66,7 @@ describe('publish:bitbucketServer', () => {
     },
   });
   const server = setupServer();
-  setupRequestMockHandlers(server);
+  setupMswHandlers(server);
 
   beforeEach(() => {
     jest.resetAllMocks();

plugins/scaffolder-backend-module-bitbucket-server/src/actions/bitbucketServerPullRequest.examples.test.ts

@@ -29,7 +29,7 @@ jest.mock('@backstage/plugin-scaffolder-node', () => {
 import { createPublishBitbucketServerPullRequestAction } from './bitbucketServerPullRequest';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
-import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
+import { setupMswHandlers } from '@backstage/backend-test-utils';
 import { ScmIntegrations } from '@backstage/integration';
 import { ConfigReader } from '@backstage/config';
 import yaml from 'yaml';
@@ -191,7 +191,7 @@ describe('publish:bitbucketServer:pull-request', () => {
   };
 
   const server = setupServer();
-  setupRequestMockHandlers(server);
+  setupMswHandlers(server);
 
   beforeEach(() => {
     jest.resetAllMocks();

plugins/scaffolder-backend-module-bitbucket/src/actions/bitbucket.examples.test.ts

@@ -29,7 +29,7 @@ jest.mock('@backstage/plugin-scaffolder-node', () => {
 import { createPublishBitbucketAction } from './bitbucket';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
-import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
+import { setupMswHandlers } from '@backstage/backend-test-utils';
 import { ScmIntegrations } from '@backstage/integration';
 import { ConfigReader } from '@backstage/config';
 import { initRepoAndPush } from '@backstage/plugin-scaffolder-node';
@@ -67,7 +67,7 @@ describe('publish:bitbucket', () => {
     },
   });
   const server = setupServer();
-  setupRequestMockHandlers(server);
+  setupMswHandlers(server);
 
   beforeEach(() => {
     jest.resetAllMocks();

plugins/scaffolder-backend-module-bitbucket/src/actions/bitbucket.test.ts

@@ -28,7 +28,7 @@ jest.mock('@backstage/plugin-scaffolder-node', () => {
 import { createPublishBitbucketAction } from './bitbucket';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
-import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
+import { setupMswHandlers } from '@backstage/backend-test-utils';
 import { ScmIntegrations } from '@backstage/integration';
 import { ConfigReader } from '@backstage/config';
 import { initRepoAndPush } from '@backstage/plugin-scaffolder-node';
@@ -63,7 +63,7 @@ describe('publish:bitbucket', () => {
     },
   });
   const server = setupServer();
-  setupRequestMockHandlers(server);
+  setupMswHandlers(server);
 
   beforeEach(() => {
     jest.resetAllMocks();

plugins/scaffolder-backend-module-confluence-to-markdown/src/actions/confluence/confluenceToMarkdown.examples.test.ts

@@ -20,7 +20,7 @@ import { ScmIntegrations } from '@backstage/integration';
 import {
   createMockDirectory,
   mockServices,
-  setupRequestMockHandlers,
+  setupMswHandlers,
 } from '@backstage/backend-test-utils';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
@@ -32,7 +32,7 @@ import { createMockActionContext } from '@backstage/plugin-scaffolder-node-test-
 describe('confluence:transform:markdown examples', () => {
   const baseUrl = `https://confluence.example.com`;
   const worker = setupServer();
-  setupRequestMockHandlers(worker);
+  setupMswHandlers(worker);
 
   const config = new ConfigReader({
     confluence: {

plugins/scaffolder-backend-module-confluence-to-markdown/src/actions/confluence/confluenceToMarkdown.test.ts

@@ -21,7 +21,7 @@ import { ScmIntegrations } from '@backstage/integration';
 import {
   createMockDirectory,
   mockServices,
-  setupRequestMockHandlers,
+  setupMswHandlers,
 } from '@backstage/backend-test-utils';
 import type { ActionContext } from '@backstage/plugin-scaffolder-node';
 import { rest } from 'msw';
@@ -31,7 +31,7 @@ import { createMockActionContext } from '@backstage/plugin-scaffolder-node-test-
 describe('confluence:transform:markdown', () => {
   const baseUrl = `https://nodomain.confluence.com`;
   const worker = setupServer();
-  setupRequestMockHandlers(worker);
+  setupMswHandlers(worker);
 
   const config = new ConfigReader({
     confluence: {

plugins/scaffolder-backend-module-gerrit/src/actions/gerrit.test.ts

@@ -30,7 +30,7 @@ import path from 'path';
 import { createPublishGerritAction } from './gerrit';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
-import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
+import { setupMswHandlers } from '@backstage/backend-test-utils';
 import { ScmIntegrations } from '@backstage/integration';
 import { ConfigReader } from '@backstage/config';
 import { initRepoAndPush } from '@backstage/plugin-scaffolder-node';
@@ -61,7 +61,7 @@ describe('publish:gerrit', () => {
     },
   });
   const server = setupServer();
-  setupRequestMockHandlers(server);
+  setupMswHandlers(server);
 
   beforeEach(() => {
     jest.resetAllMocks();

plugins/scaffolder-backend-module-gitea/src/actions/gitea.test.ts

@@ -18,7 +18,7 @@ import { ConfigReader } from '@backstage/config';
 import { createPublishGiteaAction } from './gitea';
 import { initRepoAndPush } from '@backstage/plugin-scaffolder-node';
 import { rest } from 'msw';
-import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
+import { setupMswHandlers } from '@backstage/backend-test-utils';
 import { createMockActionContext } from '@backstage/plugin-scaffolder-node-test-utils';
 import { setupServer } from 'msw/node';
 
@@ -62,7 +62,7 @@ describe('publish:gitea', () => {
   });
 
   const server = setupServer();
-  setupRequestMockHandlers(server);
+  setupMswHandlers(server);
 
   beforeEach(() => {
     jest.resetAllMocks();

plugins/scaffolder-backend-module-sentry/src/actions/createProject.test.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
+import { setupMswHandlers } from '@backstage/backend-test-utils';
 import { createMockActionContext } from '@backstage/plugin-scaffolder-node-test-utils';
 import { ConfigReader } from '@backstage/config';
 import { InputError } from '@backstage/errors';
@@ -27,7 +27,7 @@ import { createSentryCreateProjectAction } from './createProject';
 
 describe('sentry:project:create action', () => {
   const worker = setupServer();
-  setupRequestMockHandlers(worker);
+  setupMswHandlers(worker);
 
   const createScaffolderConfig = (configData: JsonObject = {}) => ({
     config: new ConfigReader({

plugins/scaffolder/src/api.test.ts

@@ -16,7 +16,7 @@
 
 import { ConfigReader } from '@backstage/core-app-api';
 import { ScmIntegrations } from '@backstage/integration';
-import { MockFetchApi, setupRequestMockHandlers } from '@backstage/test-utils';
+import { MockFetchApi, setupMswHandlers } from '@backstage/test-utils';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
 import { ScaffolderClient } from './api';
@@ -30,7 +30,7 @@ const mockFetchEventSource = fetchEventSource as jest.MockedFunction<
 const server = setupServer();
 
 describe('api', () => {
-  setupRequestMockHandlers(server);
+  setupMswHandlers(server);
   const mockBaseUrl = 'http://backstage/api';
 
   const discoveryApi = { getBaseUrl: async () => mockBaseUrl };

plugins/search-backend-module-catalog/src/collators/DefaultCatalogCollatorFactory.test.ts

@@ -18,7 +18,7 @@ import {
   PluginEndpointDiscovery,
   TokenManager,
 } from '@backstage/backend-common';
-import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
+import { setupMswHandlers } from '@backstage/backend-test-utils';
 import { Entity } from '@backstage/catalog-model';
 import { ConfigReader } from '@backstage/config';
 import { TestPipeline } from '@backstage/plugin-search-backend-node';
@@ -74,7 +74,7 @@ describe('DefaultCatalogCollatorFactory', () => {
     tokenManager: mockTokenManager,
   };
 
-  setupRequestMockHandlers(server);
+  setupMswHandlers(server);
 
   beforeEach(() => {
     server.use(

plugins/search-backend-module-explore/src/collators/ToolDocumentCollatorFactory.test.ts

@@ -19,10 +19,7 @@ import {
 } from '@backstage/backend-common';
 import { ConfigReader } from '@backstage/config';
 import { TestPipeline } from '@backstage/plugin-search-backend-node';
-import {
-  mockServices,
-  setupRequestMockHandlers,
-} from '@backstage/backend-test-utils';
+import { mockServices, setupMswHandlers } from '@backstage/backend-test-utils';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
 import { Readable } from 'stream';
@@ -82,7 +79,7 @@ describe('ToolDocumentCollatorFactory', () => {
     let collator: Readable;
 
     const worker = setupServer();
-    setupRequestMockHandlers(worker);
+    setupMswHandlers(worker);
 
     beforeEach(async () => {
       factory = ToolDocumentCollatorFactory.fromConfig(config, options);

plugins/search-backend-module-stack-overflow-collator/src/collators/StackOverflowQuestionsCollatorFactory.test.ts

@@ -17,10 +17,7 @@ import {
   StackOverflowQuestionsCollatorFactory,
   StackOverflowQuestionsCollatorFactoryOptions,
 } from './StackOverflowQuestionsCollatorFactory';
-import {
-  mockServices,
-  setupRequestMockHandlers,
-} from '@backstage/backend-test-utils';
+import { mockServices, setupMswHandlers } from '@backstage/backend-test-utils';
 import { TestPipeline } from '@backstage/plugin-search-backend-node';
 import { ConfigReader } from '@backstage/config';
 import { Readable } from 'stream';
@@ -95,7 +92,7 @@ describe('StackOverflowQuestionsCollatorFactory', () => {
 
   describe('getCollator', () => {
     const worker = setupServer();
-    setupRequestMockHandlers(worker);
+    setupMswHandlers(worker);
 
     it('returns a readable stream', async () => {
       const factory = StackOverflowQuestionsCollatorFactory.fromConfig(

plugins/search-backend-module-techdocs/src/collators/DefaultTechDocsCollatorFactory.test.ts

@@ -20,10 +20,7 @@ import {
 import { Entity } from '@backstage/catalog-model';
 import { ConfigReader } from '@backstage/config';
 import { TestPipeline } from '@backstage/plugin-search-backend-node';
-import {
-  mockServices,
-  setupRequestMockHandlers,
-} from '@backstage/backend-test-utils';
+import { mockServices, setupMswHandlers } from '@backstage/backend-test-utils';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
 import { Readable } from 'stream';
@@ -106,7 +103,7 @@ describe('DefaultTechDocsCollatorFactory', () => {
     let collator: Readable;
 
     const worker = setupServer();
-    setupRequestMockHandlers(worker);
+    setupMswHandlers(worker);
 
     beforeEach(async () => {
       factory = DefaultTechDocsCollatorFactory.fromConfig(config, options);

plugins/techdocs-backend/src/search/DefaultTechDocsCollator.test.ts

@@ -21,10 +21,7 @@ import {
 } from '@backstage/backend-common';
 import { Entity } from '@backstage/catalog-model';
 import { DefaultTechDocsCollator } from './DefaultTechDocsCollator';
-import {
-  mockServices,
-  setupRequestMockHandlers,
-} from '@backstage/backend-test-utils';
+import { mockServices, setupMswHandlers } from '@backstage/backend-test-utils';
 import { setupServer } from 'msw/node';
 import { rest } from 'msw';
 import { ConfigReader } from '@backstage/config';
@@ -79,7 +76,7 @@ const expectedEntities: Entity[] = [
 
 describe('TechDocs Collator', () => {
   const worker = setupServer();
-  setupRequestMockHandlers(worker);
+  setupMswHandlers(worker);
 
   describe('DefaultTechDocsCollator with legacyPathCasing configuration', () => {
     let mockDiscoveryApi: jest.Mocked<PluginEndpointDiscovery>;

plugins/user-settings/src/apis/StorageApi/UserSettingsStorage.test.ts

@@ -21,14 +21,14 @@ import {
   IdentityApi,
   StorageApi,
 } from '@backstage/core-plugin-api';
-import { MockFetchApi, setupRequestMockHandlers } from '@backstage/test-utils';
+import { MockFetchApi, setupMswHandlers } from '@backstage/test-utils';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
 import { UserSettingsStorage } from './UserSettingsStorage';
 
 describe('Persistent Storage API', () => {
   const server = setupServer();
-  setupRequestMockHandlers(server);
+  setupMswHandlers(server);
 
   const mockBaseUrl = 'http://backstage:9191/api';
   const mockErrorApi = { post: jest.fn(), error$: jest.fn() };