From f4cfdc648e4a6a634829b31b4a8095c9ce952114 Mon Sep 17 00:00:00 2001
From: Jussi Hallila <jussi@hallila.com>
Date: Tue, 19 Jan 2021 18:40:35 +0100
Subject: [PATCH] Modify fetch usage in tests to conform templates

---
 plugins/catalog-import/package.json                   | 2 +-
 plugins/catalog-import/src/api/CatalogImportClient.ts | 1 -
 plugins/catalog-import/src/setupTests.ts              | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/catalog-import/package.json b/plugins/catalog-import/package.json
index 5931d59a0a..c4e8d918d1 100644
--- a/plugins/catalog-import/package.json
+++ b/plugins/catalog-import/package.json
@@ -39,7 +39,6 @@
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
     "@octokit/rest": "^18.0.12",
-    "cross-fetch": "^3.0.6",
     "git-url-parse": "^11.4.3",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
@@ -58,6 +57,7 @@
     "@testing-library/user-event": "^12.0.7",
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
+    "cross-fetch": "^3.0.6",
     "msw": "^0.21.2"
   },
   "files": [
diff --git a/plugins/catalog-import/src/api/CatalogImportClient.ts b/plugins/catalog-import/src/api/CatalogImportClient.ts
index 385fecd1ab..d1509c2105 100644
--- a/plugins/catalog-import/src/api/CatalogImportClient.ts
+++ b/plugins/catalog-import/src/api/CatalogImportClient.ts
@@ -19,7 +19,6 @@ import { DiscoveryApi, OAuthApi, ConfigApi } from '@backstage/core';
 import { CatalogImportApi } from './CatalogImportApi';
 import { PartialEntity } from '../util/types';
 import { GitHubIntegrationConfig } from '@backstage/integration';
-import fetch from 'cross-fetch';
 
 export class CatalogImportClient implements CatalogImportApi {
   private readonly discoveryApi: DiscoveryApi;
diff --git a/plugins/catalog-import/src/setupTests.ts b/plugins/catalog-import/src/setupTests.ts
index 825bcd4115..aea2220869 100644
--- a/plugins/catalog-import/src/setupTests.ts
+++ b/plugins/catalog-import/src/setupTests.ts
@@ -15,3 +15,4 @@
  */
 
 import '@testing-library/jest-dom';
+import 'cross-fetch/polyfill';