From 50d1fecad8b2144559c93d535703b2ea66109eb0 Mon Sep 17 00:00:00 2001
From: Erik Engervall <erik.engervall@gmail.com>
Date: Mon, 10 May 2021 13:49:23 +0200
Subject: [PATCH] Pass gitHubIntegrations as param to simplify future tests

Signed-off-by: Erik Engervall <erik.engervall@gmail.com>
---
 .../src/api/GitReleaseClient.ts               | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/plugins/git-release-manager/src/api/GitReleaseClient.ts b/plugins/git-release-manager/src/api/GitReleaseClient.ts
index 9de3ce51f7..cd178f292a 100644
--- a/plugins/git-release-manager/src/api/GitReleaseClient.ts
+++ b/plugins/git-release-manager/src/api/GitReleaseClient.ts
@@ -16,7 +16,7 @@
 
 import { ConfigApi, OAuthApi } from '@backstage/core';
 import { Octokit } from '@octokit/rest';
-import { ScmIntegrations } from '@backstage/integration';
+import { GitHubIntegration, ScmIntegrations } from '@backstage/integration';
 
 import { DISABLE_CACHE } from '../constants/constants';
 import { Project } from '../contexts/ProjectContext';
@@ -37,20 +37,26 @@ export class GitReleaseClient implements GitReleaseApi {
   }) {
     this.githubAuthApi = githubAuthApi;
 
-    const { host, apiBaseUrl } = this.getGithubIntegrationConfig({ configApi });
+    const gitHubIntegrations = ScmIntegrations.fromConfig(
+      configApi,
+    ).github.list();
+    const { host, apiBaseUrl } = this.getGithubIntegrationConfig({
+      gitHubIntegrations,
+    });
 
     this.host = host;
     this.apiBaseUrl = apiBaseUrl;
   }
 
-  private getGithubIntegrationConfig({ configApi }: { configApi: ConfigApi }) {
-    const integrations = ScmIntegrations.fromConfig(configApi);
-    const githubIntegrations = integrations.github.list();
-
-    const defaultIntegration = githubIntegrations.find(
+  private getGithubIntegrationConfig({
+    gitHubIntegrations,
+  }: {
+    gitHubIntegrations: GitHubIntegration[];
+  }) {
+    const defaultIntegration = gitHubIntegrations.find(
       ({ config: { host } }) => host === 'github.com',
     );
-    const enterpriseIntegration = githubIntegrations.find(
+    const enterpriseIntegration = gitHubIntegrations.find(
       ({ config: { host } }) => host !== 'github.com',
     );