From 46a3fea2ba3cec45284fcd4c114800b8ef137f8f Mon Sep 17 00:00:00 2001
From: Jussi Hallila <jussi@hallila.com>
Date: Mon, 18 Jan 2021 19:37:50 +0100
Subject: [PATCH] Fixing erroneus test setup.

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

diff --git a/plugins/catalog-import/package.json b/plugins/catalog-import/package.json
index 5e601ad896..dfd5414ad1 100644
--- a/plugins/catalog-import/package.json
+++ b/plugins/catalog-import/package.json
@@ -39,6 +39,7 @@
     "@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",
@@ -57,7 +58,6 @@
     "@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 4ce25e8fc2..385fecd1ab 100644
--- a/plugins/catalog-import/src/api/CatalogImportClient.ts
+++ b/plugins/catalog-import/src/api/CatalogImportClient.ts
@@ -19,6 +19,7 @@ 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;
@@ -133,9 +134,7 @@ export class CatalogImportClient implements CatalogImportApi {
         exists,
       };
     }
-    return Promise.resolve({
-      exists,
-    });
+    return { exists };
   }
 
   async submitPrToRepo({
diff --git a/plugins/catalog-import/src/setupTests.ts b/plugins/catalog-import/src/setupTests.ts
index fba7d7a957..825bcd4115 100644
--- a/plugins/catalog-import/src/setupTests.ts
+++ b/plugins/catalog-import/src/setupTests.ts
@@ -15,6 +15,3 @@
  */
 
 import '@testing-library/jest-dom';
-import fetch from 'cross-fetch';
-
-global.fetch = fetch;