fixed broken tests

This commit is contained in:
lotte
2020-04-17 11:06:02 +02:00
parent cb61b0adda
commit b29161988d
3 changed files with 17 additions and 12 deletions

View File

@@ -179,6 +179,7 @@ describe('ConfigResponseParsingService', () => {
Object.assign(new SubmissionDefinitionModel(), { Object.assign(new SubmissionDefinitionModel(), {
isDefault: true, isDefault: true,
name: 'traditional', name: 'traditional',
id: 'traditional',
type: 'submissiondefinition', type: 'submissiondefinition',
_links: { _links: {
sections: { href: 'https://rest.api/config/submissiondefinitions/traditional/sections' }, sections: { href: 'https://rest.api/config/submissiondefinitions/traditional/sections' },
@@ -189,6 +190,7 @@ describe('ConfigResponseParsingService', () => {
header: 'submit.progressbar.describe.stepone', header: 'submit.progressbar.describe.stepone',
mandatory: true, mandatory: true,
sectionType: 'submission-form', sectionType: 'submission-form',
id: 'traditionalpageone',
visibility: { visibility: {
main: null, main: null,
other: 'READONLY' other: 'READONLY'
@@ -203,6 +205,7 @@ describe('ConfigResponseParsingService', () => {
header: 'submit.progressbar.describe.steptwo', header: 'submit.progressbar.describe.steptwo',
mandatory: true, mandatory: true,
sectionType: 'submission-form', sectionType: 'submission-form',
id: 'traditionalpagetwo',
visibility: { visibility: {
main: null, main: null,
other: 'READONLY' other: 'READONLY'
@@ -217,6 +220,7 @@ describe('ConfigResponseParsingService', () => {
header: 'submit.progressbar.upload', header: 'submit.progressbar.upload',
mandatory: false, mandatory: false,
sectionType: 'upload', sectionType: 'upload',
id: 'upload',
visibility: { visibility: {
main: null, main: null,
other: 'READONLY' other: 'READONLY'
@@ -231,6 +235,7 @@ describe('ConfigResponseParsingService', () => {
header: 'submit.progressbar.license', header: 'submit.progressbar.license',
mandatory: true, mandatory: true,
sectionType: 'license', sectionType: 'license',
id: 'license',
visibility: { visibility: {
main: null, main: null,
other: 'READONLY' other: 'READONLY'

View File

@@ -48,6 +48,9 @@ import { MockStore } from '../../shared/testing/mock-store';
import { AppState } from '../../app.reducer'; import { AppState } from '../../app.reducer';
import parseSectionErrors from '../utils/parseSectionErrors'; import parseSectionErrors from '../utils/parseSectionErrors';
import { Item } from '../../core/shared/item.model'; import { Item } from '../../core/shared/item.model';
import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service';
import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
describe('SubmissionObjectEffects test suite', () => { describe('SubmissionObjectEffects test suite', () => {
let submissionObjectEffects: SubmissionObjectEffects; let submissionObjectEffects: SubmissionObjectEffects;
@@ -84,6 +87,10 @@ describe('SubmissionObjectEffects test suite', () => {
{ provide: SectionsService, useClass: SectionsServiceStub }, { provide: SectionsService, useClass: SectionsServiceStub },
{ provide: SubmissionService, useValue: submissionServiceStub }, { provide: SubmissionService, useValue: submissionServiceStub },
{ provide: SubmissionJsonPatchOperationsService, useValue: submissionJsonPatchOperationsServiceStub }, { provide: SubmissionJsonPatchOperationsService, useValue: submissionJsonPatchOperationsServiceStub },
{ provide: WorkspaceitemDataService, useValue: {} },
{ provide: WorkflowItemDataService, useValue: {} },
{ provide: WorkflowItemDataService, useValue: {} },
{ provide: HALEndpointService, useValue: {} },
], ],
}); });

View File

@@ -2,24 +2,23 @@ import { Injectable } from '@angular/core';
import { Actions, Effect, ofType } from '@ngrx/effects'; import { Actions, Effect, ofType } from '@ngrx/effects';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
import { TranslateService } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core';
import { union } from 'lodash'; import { isEqual, union } from 'lodash';
import { from as observableFrom, Observable, of as observableOf, EMPTY as observableEmpty } from 'rxjs'; import { from as observableFrom, Observable, of as observableOf } from 'rxjs';
import { catchError, filter, map, mergeMap, switchMap, take, tap, withLatestFrom } from 'rxjs/operators'; import { catchError, filter, map, mergeMap, switchMap, take, tap, withLatestFrom } from 'rxjs/operators';
import { SubmissionObject } from '../../core/submission/models/submission-object.model'; import { SubmissionObject } from '../../core/submission/models/submission-object.model';
import { WorkflowItem } from '../../core/submission/models/workflowitem.model'; import { WorkflowItem } from '../../core/submission/models/workflowitem.model';
import { WorkspaceitemSectionUploadObject } from '../../core/submission/models/workspaceitem-section-upload.model'; import { WorkspaceitemSectionUploadObject } from '../../core/submission/models/workspaceitem-section-upload.model';
import { WorkspaceitemSectionDataType, WorkspaceitemSectionsObject } from '../../core/submission/models/workspaceitem-sections.model'; import { WorkspaceitemSectionsObject } from '../../core/submission/models/workspaceitem-sections.model';
import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model'; import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model';
import { SubmissionJsonPatchOperationsService } from '../../core/submission/submission-json-patch-operations.service'; import { SubmissionJsonPatchOperationsService } from '../../core/submission/submission-json-patch-operations.service';
import { isEmpty, isNotEmpty, isNotUndefined, hasValue } from '../../shared/empty.util'; import { isEmpty, isNotEmpty, isNotUndefined } from '../../shared/empty.util';
import { NotificationsService } from '../../shared/notifications/notifications.service'; import { NotificationsService } from '../../shared/notifications/notifications.service';
import { SectionsType } from '../sections/sections-type'; import { SectionsType } from '../sections/sections-type';
import { SectionsService } from '../sections/sections.service'; import { SectionsService } from '../sections/sections.service';
import { SubmissionState } from '../submission.reducers'; import { SubmissionState } from '../submission.reducers';
import { SubmissionService } from '../submission.service'; import { SubmissionService } from '../submission.service';
import parseSectionErrors from '../utils/parseSectionErrors'; import parseSectionErrors from '../utils/parseSectionErrors';
import { isEqual } from 'lodash';
import { import {
CompleteInitSubmissionFormAction, CompleteInitSubmissionFormAction,
DepositSubmissionAction, DepositSubmissionAction,
@@ -46,15 +45,9 @@ import {
import { SubmissionObjectEntry, SubmissionSectionObject } from './submission-objects.reducer'; import { SubmissionObjectEntry, SubmissionSectionObject } from './submission-objects.reducer';
import { Item } from '../../core/shared/item.model'; import { Item } from '../../core/shared/item.model';
import { RemoteData } from '../../core/data/remote-data'; import { RemoteData } from '../../core/data/remote-data';
import { import { getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
getRemoteDataPayload,
getSucceededRemoteData,
getFirstSucceededRemoteDataPayload, getAllSucceededRemoteData, getAllSucceededRemoteDataPayload
} from '../../core/shared/operators';
import { MetadataMap, MetadataValue } from '../../core/shared/metadata.models';
import { SubmissionObjectDataService } from '../../core/submission/submission-object-data.service'; import { SubmissionObjectDataService } from '../../core/submission/submission-object-data.service';
import { followLink } from '../../shared/utils/follow-link-config.model'; import { followLink } from '../../shared/utils/follow-link-config.model';
import { ItemDataService } from '../../core/data/item-data.service';
@Injectable() @Injectable()
export class SubmissionObjectEffects { export class SubmissionObjectEffects {