From f349f27002209c911f72e7ad4a77e38a8e56f6bd Mon Sep 17 00:00:00 2001 From: Art Lowel Date: Wed, 17 Jan 2018 16:29:12 +0100 Subject: [PATCH] fixed type issues in tests --- src/app/core/data/config-response-parsing.service.spec.ts | 1 + src/app/core/dspace-rest-v2/dspace-rest-v2-response.model.ts | 2 +- src/app/core/metadata/metadata.service.spec.ts | 5 ++++- src/app/core/shared/item.model.spec.ts | 3 --- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/app/core/data/config-response-parsing.service.spec.ts b/src/app/core/data/config-response-parsing.service.spec.ts index dc5c42cbd5..3a09de6e4c 100644 --- a/src/app/core/data/config-response-parsing.service.spec.ts +++ b/src/app/core/data/config-response-parsing.service.spec.ts @@ -1,4 +1,5 @@ import { ConfigSuccessResponse, ErrorResponse } from '../cache/response-cache.models'; +import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model'; import { ConfigResponseParsingService } from './config-response-parsing.service'; import { ObjectCacheService } from '../cache/object-cache.service'; import { GlobalConfig } from '../../../config/global-config.interface'; diff --git a/src/app/core/dspace-rest-v2/dspace-rest-v2-response.model.ts b/src/app/core/dspace-rest-v2/dspace-rest-v2-response.model.ts index cb39fc718e..d225eadcc4 100644 --- a/src/app/core/dspace-rest-v2/dspace-rest-v2-response.model.ts +++ b/src/app/core/dspace-rest-v2/dspace-rest-v2-response.model.ts @@ -1,6 +1,6 @@ export interface DSpaceRESTV2Response { payload: { - [name: string]: string; + [name: string]: any; _embedded?: any; _links?: any; page?: any; diff --git a/src/app/core/metadata/metadata.service.spec.ts b/src/app/core/metadata/metadata.service.spec.ts index fe783bb678..4182587cc7 100644 --- a/src/app/core/metadata/metadata.service.spec.ts +++ b/src/app/core/metadata/metadata.service.spec.ts @@ -12,6 +12,7 @@ import { Store, StoreModule } from '@ngrx/store'; import { Observable } from 'rxjs/Observable'; import { RemoteDataError } from '../data/remote-data-error'; +import { UUIDService } from '../shared/uuid.service'; import { MetadataService } from './metadata.service'; @@ -65,6 +66,7 @@ describe('MetadataService', () => { let objectCacheService: ObjectCacheService; let responseCacheService: ResponseCacheService; let requestService: RequestService; + let uuidService: UUIDService; let remoteDataBuildService: RemoteDataBuildService; let itemDataService: ItemDataService; @@ -83,7 +85,8 @@ describe('MetadataService', () => { objectCacheService = new ObjectCacheService(store); responseCacheService = new ResponseCacheService(store); - requestService = new RequestService(objectCacheService, responseCacheService, store); + uuidService = new UUIDService(); + requestService = new RequestService(objectCacheService, responseCacheService, uuidService, store); remoteDataBuildService = new RemoteDataBuildService(objectCacheService, responseCacheService, requestService); TestBed.configureTestingModule({ diff --git a/src/app/core/shared/item.model.spec.ts b/src/app/core/shared/item.model.spec.ts index 1e962f7038..c020cd3454 100644 --- a/src/app/core/shared/item.model.spec.ts +++ b/src/app/core/shared/item.model.spec.ts @@ -104,13 +104,10 @@ describe('Item', () => { function createRemoteDataObject(object: any) { return Observable.of(new RemoteData( - '', false, false, true, undefined, - '200', - new PageInfo(), object ));