fixed tests after angular 10 upgrade

This commit is contained in:
Giuseppe Digilio
2020-12-03 19:45:05 +01:00
parent 9ed1c74f29
commit 10d0c2e518
212 changed files with 1461 additions and 1333 deletions

View File

@@ -1,5 +1,5 @@
import { ChangeDetectorRef, Component, NO_ERRORS_SCHEMA } from '@angular/core';
import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing';
import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
import { BrowserModule } from '@angular/platform-browser';
import { CommonModule } from '@angular/common';
@@ -87,8 +87,9 @@ describe('SubmissionSectionUploadComponent test suite', () => {
let submissionState: SubmissionObjectState;
let mockCollection: Collection;
let mockDefaultAccessCondition: ResourcePolicy;
let prepareComp;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
sectionObject = {
config: 'https://dspace7.4science.it/or2018/api/config/submissionforms/upload',
mandatory: true,
@@ -123,6 +124,38 @@ describe('SubmissionSectionUploadComponent test suite', () => {
id: 20,
uuid: 'resource-policy-20'
});
uploadsConfigService = getMockSubmissionUploadsConfigService();
submissionServiceStub = new SubmissionServiceStub();
collectionDataService = getMockCollectionDataService();
resourcePolicyService = getMockResourcePolicyService();
groupService = getMockGroupEpersonService();
bitstreamService = getMockSectionUploadService();
prepareComp = () => {
submissionServiceStub.getSubmissionObject.and.returnValue(observableOf(submissionState));
collectionDataService.findById.and.returnValue(createSuccessfulRemoteDataObject$(Object.assign(new Collection(), mockCollection, {
defaultAccessConditions: createSuccessfulRemoteDataObject$(mockDefaultAccessCondition)
})));
resourcePolicyService.findByHref.and.returnValue(createSuccessfulRemoteDataObject$(mockDefaultAccessCondition));
uploadsConfigService.getConfigByHref.and.returnValue(observableOf(
new ConfigData(new PageInfo(), mockUploadConfigResponse as any)
));
groupService.findById.and.returnValues(
createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup)),
createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup))
);
bitstreamService.getUploadedFileList.and.returnValue(observableOf([]));
};
TestBed.configureTestingModule({
imports: [
@@ -135,13 +168,13 @@ describe('SubmissionSectionUploadComponent test suite', () => {
TestComponent
],
providers: [
{ provide: CollectionDataService, useValue: getMockCollectionDataService() },
{ provide: GroupDataService, useValue: getMockGroupEpersonService() },
{ provide: ResourcePolicyService, useValue: getMockResourcePolicyService() },
{ provide: SubmissionUploadsConfigService, useValue: getMockSubmissionUploadsConfigService() },
{ provide: CollectionDataService, useValue: collectionDataService },
{ provide: GroupDataService, useValue: groupService },
{ provide: ResourcePolicyService, useValue: resourcePolicyService },
{ provide: SubmissionUploadsConfigService, useValue: uploadsConfigService },
{ provide: SectionsService, useClass: SectionsServiceStub },
{ provide: SubmissionService, useClass: SubmissionServiceStub },
{ provide: SectionUploadService, useValue: getMockSectionUploadService() },
{ provide: SubmissionService, useValue: submissionServiceStub },
{ provide: SectionUploadService, useValue: bitstreamService },
{ provide: 'sectionDataProvider', useValue: sectionObject },
{ provide: 'submissionIdProvider', useValue: submissionId },
ChangeDetectorRef,
@@ -157,6 +190,8 @@ describe('SubmissionSectionUploadComponent test suite', () => {
// synchronous beforeEach
beforeEach(() => {
prepareComp();
const html = `
<ds-submission-section-upload></ds-submission-section-upload>`;
@@ -180,13 +215,7 @@ describe('SubmissionSectionUploadComponent test suite', () => {
fixture = TestBed.createComponent(SubmissionSectionUploadComponent);
comp = fixture.componentInstance;
compAsAny = comp;
submissionServiceStub = TestBed.inject(SubmissionService as any);
sectionsServiceStub = TestBed.inject(SectionsService as any);
collectionDataService = TestBed.inject(CollectionDataService);
groupService = TestBed.inject(GroupDataService);
resourcePolicyService = TestBed.inject(ResourcePolicyService);
uploadsConfigService = TestBed.inject(SubmissionUploadsConfigService);
bitstreamService = TestBed.inject(SectionUploadService);
});
afterEach(() => {
@@ -197,24 +226,7 @@ describe('SubmissionSectionUploadComponent test suite', () => {
it('should init component properly', () => {
submissionServiceStub.getSubmissionObject.and.returnValue(observableOf(submissionState));
collectionDataService.findById.and.returnValue(createSuccessfulRemoteDataObject$(Object.assign(new Collection(), mockCollection, {
defaultAccessConditions: createSuccessfulRemoteDataObject$(mockDefaultAccessCondition)
})));
resourcePolicyService.findByHref.and.returnValue(createSuccessfulRemoteDataObject$(mockDefaultAccessCondition));
uploadsConfigService.getConfigByHref.and.returnValue(observableOf(
new ConfigData(new PageInfo(), mockUploadConfigResponse as any)
));
groupService.findById.and.returnValues(
createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup)),
createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup))
);
bitstreamService.getUploadedFileList.and.returnValue(observableOf([]));
prepareComp();
comp.onSectionInit();