From e182378572022a26af5060f8824c8402ff02ffe5 Mon Sep 17 00:00:00 2001 From: Kim Shepherd Date: Sat, 23 Apr 2022 16:05:46 +1200 Subject: [PATCH] [TLC-254] Remove inappropriate tests from form builder, component --- ...c-form-control-container.component.spec.ts | 42 +++---------------- .../form/builder/form-builder.service.spec.ts | 12 ++---- 2 files changed, 8 insertions(+), 46 deletions(-) diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts index d1299cedfe..0eef646220 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts @@ -65,7 +65,6 @@ import { DsDynamicFormArrayComponent } from './models/array-group/dynamic-form-a import { DsDynamicFormGroupComponent } from './models/form-group/dynamic-form-group.component'; import { DsDynamicRelationGroupComponent } from './models/relation-group/dynamic-relation-group.components'; import { DsDatePickerInlineComponent } from './models/date-picker-inline/dynamic-date-picker-inline.component'; -import { DsDynamicTypeBindRelationService } from './ds-dynamic-type-bind-relation.service'; import { RelationshipService } from '../../../../core/data/relationship.service'; import { SelectableListService } from '../../../object-list/selectable-list/selectable-list.service'; import { ItemDataService } from '../../../../core/data/item-data.service'; @@ -80,29 +79,6 @@ import { SubmissionService } from '../../../../submission/submission.service'; import { FormBuilderService } from '../form-builder.service'; import { NgxMaskModule } from 'ngx-mask'; -function getMockDsDynamicTypeBindRelationService(): DsDynamicTypeBindRelationService { - return jasmine.createSpyObj('DsDynamicTypeBindRelationService', { - getRelatedFormModel: jasmine.createSpy('getRelatedFormModel'), - matchesCondition: jasmine.createSpy('matchesCondition'), - subscribeRelations: jasmine.createSpy('subscribeRelations') - }); -} - -function getTypeBindRelations(configuredTypeBindValues: string[]): DynamicFormControlRelation[] { - const bindValues = []; - configuredTypeBindValues.forEach((value) => { - bindValues.push({ - id: 'dc.type', - value: value - }); - }); - return [{ - match: MATCH_VISIBLE, - operator: OR_OPERATOR, - when: bindValues - }]; -} - describe('DsDynamicFormControlContainerComponent test suite', () => { const vocabularyOptions: VocabularyOptions = { @@ -136,7 +112,11 @@ describe('DsDynamicFormControlContainerComponent test suite', () => { repeatable: false, submissionId: '1234', hasSelectableMetadata: false, - typeBindRelations: getTypeBindRelations(['Book']) + typeBindRelations: [{ + match: MATCH_VISIBLE, + operator: OR_OPERATOR, + when: [{id: 'dc.type', value: 'Book'}] + }] }), new DynamicScrollableDropdownModel({ id: 'scrollableDropdown', @@ -225,7 +205,6 @@ describe('DsDynamicFormControlContainerComponent test suite', () => { providers: [ DsDynamicFormControlContainerComponent, DynamicFormService, - { provide: DsDynamicTypeBindRelationService, useValue: getMockDsDynamicTypeBindRelationService() }, { provide: RelationshipService, useValue: {} }, { provide: SelectableListService, useValue: {} }, { provide: ItemDataService, useValue: {} }, @@ -383,15 +362,4 @@ describe('DsDynamicFormControlContainerComponent test suite', () => { expect(testFn(formModel[25])).toEqual(DsDynamicFormGroupComponent); }); - it('should display a type-bound field when dc.type matcher set to Book', () => { - const rels: any = getMockDsDynamicTypeBindRelationService().getRelatedFormModel(formModel[16]); - const isVisible = getMockDsDynamicTypeBindRelationService().matchesCondition(rels.typeBindRelations, rels.matcher); - expect(isVisible).toBeTruthy(); - }); - - it('Should successfully subscribe type bind relations for component', () => { - const subscriptions = getMockDsDynamicTypeBindRelationService().subscribeRelations(component.model, component.control); - expect(subscriptions).toBeDefined(); - }); - }); diff --git a/src/app/shared/form/builder/form-builder.service.spec.ts b/src/app/shared/form/builder/form-builder.service.spec.ts index 6ec18594c5..b228821587 100644 --- a/src/app/shared/form/builder/form-builder.service.spec.ts +++ b/src/app/shared/form/builder/form-builder.service.spec.ts @@ -15,7 +15,7 @@ import { DynamicEditorModel, DynamicFileUploadModel, DynamicFormArrayModel, - DynamicFormControlModel, + DynamicFormControlModel, DynamicFormControlRelation, DynamicFormGroupModel, DynamicFormValidationService, DynamicFormValueControlModel, @@ -26,7 +26,7 @@ import { DynamicSliderModel, DynamicSwitchModel, DynamicTextAreaModel, - DynamicTimePickerModel + DynamicTimePickerModel, MATCH_VISIBLE, OR_OPERATOR } from '@ng-dynamic-forms/core'; import { DynamicTagModel } from './ds-dynamic-form-ui/models/tag/dynamic-tag.model'; import { DynamicListCheckboxGroupModel } from './ds-dynamic-form-ui/models/list/dynamic-list-checkbox-group.model'; @@ -317,7 +317,7 @@ describe('FormBuilderService test suite', () => { metadataFields: ['dc.contributor.author'], hasSelectableMetadata: true, showButtons: true, - typeBindRelations: [] + typeBindRelations: typeBindRelationService.getTypeBindRelations(['Book']) }, ), ]; @@ -892,10 +892,4 @@ describe('FormBuilderService test suite', () => { expect(formArray.length === 0).toBe(true); }); - it('should hide on type bind', () => { - const model = service.findById('testFormArray', testModel) as DynamicFormArrayModel; - typeBindRelationService.getRelatedFormModel(model); - const formArray = service.createFormArray(model); - }); - });