From aaaed012272fd3ac0bb044c5786020ed68b470f0 Mon Sep 17 00:00:00 2001
From: Simon <simme.jakobsson@gmail.com>
Date: Tue, 15 Nov 2022 10:58:19 +0100
Subject: [PATCH] ran prettier, removed edited code in bitbucketUrlReader test
 because I misunderstood what should be tested when started on the issue

Signed-off-by: Simon <simme.jakobsson@gmail.com>
---
 .../src/reading/AzureUrlReader.test.ts        |  2 +-
 .../src/reading/AzureUrlReader.ts             |  2 +-
 .../src/reading/BitbucketUrlReader.test.ts    | 30 ++++++++++---------
 .../src/reading/FetchUrlReader.test.ts        |  1 -
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/packages/backend-common/src/reading/AzureUrlReader.test.ts b/packages/backend-common/src/reading/AzureUrlReader.test.ts
index 035f9bcb05..ac753110da 100644
--- a/packages/backend-common/src/reading/AzureUrlReader.test.ts
+++ b/packages/backend-common/src/reading/AzureUrlReader.test.ts
@@ -338,4 +338,4 @@ describe('AzureUrlReader', () => {
       ).rejects.toThrow(NotModifiedError);
     });
   });
-});
\ No newline at end of file
+});
diff --git a/packages/backend-common/src/reading/AzureUrlReader.ts b/packages/backend-common/src/reading/AzureUrlReader.ts
index 9514b410fd..140496c181 100644
--- a/packages/backend-common/src/reading/AzureUrlReader.ts
+++ b/packages/backend-common/src/reading/AzureUrlReader.ts
@@ -200,4 +200,4 @@ export class AzureUrlReader implements UrlReader {
     const { host, token } = this.integration.config;
     return `azure{host=${host},authed=${Boolean(token)}}`;
   }
-}
\ No newline at end of file
+}
diff --git a/packages/backend-common/src/reading/BitbucketUrlReader.test.ts b/packages/backend-common/src/reading/BitbucketUrlReader.test.ts
index c18e779592..49bf06e4a6 100644
--- a/packages/backend-common/src/reading/BitbucketUrlReader.test.ts
+++ b/packages/backend-common/src/reading/BitbucketUrlReader.test.ts
@@ -16,8 +16,8 @@
 
 import { ConfigReader } from '@backstage/config';
 import {
-  BitbucketCloudIntegration,
-  readBitbucketCloudIntegrationConfig
+  BitbucketIntegration,
+  readBitbucketIntegrationConfig,
 } from '@backstage/integration';
 import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
 import fs from 'fs-extra';
@@ -27,14 +27,14 @@ import { setupServer } from 'msw/node';
 import os from 'os';
 import path from 'path';
 import { NotModifiedError } from '@backstage/errors';
-import { BitbucketCloudUrlReader } from './BitbucketCloudUrlReader';
+import { BitbucketUrlReader } from './BitbucketUrlReader';
 import { DefaultReadTreeResponseFactory } from './tree';
 import { getVoidLogger } from '../logging';
 import getRawBody from 'raw-body';
 
 const logger = getVoidLogger();
 
-describe('BitbucketCloudUrlReader.factory', () => {
+describe('BitbucketUrlReader.factory', () => {
   it('only apply integration configs not inherited from bitbucketCloud or bitbucketServer', () => {
     const config = new ConfigReader({
       integrations: {
@@ -57,7 +57,7 @@ describe('BitbucketCloudUrlReader.factory', () => {
       config: config,
     });
 
-    const tuples = BitbucketCloudUrlReader.factory({
+    const tuples = BitbucketUrlReader.factory({
       config,
       logger,
       treeResponseFactory,
@@ -67,32 +67,34 @@ describe('BitbucketCloudUrlReader.factory', () => {
   });
 });
 
-describe('BitbucketCloudUrlReader', () => {
+describe('BitbucketUrlReader', () => {
   const treeResponseFactory = DefaultReadTreeResponseFactory.create({
     config: new ConfigReader({}),
   });
 
-  const bitbucketProcessor = new BitbucketCloudUrlReader(
-    new BitbucketCloudIntegration(
-      readBitbucketCloudIntegrationConfig(
+  const bitbucketProcessor = new BitbucketUrlReader(
+    new BitbucketIntegration(
+      readBitbucketIntegrationConfig(
         new ConfigReader({
           host: 'bitbucket.org',
           apiBaseUrl: 'https://api.bitbucket.org/2.0',
         }),
       ),
     ),
+    logger,
     { treeResponseFactory },
   );
 
-  const hostedBitbucketProcessor = new BitbucketCloudUrlReader(
-    new BitbucketCloudIntegration(
-      readBitbucketCloudIntegrationConfig(
+  const hostedBitbucketProcessor = new BitbucketUrlReader(
+    new BitbucketIntegration(
+      readBitbucketIntegrationConfig(
         new ConfigReader({
           host: 'bitbucket.mycompany.net',
           apiBaseUrl: 'https://api.bitbucket.mycompany.net/rest/api/1.0',
         }),
       ),
     ),
+    logger,
     { treeResponseFactory },
   );
 
@@ -207,7 +209,7 @@ describe('BitbucketCloudUrlReader', () => {
   describe('read', () => {
     it('rejects unknown targets', async () => {
       await expect(
-        bitbucketProcessor.readUrl('https://not.bitbucket.com/apa'),
+        bitbucketProcessor.read('https://not.bitbucket.com/apa'),
       ).rejects.toThrow(
         'Incorrect URL: https://not.bitbucket.com/apa, Error: Invalid Bitbucket URL or file path',
       );
@@ -542,4 +544,4 @@ describe('BitbucketCloudUrlReader', () => {
       ).rejects.toThrow(NotModifiedError);
     });
   });
-});
+});
\ No newline at end of file
diff --git a/packages/backend-common/src/reading/FetchUrlReader.test.ts b/packages/backend-common/src/reading/FetchUrlReader.test.ts
index 18828f2dd0..3b8b3b7f4a 100644
--- a/packages/backend-common/src/reading/FetchUrlReader.test.ts
+++ b/packages/backend-common/src/reading/FetchUrlReader.test.ts
@@ -24,7 +24,6 @@ import { FetchUrlReader } from './FetchUrlReader';
 import { DefaultReadTreeResponseFactory } from './tree';
 import getRawBody from 'raw-body';
 
-
 const fetchUrlReader = new FetchUrlReader();
 
 describe('FetchUrlReader', () => {