Skip to content
Snippets Groups Projects
Commit 3e51fd85 authored by lotte's avatar lotte
Browse files

fixed test issue

parent f7d4d89d
Branches
Tags
No related merge requests found
...@@ -5,6 +5,7 @@ import { TranslateModule } from '@ngx-translate/core'; ...@@ -5,6 +5,7 @@ import { TranslateModule } from '@ngx-translate/core';
import { of as observableOf } from 'rxjs'; import { of as observableOf } from 'rxjs';
import { createSuccessfulRemoteDataObject$, createTestComponent } from '../../../shared/testing/utils'; import { createSuccessfulRemoteDataObject$, createTestComponent } from '../../../shared/testing/utils';
import { SubmissionObjectState } from '../../objects/submission-objects.reducer';
import { SubmissionService } from '../../submission.service'; import { SubmissionService } from '../../submission.service';
import { SubmissionServiceStub } from '../../../shared/testing/submission-service-stub'; import { SubmissionServiceStub } from '../../../shared/testing/submission-service-stub';
import { SectionsService } from '../sections.service'; import { SectionsService } from '../sections.service';
...@@ -18,8 +19,7 @@ import { ...@@ -18,8 +19,7 @@ import {
mockSubmissionId, mockSubmissionId,
mockSubmissionState, mockSubmissionState,
mockUploadConfigResponse, mockUploadConfigResponse,
mockUploadConfigResponseNotRequired, mockUploadConfigResponseNotRequired, mockUploadFiles,
mockUploadFiles
} from '../../../shared/mocks/mock-submission'; } from '../../../shared/mocks/mock-submission';
import { BrowserModule } from '@angular/platform-browser'; import { BrowserModule } from '@angular/platform-browser';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
...@@ -32,7 +32,6 @@ import { cold, hot } from 'jasmine-marbles'; ...@@ -32,7 +32,6 @@ import { cold, hot } from 'jasmine-marbles';
import { Collection } from '../../../core/shared/collection.model'; import { Collection } from '../../../core/shared/collection.model';
import { ResourcePolicy } from '../../../core/shared/resource-policy.model'; import { ResourcePolicy } from '../../../core/shared/resource-policy.model';
import { ResourcePolicyService } from '../../../core/data/resource-policy.service'; import { ResourcePolicyService } from '../../../core/data/resource-policy.service';
import { RemoteData } from '../../../core/data/remote-data';
import { ConfigData } from '../../../core/config/config-data'; import { ConfigData } from '../../../core/config/config-data';
import { PageInfo } from '../../../core/shared/page-info.model'; import { PageInfo } from '../../../core/shared/page-info.model';
import { Group } from '../../../core/eperson/models/group.model'; import { Group } from '../../../core/eperson/models/group.model';
...@@ -66,17 +65,7 @@ function getMockResourcePolicyService(): ResourcePolicyService { ...@@ -66,17 +65,7 @@ function getMockResourcePolicyService(): ResourcePolicyService {
}); });
} }
const sectionObject: SectionDataObject = { let sectionObject: SectionDataObject;
config: 'https://dspace7.4science.it/or2018/api/config/submissionforms/upload',
mandatory: true,
data: {
files: []
},
errors: [],
header: 'submit.progressbar.describe.upload',
id: 'upload',
sectionType: SectionsType.Upload
};
describe('SubmissionSectionUploadComponent test suite', () => { describe('SubmissionSectionUploadComponent test suite', () => {
...@@ -91,30 +80,48 @@ describe('SubmissionSectionUploadComponent test suite', () => { ...@@ -91,30 +80,48 @@ describe('SubmissionSectionUploadComponent test suite', () => {
let uploadsConfigService: any; let uploadsConfigService: any;
let bitstreamService: any; let bitstreamService: any;
const submissionId = mockSubmissionId; let submissionId: string;
const collectionId = mockSubmissionCollectionId; let collectionId: string;
const submissionState = Object.assign({}, mockSubmissionState[mockSubmissionId]); let submissionState: SubmissionObjectState;
const mockCollection = Object.assign(new Collection(), { let mockCollection: Collection;
name: 'Community 1-Collection 1', let mockDefaultAccessCondition: ResourcePolicy;
id: collectionId,
metadata: [
{
key: 'dc.title',
language: 'en_US',
value: 'Community 1-Collection 1'
}],
_links: {
defaultAccessConditions: collectionId + '/defaultAccessConditions'
}
});
const mockDefaultAccessCondition = Object.assign(new ResourcePolicy(), {
name: null,
groupUUID: '11cc35e5-a11d-4b64-b5b9-0052a5d15509',
id: 20,
uuid: 'resource-policy-20'
});
beforeEach(async(() => { beforeEach(async(() => {
sectionObject = {
config: 'https://dspace7.4science.it/or2018/api/config/submissionforms/upload',
mandatory: true,
data: {
files: []
},
errors: [],
header: 'submit.progressbar.describe.upload',
id: 'upload',
sectionType: SectionsType.Upload
};
submissionId = mockSubmissionId;
collectionId = mockSubmissionCollectionId;
submissionState = Object.assign({}, mockSubmissionState[mockSubmissionId]) as any;
mockCollection = Object.assign(new Collection(), {
name: 'Community 1-Collection 1',
id: collectionId,
metadata: [
{
key: 'dc.title',
language: 'en_US',
value: 'Community 1-Collection 1'
}],
_links: {
defaultAccessConditions: collectionId + '/defaultAccessConditions'
}
});
mockDefaultAccessCondition = Object.assign(new ResourcePolicy(), {
name: null,
groupUUID: '11cc35e5-a11d-4b64-b5b9-0052a5d15509',
id: 20,
uuid: 'resource-policy-20'
});
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [ imports: [
BrowserModule, BrowserModule,
...@@ -207,7 +214,7 @@ describe('SubmissionSectionUploadComponent test suite', () => { ...@@ -207,7 +214,7 @@ describe('SubmissionSectionUploadComponent test suite', () => {
comp.onSectionInit(); comp.onSectionInit();
const expectedGroupsMap = new Map([ const expectedGroupsMap = new Map([
[mockUploadConfigResponse.accessConditionOptions[1].name, [mockGroup as any]], [mockUploadConfigResponse.accessConditionOptions[1].name, [mockGroup as any]],
[mockUploadConfigResponse.accessConditionOptions[2].name, [mockGroup as any]], [mockUploadConfigResponse.accessConditionOptions[2].name, [mockGroup as any]],
]); ]);
...@@ -247,7 +254,7 @@ describe('SubmissionSectionUploadComponent test suite', () => { ...@@ -247,7 +254,7 @@ describe('SubmissionSectionUploadComponent test suite', () => {
comp.onSectionInit(); comp.onSectionInit();
const expectedGroupsMap = new Map([ const expectedGroupsMap = new Map([
[mockUploadConfigResponse.accessConditionOptions[1].name, [mockGroup as any]], [mockUploadConfigResponse.accessConditionOptions[1].name, [mockGroup as any]],
[mockUploadConfigResponse.accessConditionOptions[2].name, [mockGroup as any]], [mockUploadConfigResponse.accessConditionOptions[2].name, [mockGroup as any]],
]); ]);
...@@ -282,13 +289,13 @@ describe('SubmissionSectionUploadComponent test suite', () => { ...@@ -282,13 +289,13 @@ describe('SubmissionSectionUploadComponent test suite', () => {
createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup)) createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup))
); );
comp.onSectionInit();
bitstreamService.getUploadedFileList.and.returnValue(hot('-a-b', { bitstreamService.getUploadedFileList.and.returnValue(hot('-a-b', {
a: [], a: [],
b: mockUploadFiles b: mockUploadFiles
})); }));
comp.onSectionInit();
expect(comp.required).toBe(true); expect(comp.required).toBe(true);
expect(compAsAny.getSectionStatus()).toBeObservable(cold('-c-d', { expect(compAsAny.getSectionStatus()).toBeObservable(cold('-c-d', {
...@@ -313,13 +320,13 @@ describe('SubmissionSectionUploadComponent test suite', () => { ...@@ -313,13 +320,13 @@ describe('SubmissionSectionUploadComponent test suite', () => {
createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup)) createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup))
); );
comp.onSectionInit();
bitstreamService.getUploadedFileList.and.returnValue(hot('-a-b', { bitstreamService.getUploadedFileList.and.returnValue(hot('-a-b', {
a: [], a: [],
b: mockUploadFiles b: mockUploadFiles
})); }));
comp.onSectionInit();
expect(comp.required).toBe(false); expect(comp.required).toBe(false);
expect(compAsAny.getSectionStatus()).toBeObservable(cold('-c-d', { expect(compAsAny.getSectionStatus()).toBeObservable(cold('-c-d', {
......
import { ChangeDetectorRef, Component, Inject } from '@angular/core'; import { ChangeDetectorRef, Component, Inject } from '@angular/core';
import { combineLatest, Observable, Subscription } from 'rxjs'; import { combineLatest as observableCombineLatest, Observable, Subscription } from 'rxjs';
import { distinctUntilChanged, filter, find, flatMap, map, reduce, take, tap } from 'rxjs/operators'; import { distinctUntilChanged, filter, find, flatMap, map, reduce, take, tap } from 'rxjs/operators';
import { SectionModelComponent } from '../models/section.model'; import { SectionModelComponent } from '../models/section.model';
...@@ -228,7 +228,7 @@ export class SubmissionSectionUploadComponent extends SectionModelComponent { ...@@ -228,7 +228,7 @@ export class SubmissionSectionUploadComponent extends SectionModelComponent {
}), }),
// retrieve submission's bitstreams from state // retrieve submission's bitstreams from state
combineLatest(this.configMetadataForm$, observableCombineLatest(this.configMetadataForm$,
this.bitstreamService.getUploadedFileList(this.submissionId, this.sectionData.id)).pipe( this.bitstreamService.getUploadedFileList(this.submissionId, this.sectionData.id)).pipe(
filter(([configMetadataForm, fileList]: [SubmissionFormsModel, any[]]) => { filter(([configMetadataForm, fileList]: [SubmissionFormsModel, any[]]) => {
return isNotEmpty(configMetadataForm) && isNotUndefined(fileList) return isNotEmpty(configMetadataForm) && isNotUndefined(fileList)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment