From 2abca02daa56e90231e6fe9e3f4019d17bfae58e Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Thu, 8 Oct 2020 22:42:09 +0200
Subject: [PATCH] chore(catalog-backend): fixing some more testsn

---
 plugins/catalog-backend/package.json                      | 8 ++++----
 .../src/ingestion/processors/UrlReaderProcessor.test.ts   | 6 ++----
 .../src/ingestion/processors/util/github.test.ts          | 5 ++---
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/plugins/catalog-backend/package.json b/plugins/catalog-backend/package.json
index 77564d1dee..4a3b2c7442 100644
--- a/plugins/catalog-backend/package.json
+++ b/plugins/catalog-backend/package.json
@@ -27,6 +27,7 @@
     "@types/express": "^4.17.6",
     "codeowners-utils": "^1.0.2",
     "core-js": "^3.6.5",
+    "cross-fetch": "^3.0.6",
     "express": "^4.17.1",
     "express-promise-router": "^3.0.3",
     "fs-extra": "^9.0.0",
@@ -34,7 +35,6 @@
     "knex": "^0.21.1",
     "ldapjs": "^2.2.0",
     "lodash": "^4.17.15",
-    "cross-fetch": "^3.0.6",
     "morgan": "^1.10.0",
     "sqlite3": "^5.0.0",
     "uuid": "^8.0.0",
@@ -45,6 +45,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "^0.1.1-alpha.24",
+    "@backstage/test-utils": "^0.1.1-alpha.24",
     "@types/core-js": "^2.5.4",
     "@types/git-url-parse": "^9.0.0",
     "@types/ldapjs": "^1.0.9",
@@ -52,9 +53,8 @@
     "@types/supertest": "^2.0.8",
     "@types/uuid": "^8.0.0",
     "@types/yup": "^0.28.2",
-    "@backstage/test-utils": "^0.1.1-alpha.24",
-    "supertest": "^4.0.2",
-    "msw": "^0.21.2"
+    "msw": "^0.21.2",
+    "supertest": "^4.0.2"
   },
   "files": [
     "dist",
diff --git a/plugins/catalog-backend/src/ingestion/processors/UrlReaderProcessor.test.ts b/plugins/catalog-backend/src/ingestion/processors/UrlReaderProcessor.test.ts
index 009872cda3..751897bea9 100644
--- a/plugins/catalog-backend/src/ingestion/processors/UrlReaderProcessor.test.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/UrlReaderProcessor.test.ts
@@ -22,6 +22,7 @@ import {
 } from './types';
 import { setupServer } from 'msw/node';
 import { rest } from 'msw';
+import { msw } from '@backstage/test-utils';
 import { getVoidLogger, UrlReaders } from '@backstage/backend-common';
 import { ConfigReader } from '@backstage/config';
 
@@ -29,10 +30,7 @@ describe('UrlReaderProcessor', () => {
   const mockApiOrigin = 'http://localhost:23000';
   const server = setupServer();
 
-  beforeAll(() => server.listen({ onUnhandledRequest: 'error' }));
-  afterEach(() => server.resetHandlers());
-  afterAll(() => server.close());
-
+  msw.setupDefaultHandlers(server);
   it('should load from url', async () => {
     const logger = getVoidLogger();
     const reader = UrlReaders.default({ logger, config: new ConfigReader({}) });
diff --git a/plugins/catalog-backend/src/ingestion/processors/util/github.test.ts b/plugins/catalog-backend/src/ingestion/processors/util/github.test.ts
index 25a37e0546..54afdd1bdc 100644
--- a/plugins/catalog-backend/src/ingestion/processors/util/github.test.ts
+++ b/plugins/catalog-backend/src/ingestion/processors/util/github.test.ts
@@ -17,6 +17,7 @@
 import { graphql } from '@octokit/graphql';
 import { graphql as graphqlMsw } from 'msw';
 import { setupServer } from 'msw/node';
+import { msw } from '@backstage/test-utils';
 import {
   getOrganizationTeams,
   getOrganizationUsers,
@@ -26,9 +27,7 @@ import {
 
 describe('github', () => {
   const server = setupServer();
-  beforeAll(() => server.listen({ onUnhandledRequest: 'error' }));
-  afterEach(() => server.resetHandlers());
-  afterAll(() => server.close());
+  msw.setupDefaultHandlers(server);
 
   describe('getOrganizationUsers', () => {
     it('reads members', async () => {