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

Merge branch 'master' into configurable_entities

Browse Source 
Conflicts:
	src/app/+collection-page/collection-page.component.ts
	src/app/+item-page/full/full-item-page.component.ts
	src/app/+item-page/simple/item-page.component.ts
	src/app/+search-page/search-filters/search-filter/search-filter.service.spec.ts
	src/app/+search-page/search-filters/search-filter/search-filter.service.ts
	src/app/+search-page/search-page.component.spec.ts
	src/app/+search-page/search-page.component.ts
	src/app/+search-page/search-results/search-results.component.spec.ts
	src/app/+search-page/search-results/search-results.component.ts
	src/app/+search-page/search-service/search-configuration.service.spec.ts
	src/app/+search-page/search-service/search-configuration.service.ts
	src/app/+search-page/search-service/search.service.ts
	src/app/core/cache/builders/remote-data-build.service.spec.ts
	src/app/core/cache/builders/remote-data-build.service.ts
	src/app/core/data/data.service.ts
	src/app/core/metadata/metadata.service.ts
	src/app/core/shared/item.model.ts
	src/app/core/shared/operators.ts
	src/app/shared/loading/loading.component.ts
	src/app/shared/object-collection/object-collection.component.ts
	src/app/shared/object-list/item-list-element/item-list-element.component.spec.ts
	src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.spec.ts
	src/app/shared/services/route.service.spec.ts
	src/app/shared/services/route.service.ts
	src/app/shared/shared.module.ts
	src/app/shared/testing/hal-endpoint-service-stub.ts
	src/app/shared/testing/search-service-stub.ts
	yarn.lock
This commit is contained in:
lotte
2018-12-10 11:13:01 +01:00
parent c5eb4b701d a3b4883e2d
commit 9c3f226599
236 changed files with 7005 additions and 7392 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/shared/object-collection/object-collection.component.spec.ts
View File

@@ -6,7 +6,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { Config } from '../../../config/config.interface';
import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { Observable } from 'rxjs/Observable';
import { of as observableOf } from 'rxjs';
import { RouterStub } from '../testing/router-stub';
describe('ObjectCollectionComponent', () => {
@@ -16,7 +16,7 @@ describe('ObjectCollectionComponent', () => {
const queryParam = 'test query';
const scopeParam = '7669c72a-3f2a-451f-a3b9-9210e7a4c02f';
const activatedRouteStub = {
queryParams: Observable.of({
queryParams: observableOf({
query: queryParam,
scope: scopeParam
})