diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.spec.ts index 5aae862ed0..9cbbd666cd 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.spec.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.spec.ts @@ -1,14 +1,15 @@ import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { cold } from 'jasmine-marbles'; import { of as observableOf } from 'rxjs'; +import { take } from 'rxjs/operators'; import { LinkService } from '../../../../core/cache/builders/link.service'; import { ItemDataService } from '../../../../core/data/item-data.service'; import { Item } from '../../../../core/shared/item.model'; import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model'; +import { getMockLinkService } from '../../../mocks/mock-link-service'; import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type'; import { WorkflowItemSearchResult } from '../../../object-collection/shared/workflow-item-search-result.model'; import { createSuccessfulRemoteDataObject } from '../../../testing/utils'; @@ -59,11 +60,7 @@ let linkService; describe('WorkflowItemSearchResultListElementComponent', () => { beforeEach(async(() => { - linkService = { - resolveLink() { - // mock - }, - }; + linkService = getMockLinkService(); TestBed.configureTestingModule({ imports: [NoopAnimationsModule], declarations: [WorkflowItemSearchResultListElementComponent], @@ -88,8 +85,12 @@ describe('WorkflowItemSearchResultListElementComponent', () => { fixture.detectChanges(); }); - it('should init item properly', () => { - expect(component.item$).toBeObservable(cold('a',{a: item})); + it('should init item properly', (done) => { + component.item$.pipe(take(1)).subscribe((i) => { + expect(linkService.resolveLink).toHaveBeenCalled(); + expect(i).toBe(item); + done(); + }); }); it('should have properly status', () => { diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts index 87ffc86856..441800c8db 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts @@ -3,11 +3,13 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { of as observableOf } from 'rxjs'; +import { take } from 'rxjs/operators'; import { LinkService } from '../../../../core/cache/builders/link.service'; import { ItemDataService } from '../../../../core/data/item-data.service'; import { Item } from '../../../../core/shared/item.model'; import { WorkspaceItem } from '../../../../core/submission/models/workspaceitem.model'; +import { getMockLinkService } from '../../../mocks/mock-link-service'; import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type'; import { WorkflowItemSearchResult } from '../../../object-collection/shared/workflow-item-search-result.model'; import { createSuccessfulRemoteDataObject } from '../../../testing/utils'; @@ -57,7 +59,7 @@ let linkService; describe('WorkspaceItemSearchResultListElementComponent', () => { beforeEach(async(() => { - linkService = getMockLinkService; + linkService = getMockLinkService(); TestBed.configureTestingModule({ imports: [NoopAnimationsModule], declarations: [WorkspaceItemSearchResultListElementComponent], @@ -82,9 +84,12 @@ describe('WorkspaceItemSearchResultListElementComponent', () => { fixture.detectChanges(); }); - it('should init item properly', () => { - expect(linkService.resolveLink).toHaveBeenCalled(); - expect(component.item$).toEqual(observableOf(item)); + it('should init item properly', (done) => { + component.item$.pipe(take(1)).subscribe((i) => { + expect(linkService.resolveLink).toHaveBeenCalled(); + expect(i).toBe(item); + done(); + }); }); it('should have properly status', () => {