From 193652e5a3049060b20557b8f4484d44f6c0f11a Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Tue, 20 Oct 2020 10:53:47 +0200
Subject: [PATCH] chore: fixing some more e2e tests by actually polyfill the
 correct thing

---
 .../default-backend-plugin/src/setupTests.ts        |  3 +--
 .../ExampleComponent/ExampleComponent.test.tsx.hbs  | 11 +++--------
 .../ExampleFetchComponent.test.tsx.hbs              | 13 ++++---------
 .../cli/templates/default-plugin/src/setupTests.ts  |  2 +-
 4 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/packages/cli/templates/default-backend-plugin/src/setupTests.ts b/packages/cli/templates/default-backend-plugin/src/setupTests.ts
index a5907fd52f..1c7ba6c7e1 100644
--- a/packages/cli/templates/default-backend-plugin/src/setupTests.ts
+++ b/packages/cli/templates/default-backend-plugin/src/setupTests.ts
@@ -13,6 +13,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
+import 'cross-fetch/polyfill';
 export {};
-global.fetch = require('node-fetch');
diff --git a/packages/cli/templates/default-plugin/src/components/ExampleComponent/ExampleComponent.test.tsx.hbs b/packages/cli/templates/default-plugin/src/components/ExampleComponent/ExampleComponent.test.tsx.hbs
index fdb39444d8..e805900f36 100644
--- a/packages/cli/templates/default-plugin/src/components/ExampleComponent/ExampleComponent.test.tsx.hbs
+++ b/packages/cli/templates/default-plugin/src/components/ExampleComponent/ExampleComponent.test.tsx.hbs
@@ -5,18 +5,13 @@ import { ThemeProvider } from '@material-ui/core';
 import { lightTheme } from '@backstage/theme';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
+import { msw } from '@backstage/test-utils';
 
 
 describe('ExampleComponent', () => {
   const server = setupServer();
-  // Enable API mocking before tests.
-  beforeAll(() => server.listen({ onUnhandledRequest: 'error' }))
-
-  // Reset any runtime request handlers we may add during the tests.
-  afterEach(() => server.resetHandlers())
-
-  // Disable API mocking after the tests are done.
-  afterAll(() => server.close())
+  // Enable sane handlers for network requests
+  msw.setupDefaultHandlers(server);
 
   // setup mock response
   beforeEach(() => {
diff --git a/packages/cli/templates/default-plugin/src/components/ExampleFetchComponent/ExampleFetchComponent.test.tsx.hbs b/packages/cli/templates/default-plugin/src/components/ExampleFetchComponent/ExampleFetchComponent.test.tsx.hbs
index ca1990b4bc..81e1b4be09 100644
--- a/packages/cli/templates/default-plugin/src/components/ExampleFetchComponent/ExampleFetchComponent.test.tsx.hbs
+++ b/packages/cli/templates/default-plugin/src/components/ExampleFetchComponent/ExampleFetchComponent.test.tsx.hbs
@@ -3,18 +3,13 @@ import { render } from '@testing-library/react';
 import ExampleFetchComponent from './ExampleFetchComponent';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
+import { msw } from '@backstage/test-utils';
 
 describe('ExampleFetchComponent', () => {
   const server = setupServer();
-  // Enable API mocking before tests.
-  beforeAll(() => server.listen({ onUnhandledRequest: 'error' }))
-
-  // Reset any runtime request handlers we may add during the tests.
-  afterEach(() => server.resetHandlers())
-
-  // Disable API mocking after the tests are done.
-  afterAll(() => server.close())
-
+  // Enable sane handlers for network requests
+  msw.setupDefaultHandlers(server);
+  
   // setup mock response
   beforeEach(() => {
     server.use(rest.get('https://randomuser.me/*', (_, res, ctx) => res(ctx.status(200), ctx.delay(2000), ctx.json({}))))
diff --git a/packages/cli/templates/default-plugin/src/setupTests.ts b/packages/cli/templates/default-plugin/src/setupTests.ts
index ddc061ad7e..292b0cc471 100644
--- a/packages/cli/templates/default-plugin/src/setupTests.ts
+++ b/packages/cli/templates/default-plugin/src/setupTests.ts
@@ -1,2 +1,2 @@
 import '@testing-library/jest-dom';
-import 'cross-fetch/register'
+import 'cross-fetch/polyfill'