mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-07 10:04:11 +00:00
[CST-4499] Version history - Old tests fixed
This commit is contained in:
@@ -15,7 +15,8 @@ import { RouterTestingModule } from '@angular/router/testing';
|
|||||||
const mockItem: Item = Object.assign(new Item(), {
|
const mockItem: Item = Object.assign(new Item(), {
|
||||||
bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
|
bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
|
||||||
metadata: [],
|
metadata: [],
|
||||||
relationships: createRelationshipsObservable()
|
relationships: createRelationshipsObservable(),
|
||||||
|
uuid: 'item-uuid',
|
||||||
});
|
});
|
||||||
|
|
||||||
const mockVersion: Version = Object.assign(new Version(), {
|
const mockVersion: Version = Object.assign(new Version(), {
|
||||||
@@ -40,7 +41,7 @@ describe('VersionPageComponent', () => {
|
|||||||
});
|
});
|
||||||
TestBed.configureTestingModule({
|
TestBed.configureTestingModule({
|
||||||
declarations: [VersionPageComponent],
|
declarations: [VersionPageComponent],
|
||||||
imports: [RouterTestingModule],
|
imports: [RouterTestingModule.withRoutes([])],
|
||||||
providers: [
|
providers: [
|
||||||
{ provide: ActivatedRoute, useValue: mockRoute },
|
{ provide: ActivatedRoute, useValue: mockRoute },
|
||||||
{ provide: VersionDataService, useValue: {} },
|
{ provide: VersionDataService, useValue: {} },
|
||||||
|
@@ -3,7 +3,7 @@ import { Observable } from 'rxjs';
|
|||||||
import { RemoteData } from '../../../core/data/remote-data';
|
import { RemoteData } from '../../../core/data/remote-data';
|
||||||
import { ActivatedRoute, Router } from '@angular/router';
|
import { ActivatedRoute, Router } from '@angular/router';
|
||||||
import { AuthService } from '../../../core/auth/auth.service';
|
import { AuthService } from '../../../core/auth/auth.service';
|
||||||
import { map, switchMap, tap } from 'rxjs/operators';
|
import { map, switchMap } from 'rxjs/operators';
|
||||||
import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload, redirectOn4xx } from '../../../core/shared/operators';
|
import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload, redirectOn4xx } from '../../../core/shared/operators';
|
||||||
import { VersionDataService } from '../../../core/data/version-data.service';
|
import { VersionDataService } from '../../../core/data/version-data.service';
|
||||||
import { Version } from '../../../core/shared/version.model';
|
import { Version } from '../../../core/shared/version.model';
|
||||||
@@ -32,7 +32,6 @@ export class VersionPageComponent implements OnInit {
|
|||||||
ngOnInit(): void {
|
ngOnInit(): void {
|
||||||
/* Retrieve version from resolver or redirect on 4xx */
|
/* Retrieve version from resolver or redirect on 4xx */
|
||||||
this.versionRD$ = this.route.data.pipe(
|
this.versionRD$ = this.route.data.pipe(
|
||||||
tap( (data) => { console.log(JSON.stringify(data)); } ),
|
|
||||||
map((data) => data.dso as RemoteData<Version>),
|
map((data) => data.dso as RemoteData<Version>),
|
||||||
redirectOn4xx(this.router, this.authService),
|
redirectOn4xx(this.router, this.authService),
|
||||||
);
|
);
|
||||||
|
Reference in New Issue
Block a user