From 18afb35e7489dd24c57f4c9b3543ec455b86371b Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Wed, 30 Jan 2019 11:32:12 +0100
Subject: [PATCH] 59415: Fixed existing tests
---
.../browse/browse-entry-search-options.model.ts | 8 ++++----
src/app/core/browse/browse.service.spec.ts | 13 +++++++------
...rowse-entries-response-parsing.service.spec.ts | 15 ---------------
3 files changed, 11 insertions(+), 25 deletions(-)
diff --git a/src/app/core/browse/browse-entry-search-options.model.ts b/src/app/core/browse/browse-entry-search-options.model.ts
index 94e2013ce0..a4911a33f1 100644
--- a/src/app/core/browse/browse-entry-search-options.model.ts
+++ b/src/app/core/browse/browse-entry-search-options.model.ts
@@ -4,14 +4,14 @@ import { SortOptions } from '../cache/models/sort-options.model';
/**
* A class that defines the search options to be used for fetching browse entries or items
* - metadataDefinition: The metadata definition to fetch entries or items for
- * - pagination: The pagination options to use
- * - sort: The sorting options to use
+ * - pagination: Optional pagination options to use
+ * - sort: Optional sorting options to use
* - scope: An optional scope to limit the results within a specific collection or community
*/
export class BrowseEntrySearchOptions {
constructor(public metadataDefinition: string,
- public pagination: PaginationComponentOptions,
- public sort: SortOptions,
+ public pagination?: PaginationComponentOptions,
+ public sort?: SortOptions,
public scope?: string) {
}
}
diff --git a/src/app/core/browse/browse.service.spec.ts b/src/app/core/browse/browse.service.spec.ts
index d43a26ed4b..79df1ea88c 100644
--- a/src/app/core/browse/browse.service.spec.ts
+++ b/src/app/core/browse/browse.service.spec.ts
@@ -10,6 +10,7 @@ import { BrowseEndpointRequest, BrowseEntriesRequest, BrowseItemsRequest } from
import { RequestService } from '../data/request.service';
import { BrowseDefinition } from '../shared/browse-definition.model';
import { BrowseService } from './browse.service';
+import { BrowseEntrySearchOptions } from './browse-entry-search-options.model';
describe('BrowseService', () => {
let scheduler: TestScheduler;
@@ -162,14 +163,14 @@ describe('BrowseService', () => {
it('should configure a new BrowseEntriesRequest', () => {
const expected = new BrowseEntriesRequest(requestService.generateRequestId(), browseDefinitions[1]._links.entries);
- scheduler.schedule(() => service.getBrowseEntriesFor(browseDefinitions[1].id).subscribe());
+ scheduler.schedule(() => service.getBrowseEntriesFor(new BrowseEntrySearchOptions(browseDefinitions[1].id)).subscribe());
scheduler.flush();
expect(requestService.configure).toHaveBeenCalledWith(expected);
});
it('should call RemoteDataBuildService to create the RemoteData Observable', () => {
- service.getBrowseEntriesFor(browseDefinitions[1].id);
+ service.getBrowseEntriesFor(new BrowseEntrySearchOptions(browseDefinitions[1].id));
expect(rdbService.toRemoteDataObservable).toHaveBeenCalled();
@@ -181,14 +182,14 @@ describe('BrowseService', () => {
it('should configure a new BrowseItemsRequest', () => {
const expected = new BrowseItemsRequest(requestService.generateRequestId(), browseDefinitions[1]._links.items + '?filterValue=' + mockAuthorName);
- scheduler.schedule(() => service.getBrowseItemsFor(browseDefinitions[1].id, mockAuthorName).subscribe());
+ scheduler.schedule(() => service.getBrowseItemsFor(mockAuthorName, new BrowseEntrySearchOptions(browseDefinitions[1].id)).subscribe());
scheduler.flush();
expect(requestService.configure).toHaveBeenCalledWith(expected);
});
it('should call RemoteDataBuildService to create the RemoteData Observable', () => {
- service.getBrowseItemsFor(browseDefinitions[1].id, mockAuthorName);
+ service.getBrowseItemsFor(mockAuthorName, new BrowseEntrySearchOptions(browseDefinitions[1].id));
expect(rdbService.toRemoteDataObservable).toHaveBeenCalled();
@@ -202,7 +203,7 @@ describe('BrowseService', () => {
const definitionID = 'invalidID';
const expected = cold('--#-', undefined, new Error(`No metadata browse definition could be found for id '${definitionID}'`))
- expect(service.getBrowseEntriesFor(definitionID)).toBeObservable(expected);
+ expect(service.getBrowseEntriesFor(new BrowseEntrySearchOptions(definitionID))).toBeObservable(expected);
});
});
@@ -212,7 +213,7 @@ describe('BrowseService', () => {
const definitionID = 'invalidID';
const expected = cold('--#-', undefined, new Error(`No metadata browse definition could be found for id '${definitionID}'`))
- expect(service.getBrowseItemsFor(definitionID, mockAuthorName)).toBeObservable(expected);
+ expect(service.getBrowseItemsFor(mockAuthorName, new BrowseEntrySearchOptions(definitionID))).toBeObservable(expected);
});
});
});
diff --git a/src/app/core/data/browse-entries-response-parsing.service.spec.ts b/src/app/core/data/browse-entries-response-parsing.service.spec.ts
index dd04e4f2f5..087824ae6c 100644
--- a/src/app/core/data/browse-entries-response-parsing.service.spec.ts
+++ b/src/app/core/data/browse-entries-response-parsing.service.spec.ts
@@ -105,21 +105,6 @@ describe('BrowseEntriesResponseParsingService', () => {
} as DSpaceRESTV2Response;
const invalidResponseNotAList = {
- payload: {
- authority: null,
- value: 'Arulmozhiyal, Ramaswamy',
- valueLang: null,
- count: 1,
- type: 'browseEntry',
- _links: {
- self: {
- href: 'https://rest.api/discover/browses/author/entries'
- },
- items: {
- href: 'https://rest.api/discover/browses/author/items?filterValue=Arulmozhiyal, Ramaswamy'
- }
- },
- },
statusCode: '200'
} as DSpaceRESTV2Response;
--
GitLab