hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-09 11:03:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into w2p-67478_Search-external-sources-in-submission

Browse Source 
Conflicts:
	src/app/+collection-page/collection-page.module.ts
	src/app/+item-page/simple/related-entities/related-entities-search/related-entities-search.component.html
	src/app/+item-page/simple/related-items/related-items-component.ts
	src/app/+search-page/configuration-search-page.component.spec.ts
	src/app/+search-page/configuration-search-page.component.ts
	src/app/+search-page/filtered-search-page.component.spec.ts
	src/app/+search-page/filtered-search-page.component.ts
	src/app/+search-page/search-page.component.html
	src/app/+search-page/search-page.component.ts
	src/app/+search-page/search-page.module.ts
	src/app/+search-page/search.component.spec.ts
	src/app/app.reducer.ts
	src/app/core/data/data.service.spec.ts
	src/app/core/data/data.service.ts
	src/app/core/data/relationship.service.ts
	src/app/core/shared/search/search-configuration.service.ts
	src/app/core/shared/search/search.service.ts
This commit is contained in:
Kristof De Langhe
2019-12-06 11:56:28 +01:00
parent e9a8a25116 a78e0512cb
commit b51218ad5f
119 changed files with 3330 additions and 612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/shared/mocks/mock-request.service.ts
View File

@@ -1,8 +1,9 @@
import {of as observableOf, Observable } from 'rxjs';
import { RequestService } from '../../core/data/request.service';
import { RequestEntry } from '../../core/data/request.reducer';
import SpyObj = jasmine.SpyObj;
export function getMockRequestService(requestEntry$: Observable<RequestEntry> = observableOf(new RequestEntry())): RequestService {
export function getMockRequestService(requestEntry$: Observable<RequestEntry> = observableOf(new RequestEntry())): SpyObj<RequestService> {
return jasmine.createSpyObj('requestService', {
configure: false,
generateRequestId: 'clients/b186e8ce-e99c-4183-bc9a-42b4821bdb78',