From 27e90f969d990013f0615ac90113aea35b8060d3 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Wed, 30 Jun 2021 10:53:01 +0200
Subject: [PATCH] catalob-backend: more test fixes

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .../next/ConfigLocationEntityProvider.test.ts | 38 +++++++++++-------
 .../src/next/DefaultLocationStore.test.ts     | 40 +++++++++++--------
 .../database/DefaultProcessingDatabase.ts     |  2 +-
 3 files changed, 48 insertions(+), 32 deletions(-)

diff --git a/plugins/catalog-backend/src/next/ConfigLocationEntityProvider.test.ts b/plugins/catalog-backend/src/next/ConfigLocationEntityProvider.test.ts
index 37d549c7f2..7592182bad 100644
--- a/plugins/catalog-backend/src/next/ConfigLocationEntityProvider.test.ts
+++ b/plugins/catalog-backend/src/next/ConfigLocationEntityProvider.test.ts
@@ -41,26 +41,34 @@ describe('ConfigLocationEntityProvider', () => {
     expect(mockConnection.applyMutation).toHaveBeenCalledWith({
       type: 'full',
       entities: expect.arrayContaining([
-        expect.objectContaining({
-          spec: {
-            target: path.join(
-              resolvePackagePath('@backstage/plugin-catalog-backend'),
-              './lols.yaml',
-            ),
-            type: 'file',
-          },
-        }),
+        {
+          entity: expect.objectContaining({
+            spec: {
+              target: path.join(
+                resolvePackagePath('@backstage/plugin-catalog-backend'),
+                './lols.yaml',
+              ),
+              type: 'file',
+            },
+          }),
+          locationKey: expect.stringMatching(
+            /plugins\/catalog-backend\/lols\.yaml$/,
+          ),
+        },
       ]),
     });
     expect(mockConnection.applyMutation).toHaveBeenCalledWith({
       type: 'full',
       entities: expect.arrayContaining([
-        expect.objectContaining({
-          spec: {
-            target: 'https://github.com/backstage/backstage',
-            type: 'url',
-          },
-        }),
+        {
+          entity: expect.objectContaining({
+            spec: {
+              target: 'https://github.com/backstage/backstage',
+              type: 'url',
+            },
+          }),
+          locationKey: 'url:https://github.com/backstage/backstage',
+        },
       ]),
     });
   });
diff --git a/plugins/catalog-backend/src/next/DefaultLocationStore.test.ts b/plugins/catalog-backend/src/next/DefaultLocationStore.test.ts
index 762a585754..82b08f2e70 100644
--- a/plugins/catalog-backend/src/next/DefaultLocationStore.test.ts
+++ b/plugins/catalog-backend/src/next/DefaultLocationStore.test.ts
@@ -113,13 +113,17 @@ describe('DefaultLocationStore', () => {
           type: 'delta',
           removed: [],
           added: expect.arrayContaining([
-            expect.objectContaining({
-              spec: {
-                target:
-                  'https://github.com/backstage/demo/blob/master/catalog-info.yml',
-                type: 'url',
-              },
-            }),
+            {
+              entity: expect.objectContaining({
+                spec: {
+                  target:
+                    'https://github.com/backstage/demo/blob/master/catalog-info.yml',
+                  type: 'url',
+                },
+              }),
+              locationKey:
+                'url:https://github.com/backstage/demo/blob/master/catalog-info.yml',
+            },
           ]),
         });
       },
@@ -156,15 +160,19 @@ describe('DefaultLocationStore', () => {
         expect(connection.applyMutation).toHaveBeenCalledWith({
           type: 'delta',
           added: [],
-          removed: expect.arrayContaining([
-            expect.objectContaining({
-              spec: {
-                target:
-                  'https://github.com/backstage/demo/blob/master/catalog-info.yml',
-                type: 'url',
-              },
-            }),
-          ]),
+          removed: [
+            {
+              entity: expect.objectContaining({
+                spec: {
+                  target:
+                    'https://github.com/backstage/demo/blob/master/catalog-info.yml',
+                  type: 'url',
+                },
+              }),
+              locationKey:
+                'url:https://github.com/backstage/demo/blob/master/catalog-info.yml',
+            },
+          ],
         });
       },
       60_000,
diff --git a/plugins/catalog-backend/src/next/database/DefaultProcessingDatabase.ts b/plugins/catalog-backend/src/next/database/DefaultProcessingDatabase.ts
index d18f194a57..53025682ac 100644
--- a/plugins/catalog-backend/src/next/database/DefaultProcessingDatabase.ts
+++ b/plugins/catalog-backend/src/next/database/DefaultProcessingDatabase.ts
@@ -380,7 +380,7 @@ export class DefaultProcessingDatabase implements ProcessingDatabase {
           }
         } catch (error) {
           if (
-            !error.message.contains('UNIQUE constraint failed') &&
+            !error.message.includes('UNIQUE constraint failed') &&
             error.name !== 'ConflictError'
           ) {
             throw error;