From 265b74f3d654fc5362b6de5b0a92a2425a29b5aa Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 3 Dec 2020 10:08:59 +0100 Subject: [PATCH] fixed SubmissionImportExternalPreviewComponent after angular 10 upgrade --- ...-import-external-preview.component.spec.ts | 39 +++++++++++-------- ...ssion-import-external-preview.component.ts | 4 +- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.spec.ts b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.spec.ts index a0e8ed865a..f7ff88c3b1 100644 --- a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.spec.ts +++ b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.spec.ts @@ -1,11 +1,13 @@ import { Component, NO_ERRORS_SCHEMA } from '@angular/core'; -import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing'; -import { TranslateModule } from '@ngx-translate/core'; +import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing'; import { Router } from '@angular/router'; + +import { TranslateModule } from '@ngx-translate/core'; import { NgbActiveModal, NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TestScheduler } from 'rxjs/testing'; import { of as observableOf } from 'rxjs'; import { getTestScheduler } from 'jasmine-marbles'; + import { SubmissionImportExternalPreviewComponent } from './submission-import-external-preview.component'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { RouterStub } from '../../../shared/testing/router.stub'; @@ -18,6 +20,20 @@ import { Metadata } from '../../../core/shared/metadata.utils'; import { SubmissionImportExternalCollectionComponent } from '../import-external-collection/submission-import-external-collection.component'; import { CollectionListEntry } from '../../../shared/collection-dropdown/collection-dropdown.component'; +const externalEntry = Object.assign(new ExternalSourceEntry(), { + id: '0001-0001-0001-0001', + display: 'John Doe', + value: 'John, Doe', + metadata: { + 'dc.identifier.uri': [ + { + value: 'https://orcid.org/0001-0001-0001-0001' + } + ] + }, + _links: { self: { href: 'http://test-rest.com/server/api/integration/externalSources/orcidV2/entryValues/0000-0003-4851-8004' } } +}); + describe('SubmissionImportExternalPreviewComponent test suite', () => { let comp: SubmissionImportExternalPreviewComponent; let compAsAny: any; @@ -26,21 +42,9 @@ describe('SubmissionImportExternalPreviewComponent test suite', () => { let scheduler: TestScheduler; const ngbActiveModal = jasmine.createSpyObj('modal', ['close', 'dismiss']); const ngbModal = jasmine.createSpyObj('modal', ['open']); - const externalEntry = Object.assign(new ExternalSourceEntry(), { - id: '0001-0001-0001-0001', - display: 'John Doe', - value: 'John, Doe', - metadata: { - 'dc.identifier.uri': [ - { - value: 'https://orcid.org/0001-0001-0001-0001' - } - ] - }, - _links: { self: { href: 'http://test-rest.com/server/api/integration/externalSources/orcidV2/entryValues/0000-0003-4851-8004' } } - }); - beforeEach(async(() => { + + beforeEach(waitForAsync(() => { scheduler = getTestScheduler(); TestBed.configureTestingModule({ imports: [ @@ -70,7 +74,7 @@ describe('SubmissionImportExternalPreviewComponent test suite', () => { // synchronous beforeEach beforeEach(() => { const html = ` - `; + `; testFixture = createTestComponent(html, TestComponent) as ComponentFixture; testComp = testFixture.componentInstance; }); @@ -162,4 +166,5 @@ describe('SubmissionImportExternalPreviewComponent test suite', () => { }) class TestComponent { + externalSourceEntry = externalEntry; } diff --git a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.ts b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.ts index 8294ec66ba..1ee094eba6 100644 --- a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.ts +++ b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import { NgbActiveModal, NgbModalRef, NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { ExternalSourceEntry } from '../../../core/shared/external-source-entry.model'; @@ -23,7 +23,7 @@ export class SubmissionImportExternalPreviewComponent implements OnInit { /** * The external source entry */ - public externalSourceEntry: ExternalSourceEntry; + @Input() public externalSourceEntry: ExternalSourceEntry; /** * The entry metadata list */