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

Merge branch 'master' into w2p-59334_edit-item-metadata-branch

Browse Source 
Conflicts:
	src/app/+community-page/community-page.component.ts
	src/app/core/auth/server-auth.service.ts
	src/app/core/data/dso-response-parsing.service.ts
	src/app/core/data/item-data.service.ts
	src/app/core/data/metadata-schema-data.service.ts
	src/app/core/data/request.models.ts
	src/app/core/metadata/metadata.service.spec.ts
	src/app/core/metadata/normalized-metadata-schema.model.ts
	src/app/core/shared/metadatum.model.ts
	src/app/core/shared/operators.spec.ts
	src/app/shared/shared.module.ts
This commit is contained in:
lotte
2019-02-25 10:28:18 +01:00
parent 35be122eea eb818e4d69
commit c40179fc88
102 changed files with 1959 additions and 1062 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/core/shared/operators.spec.ts
View File

@@ -97,7 +97,7 @@ describe('Core Module - RxJS Operators', () => {
scheduler.schedule(() => source.pipe(getRequestFromRequestUUID(requestService)).subscribe());
scheduler.flush();
expect(requestService.getByUUID).toHaveBeenCalledWith(testRequestUUID);
expect(requestService.getByUUID).toHaveBeenCalledWith(testRequestUUID)
});
it('shouldn\'t return anything if there is no request matching the request uuid', () => {