From 4f2697bf52b3c438f96008b08758fd3bf5e9e69b Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Mon, 27 Sep 2021 12:26:20 +0200 Subject: [PATCH] [CST-4499] Version history - New version refactored (with tests) --- .../versioned-item.component.spec.ts | 27 ++++++++++++++++++- .../version-page.component.spec.ts | 3 +-- .../item-versions-shared.service.spec.ts | 17 +++++++++++- .../item-versions.component.html | 6 ++--- .../item-versions.component.spec.ts | 27 ++++++++++--------- 5 files changed, 60 insertions(+), 20 deletions(-) diff --git a/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.spec.ts b/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.spec.ts index 5ba80717f0..5115255a71 100644 --- a/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.spec.ts +++ b/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.spec.ts @@ -1,6 +1,23 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { VersionedItemComponent } from './versioned-item.component'; +import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service'; +import { TranslateService } from '@ngx-translate/core'; +import { VersionDataService } from '../../../../core/data/version-data.service'; +import { NotificationsService } from '../../../../shared/notifications/notifications.service'; +import { ItemVersionsSharedService } from '../../../../shared/item/item-versions/item-versions-shared.service'; +import { Item } from '../../../../core/shared/item.model'; +import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils'; +import { buildPaginatedList } from '../../../../core/data/paginated-list.model'; +import { PageInfo } from '../../../../core/shared/page-info.model'; +import { MetadataMap } from '../../../../core/shared/metadata.models'; +import { createRelationshipsObservable } from '../shared/item.component.spec'; + +const mockItem: Item = Object.assign(new Item(), { + bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])), + metadata: new MetadataMap(), + relationships: createRelationshipsObservable() +}); describe('VersionedItemComponent', () => { let component: VersionedItemComponent; @@ -8,7 +25,14 @@ describe('VersionedItemComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ VersionedItemComponent ] + declarations: [ VersionedItemComponent ], + providers: [ + { provide: VersionHistoryDataService, useValue: {} }, + { provide: TranslateService, useValue: {} }, + { provide: VersionDataService, useValue: {} }, + { provide: NotificationsService, useValue: {} }, + { provide: ItemVersionsSharedService, useValue: {} }, + ] }) .compileComponents(); }); @@ -16,6 +40,7 @@ describe('VersionedItemComponent', () => { beforeEach(() => { fixture = TestBed.createComponent(VersionedItemComponent); component = fixture.componentInstance; + component.object = mockItem; fixture.detectChanges(); }); diff --git a/src/app/item-page/version-page/version-page/version-page.component.spec.ts b/src/app/item-page/version-page/version-page/version-page.component.spec.ts index aedf0aa549..b1dd8bc161 100644 --- a/src/app/item-page/version-page/version-page/version-page.component.spec.ts +++ b/src/app/item-page/version-page/version-page/version-page.component.spec.ts @@ -51,8 +51,7 @@ describe('VersionPageComponent', () => { { provide: VersionDataService, useValue: {} }, { provide: AuthService, useValue: authService }, ], - }) - .compileComponents(); + }).compileComponents(); })); diff --git a/src/app/shared/item/item-versions/item-versions-shared.service.spec.ts b/src/app/shared/item/item-versions/item-versions-shared.service.spec.ts index cf9a65c0e7..e9aa2cc18a 100644 --- a/src/app/shared/item/item-versions/item-versions-shared.service.spec.ts +++ b/src/app/shared/item/item-versions/item-versions-shared.service.spec.ts @@ -1,12 +1,27 @@ import { TestBed } from '@angular/core/testing'; import { ItemVersionsSharedService } from './item-versions-shared.service'; +import { ActivatedRoute } from '@angular/router'; +import { VersionDataService } from '../../../core/data/version-data.service'; +import { AuthService } from '../../../core/auth/auth.service'; +import { NotificationsService } from '../../notifications/notifications.service'; +import { TranslateService } from '@ngx-translate/core'; +import { VersionHistoryDataService } from '../../../core/data/version-history-data.service'; describe('ItemVersionsSharedService', () => { let service: ItemVersionsSharedService; beforeEach(() => { - TestBed.configureTestingModule({}); + TestBed.configureTestingModule({ + providers: [ + { provide: ActivatedRoute, useValue: {} }, + { provide: VersionDataService, useValue: {} }, + { provide: VersionHistoryDataService, useValue: {} }, + { provide: AuthService, useValue: {} }, + { provide: NotificationsService, useValue: {} }, + { provide: TranslateService, useValue: {} }, + ], + }); service = TestBed.inject(ItemVersionsSharedService); }); diff --git a/src/app/shared/item/item-versions/item-versions.component.html b/src/app/shared/item/item-versions/item-versions.component.html index c3bf6a9beb..18bfd446b3 100644 --- a/src/app/shared/item/item-versions/item-versions.component.html +++ b/src/app/shared/item/item-versions/item-versions.component.html @@ -47,7 +47,7 @@
-