From 3238651f8a7eac63574ec7ad38ce493c04182f8c Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Tue, 20 Oct 2020 18:21:42 +0200
Subject: [PATCH] =?UTF-8?q?chore:=20maybe=20fixed=20the=20last=20of=20the?=
 =?UTF-8?q?=20broken=20tests=20=F0=9F=A4=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/core-api/package.json                |  4 ++-
 .../DefaultAuthConnector.test.ts              | 35 ++++++++++++-------
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/packages/core-api/package.json b/packages/core-api/package.json
index 43e721683d..5b1456d1ba 100644
--- a/packages/core-api/package.json
+++ b/packages/core-api/package.json
@@ -30,6 +30,7 @@
   },
   "dependencies": {
     "@backstage/config": "^0.1.1-alpha.25",
+    "@backstage/test-utils": "^0.1.1-alpha.25",
     "@backstage/theme": "^0.1.1-alpha.25",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
@@ -49,7 +50,8 @@
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
     "@types/zen-observable": "^0.8.0",
-    "cross-fetch": "^3.0.6"
+    "cross-fetch": "^3.0.6",
+    "msw": "^0.21.3"
   },
   "files": [
     "dist"
diff --git a/packages/core-api/src/lib/AuthConnector/DefaultAuthConnector.test.ts b/packages/core-api/src/lib/AuthConnector/DefaultAuthConnector.test.ts
index 5781130799..391b86952d 100644
--- a/packages/core-api/src/lib/AuthConnector/DefaultAuthConnector.test.ts
+++ b/packages/core-api/src/lib/AuthConnector/DefaultAuthConnector.test.ts
@@ -19,8 +19,9 @@ import { DefaultAuthConnector } from './DefaultAuthConnector';
 import MockOAuthApi from '../../apis/implementations/OAuthRequestApi/MockOAuthApi';
 import * as loginPopup from '../loginPopup';
 import { UrlPatternDiscovery } from '../../apis';
-
-const anyFetch = fetch as any;
+import { msw } from '@backstage/test-utils';
+import { setupServer } from 'msw/node';
+import { rest } from 'msw';
 
 const defaultOptions = {
   discoveryApi: UrlPatternDiscovery.compile('http://my-host/api/{{pluginId}}'),
@@ -39,19 +40,25 @@ const defaultOptions = {
 };
 
 describe('DefaultAuthConnector', () => {
+  const server = setupServer();
+  msw.setupDefaultHandlers(server);
+
   afterEach(() => {
     jest.resetAllMocks();
-    anyFetch.resetMocks();
   });
 
   it('should refresh a session', async () => {
-    anyFetch.mockResponseOnce(
-      JSON.stringify({
-        idToken: 'mock-id-token',
-        accessToken: 'mock-access-token',
-        scopes: 'a b c',
-        expiresInSeconds: '60',
-      }),
+    server.use(
+      rest.get('*', (_req, res, ctx) =>
+        res(
+          ctx.json({
+            idToken: 'mock-id-token',
+            accessToken: 'mock-access-token',
+            scopes: 'a b c',
+            expiresInSeconds: '60',
+          }),
+        ),
+      ),
     );
 
     const helper = new DefaultAuthConnector<any>(defaultOptions);
@@ -64,7 +71,11 @@ describe('DefaultAuthConnector', () => {
   });
 
   it('should handle failure to refresh session', async () => {
-    anyFetch.mockRejectOnce(new Error('Network NOPE'));
+    server.use(
+      rest.get('*', (_req, res, ctx) =>
+        res(ctx.status(500, 'Error: Network NOPE')),
+      ),
+    );
 
     const helper = new DefaultAuthConnector(defaultOptions);
     await expect(helper.refreshSession()).rejects.toThrow(
@@ -73,7 +84,7 @@ describe('DefaultAuthConnector', () => {
   });
 
   it('should handle failure response when refreshing session', async () => {
-    anyFetch.mockResponseOnce({}, { status: 401, statusText: 'NOPE' });
+    server.use(rest.get('*', (_req, res, ctx) => res(ctx.status(401, 'NOPE'))));
 
     const helper = new DefaultAuthConnector(defaultOptions);
     await expect(helper.refreshSession()).rejects.toThrow(