Merge remote-tracking branch 'remotes/origin/master' into #601-resource-policies

# Conflicts:
#	src/app/core/eperson/eperson-data.service.spec.ts
#	src/app/core/eperson/group-data.service.spec.ts
#	src/app/shared/shared.module.ts
#	src/app/submission/sections/upload/section-upload.component.spec.ts
This commit is contained in:
Giuseppe Digilio
2020-05-20 15:37:33 +02:00
585 changed files with 7233 additions and 9615 deletions

View File

@@ -1,15 +1,19 @@
import { ChangeDetectorRef, Component, NO_ERRORS_SCHEMA } from '@angular/core';
import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing';
import { TranslateModule } from '@ngx-translate/core';
import { BrowserModule } from '@angular/platform-browser';
import { CommonModule } from '@angular/common';
import { TranslateModule } from '@ngx-translate/core';
import { cold } from 'jasmine-marbles';
import { of as observableOf } from 'rxjs';
import { createSuccessfulRemoteDataObject$, createTestComponent } from '../../../shared/testing/utils';
import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
import { createTestComponent } from '../../../shared/testing/utils.test';
import { SubmissionObjectState } from '../../objects/submission-objects.reducer';
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 { SectionsServiceStub } from '../../../shared/testing/sections-service-stub';
import { SectionsServiceStub } from '../../../shared/testing/sections-service.stub';
import { SubmissionFormsConfigService } from '../../../core/config/submission-forms-config.service';
import { SectionDataObject } from '../models/section-data.model';
import { SectionsType } from '../sections-type';
@@ -21,22 +25,19 @@ import {
mockUploadConfigResponse,
mockUploadConfigResponseNotRequired,
mockUploadFiles,
} from '../../../shared/mocks/mock-submission';
import { BrowserModule } from '@angular/platform-browser';
import { CommonModule } from '@angular/common';
} from '../../../shared/mocks/submission.mock';
import { SubmissionUploadsConfigService } from '../../../core/config/submission-uploads-config.service';
import { SectionUploadService } from './section-upload.service';
import { SubmissionSectionUploadComponent } from './section-upload.component';
import { CollectionDataService } from '../../../core/data/collection-data.service';
import { GroupDataService } from '../../../core/eperson/group-data.service';
import { cold } from 'jasmine-marbles';
import { Collection } from '../../../core/shared/collection.model';
import { ResourcePolicy } from '../../../core/resource-policy/models/resource-policy.model';
import { ResourcePolicyService } from '../../../core/resource-policy/resource-policy.service';
import { ConfigData } from '../../../core/config/config-data';
import { PageInfo } from '../../../core/shared/page-info.model';
import { Group } from '../../../core/eperson/models/group.model';
import { getMockSectionUploadService } from '../../../shared/mocks/mock-section-upload.service';
import { getMockSectionUploadService } from '../../../shared/mocks/section-upload.service.mock';
function getMockSubmissionUploadsConfigService(): SubmissionFormsConfigService {
return jasmine.createSpyObj('SubmissionUploadsConfigService', {