From ca2267faffba6083d372e00edbdc8e20784d7161 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Wed, 14 Sep 2016 21:17:13 +0100 Subject: [PATCH] #726 fix unit tests --- .../core/container-column.model.spec.ts | 3 ++- .../widgets/core/form-field.model.spec.ts | 22 ------------------- .../widgets/core/form-field.model.ts | 4 ++++ .../functional-group.widget.spec.ts | 9 ++++++++ .../widgets/people/people.widget.spec.ts | 6 +++++ .../widgets/widget.component.spec.ts | 2 +- 6 files changed, 22 insertions(+), 24 deletions(-) diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/core/container-column.model.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/core/container-column.model.spec.ts index 5296d54288..eae37d7769 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/core/container-column.model.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/core/container-column.model.spec.ts @@ -17,6 +17,7 @@ import { it, describe, expect } from '@angular/core/testing'; import { ContainerColumnModel } from './container-column.model'; +import { FormModel } from './form.model'; import { FormFieldModel } from './form-field.model'; describe('ContainerColumnModel', () => { @@ -35,7 +36,7 @@ describe('ContainerColumnModel', () => { column.fields = []; expect(column.hasFields()).toBeFalsy(); - column.fields = [new FormFieldModel(null, null)]; + column.fields = [new FormFieldModel(new FormModel(), null)]; expect(column.hasFields()).toBeTruthy(); }); diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field.model.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field.model.spec.ts index aa987b5e2a..e6b2f11226 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field.model.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field.model.spec.ts @@ -113,15 +113,6 @@ describe('FormFieldModel', () => { expect(field.readOnly).toBeTruthy(); }); - it('should parse and convert empty dropdown value', () => { - let field = new FormFieldModel(new FormModel(), { - type: FormFieldTypes.DROPDOWN, - value: '' - }); - - expect(field.value).toBe('empty'); - }); - it('should parse and leave dropdown value as is', () => { let field = new FormFieldModel(new FormModel(), { type: FormFieldTypes.DROPDOWN, @@ -145,19 +136,6 @@ describe('FormFieldModel', () => { expect(field.value).toBe('opt2'); }); - it('should parse and fall back to first radio button value', () => { - let field = new FormFieldModel(new FormModel(), { - type: FormFieldTypes.RADIO_BUTTONS, - options: [ - { id: 'opt1', value: 'Option 1' }, - { id: 'opt2', value: 'Option 2' } - ], - value: 'opt3' - }); - - expect(field.value).toBe('opt1'); - }); - it('should parse and leave radio button value as is', () => { let field = new FormFieldModel(new FormModel(), { type: FormFieldTypes.RADIO_BUTTONS, diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field.model.ts b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field.model.ts index 00f3294b41..1e23b380cb 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field.model.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field.model.ts @@ -195,6 +195,10 @@ export class FormFieldModel extends FormWidgetModel { } updateForm() { + if (!this.form) { + return; + } + switch (this.type) { case FormFieldTypes.DROPDOWN: /* diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/functional-group/functional-group.widget.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/functional-group/functional-group.widget.spec.ts index 4522f643d0..71b3333c20 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/functional-group/functional-group.widget.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/functional-group/functional-group.widget.spec.ts @@ -37,7 +37,16 @@ describe('FunctionalGroupWidget', () => { it('should setup text from underlying field on init', () => { let group = new GroupModel({ name: 'group-1'}); widget.field.value = group; + + spyOn(formService, 'getWorkflowGroups').and.returnValue( + Observable.create(observer => { + observer.next([]); + observer.complete(); + }) + ); + widget.ngOnInit(); + expect(formService.getWorkflowGroups).toHaveBeenCalled(); expect(widget.value).toBe(group.name); }); diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.spec.ts index c20fe413fa..b77151c956 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.spec.ts @@ -62,6 +62,12 @@ describe('PeopleWidget', () => { firstName: 'John', lastName: 'Doe' }); + + spyOn(formService, 'getWorkflowUsers').and.returnValue(Observable.create(observer => { + observer.next([]); + observer.complete(); + })); + widget.ngOnInit(); expect(widget.value).toBe('John Doe'); }); diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/widget.component.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/widget.component.spec.ts index 849e84a255..1c6a3a5c86 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/widget.component.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/widget.component.spec.ts @@ -50,7 +50,7 @@ describe('WidgetComponent', () => { let component = new WidgetComponent(); expect(component.hasField()).toBeFalsy(); - component.field = new FormFieldModel(null); + component.field = new FormFieldModel(new FormModel()); expect(component.hasField()).toBeTruthy(); });