From 90beee9a854ef1b868b030c3aea7c58ba62d0cc7 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Fri, 4 Oct 2019 13:34:56 +0200 Subject: [PATCH] 65272: Existing test fixes --- .../abstract-item-update/abstract-item-update.component.ts | 2 +- .../item-metadata/item-metadata.component.spec.ts | 1 + .../item-relationships/item-relationships.component.spec.ts | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/+item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts b/src/app/+item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts index 6cfed8ffdf..3b23704af5 100644 --- a/src/app/+item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts +++ b/src/app/+item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts @@ -57,7 +57,7 @@ export abstract class AbstractItemUpdateComponent implements OnInit { */ ngOnInit(): void { observableCombineLatest(this.route.data, this.route.parent.data).pipe( - map(([data, parentData]) => Object.assign(data, parentData)), + map(([data, parentData]) => Object.assign({}, data, parentData)), map((data) => data.item), first(), map((data: RemoteData) => data.payload) diff --git a/src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.spec.ts b/src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.spec.ts index 0c164b7bc2..e5bf6ea0af 100644 --- a/src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.spec.ts +++ b/src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.spec.ts @@ -123,6 +123,7 @@ describe('ItemMetadataComponent', () => { commitUpdates: {} }); routeStub = { + data: observableOf({}), parent: { data: observableOf({ item: createSuccessfulRemoteDataObject(item) }) } diff --git a/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts b/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts index b1a4e11371..f9b950b343 100644 --- a/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts +++ b/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts @@ -122,6 +122,7 @@ describe('ItemRelationshipsComponent', () => { findById: observableOf(new RemoteData(false, false, true, undefined, item)) }); routeStub = { + data: observableOf({}), parent: { data: observableOf({ item: new RemoteData(false, false, true, null, item) }) }