From a8374f3e7045432d1cc190317ff439cef19567e8 Mon Sep 17 00:00:00 2001
From: Neemys <36508659+Neemys@users.noreply.github.com>
Date: Thu, 28 Jul 2022 18:22:51 +0200
Subject: [PATCH] Fix failing UT in `sonarqube-backend` plugin

Signed-off-by: Neemys <36508659+Neemys@users.noreply.github.com>
---
 .../sonarqube-backend/src/service/router.test.ts | 11 ++++++++---
 .../src/service/sonarqubeInfoProvider.test.ts    | 16 +++++++++-------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/plugins/sonarqube-backend/src/service/router.test.ts b/plugins/sonarqube-backend/src/service/router.test.ts
index 756fba6164..719db6787e 100644
--- a/plugins/sonarqube-backend/src/service/router.test.ts
+++ b/plugins/sonarqube-backend/src/service/router.test.ts
@@ -23,7 +23,10 @@ import { SonarqubeFindings } from './sonarqubeInfoProvider';
 
 describe('createRouter', () => {
   let app: express.Express;
-  const getBaseUrlMock: jest.Mock<string, [string]> = jest.fn();
+  const getBaseUrlMock: jest.Mock<
+    { baseUrl: string },
+    [{ instanceName: string }]
+  > = jest.fn();
   const getFindingsMock: jest.Mock<
     Promise<SonarqubeFindings | undefined>,
     [string, string]
@@ -104,7 +107,7 @@ describe('createRouter', () => {
     const DUMMY_INSTANCE_KEY = 'myInstance';
     const DUMMY_INSTANCE_URL = 'http://sonarqube.example.com';
     it('returns ok', async () => {
-      getBaseUrlMock.mockReturnValue(DUMMY_INSTANCE_URL);
+      getBaseUrlMock.mockReturnValue({ baseUrl: DUMMY_INSTANCE_URL });
       const response = await request(app)
         .get('/instanceUrl')
         .query({
@@ -112,7 +115,9 @@ describe('createRouter', () => {
         })
         .send();
       expect(getBaseUrlMock).toBeCalledTimes(1);
-      expect(getBaseUrlMock).toBeCalledWith(DUMMY_INSTANCE_KEY);
+      expect(getBaseUrlMock).toBeCalledWith({
+        instanceName: DUMMY_INSTANCE_KEY,
+      });
       expect(response.status).toEqual(200);
       expect(response.body).toEqual({ instanceUrl: DUMMY_INSTANCE_URL });
     });
diff --git a/plugins/sonarqube-backend/src/service/sonarqubeInfoProvider.test.ts b/plugins/sonarqube-backend/src/service/sonarqubeInfoProvider.test.ts
index fcb73da926..774fdca238 100644
--- a/plugins/sonarqube-backend/src/service/sonarqubeInfoProvider.test.ts
+++ b/plugins/sonarqube-backend/src/service/sonarqubeInfoProvider.test.ts
@@ -237,7 +237,9 @@ describe('DefaultSonarqubeInfoProvider', () => {
         },
       });
 
-      expect(provider.getBaseUrl('')).toEqual('https://sonarqube.example.com');
+      expect(provider.getBaseUrl({ instanceName: '' })).toEqual({
+        baseUrl: 'https://sonarqube.example.com',
+      });
     });
 
     it('Provide base url for named default config and "default" string', async () => {
@@ -253,9 +255,9 @@ describe('DefaultSonarqubeInfoProvider', () => {
         },
       });
 
-      expect(provider.getBaseUrl('default')).toEqual(
-        'https://sonarqube.example.com',
-      );
+      expect(provider.getBaseUrl({ instanceName: 'default' })).toEqual({
+        baseUrl: 'https://sonarqube.example.com',
+      });
     });
 
     it('Provide base url for named config', async () => {
@@ -276,9 +278,9 @@ describe('DefaultSonarqubeInfoProvider', () => {
         },
       });
 
-      expect(provider.getBaseUrl('other')).toEqual(
-        'https://sonarqube-other.example.com',
-      );
+      expect(provider.getBaseUrl({ instanceName: 'other' })).toEqual({
+        baseUrl: 'https://sonarqube-other.example.com',
+      });
     });
   });