catalog-backend: fix merge conflict

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
This commit is contained in:
Patrik Oldsberg
2021-09-21 19:28:06 +02:00
committed by Johan Haals
parent c65552b3b7
commit 029d8130c1
@@ -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',