From 029d8130c1852de740bcf2999f1d2615768477f6 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Tue, 21 Sep 2021 19:28:06 +0200 Subject: [PATCH] catalog-backend: fix merge conflict Signed-off-by: Patrik Oldsberg --- .../catalog-backend/src/next/DefaultLocationService.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/catalog-backend/src/next/DefaultLocationService.test.ts b/plugins/catalog-backend/src/next/DefaultLocationService.test.ts index 10c9a742c5..78dd9c1009 100644 --- a/plugins/catalog-backend/src/next/DefaultLocationService.test.ts +++ b/plugins/catalog-backend/src/next/DefaultLocationService.test.ts @@ -124,7 +124,7 @@ describe('DefaultLocationServiceTest', () => { }; orchestrator.process.mockResolvedValueOnce({ ok: true, - state: new Map(), + state: {}, completedEntity: { apiVersion: 'backstage.io/v1alpha1', kind: 'Component', @@ -151,7 +151,7 @@ describe('DefaultLocationServiceTest', () => { it('should return exists false when the location does not exist beforehand', async () => { orchestrator.process.mockResolvedValueOnce({ ok: true, - state: new Map(), + state: {}, completedEntity: { apiVersion: 'backstage.io/v1alpha1', kind: 'Component',