From 54f6d37e01c9c47da2accaf8e164dcc846e95e3d Mon Sep 17 00:00:00 2001 From: Vito Albano Date: Wed, 26 Oct 2016 14:22:00 +0100 Subject: [PATCH] Fixed test to detect fail correctly --- .../container/container.widget.spec.ts | 15 ++++++------- .../radio-buttons.widget.spec.ts | 21 ++++++++++--------- .../widgets/tabs/tabs.widget.spec.ts | 17 ++++++++------- 3 files changed, 29 insertions(+), 24 deletions(-) diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.spec.ts index 5ae4d65192..85a530f08b 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.spec.ts @@ -176,9 +176,9 @@ describe('ContainerWidget', () => { }); }); - it('should hide header when it becomes not visible', () => { + it('should hide header when it becomes not visible', async(() => { containerWidgetComponent.content = fakeContainerVisible; - containerWidgetComponent.fieldChanged(null); + fixture.detectChanges(); containerWidgetComponent.formValueChanged.subscribe((res) => { containerWidgetComponent.content.isVisible = false; fixture.detectChanges(); @@ -188,11 +188,11 @@ describe('ContainerWidget', () => { expect(element.querySelector('#container-header-label')).toBeNull(); }); }); - }); - - it('should show header when it becomes visible', () => { - containerWidgetComponent.content = fakeContainerInvisible; containerWidgetComponent.fieldChanged(null); + })); + + it('should show header when it becomes visible', async(() => { + containerWidgetComponent.content = fakeContainerInvisible; containerWidgetComponent.formValueChanged.subscribe((res) => { containerWidgetComponent.content.isVisible = true; fixture.detectChanges(); @@ -204,7 +204,8 @@ describe('ContainerWidget', () => { expect(element.querySelector('#container-header-label').innerHTML).toContain('fake-cont-2-name'); }); }); - }); + containerWidgetComponent.fieldChanged(null); + })); }); diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/radio-buttons/radio-buttons.widget.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/radio-buttons/radio-buttons.widget.spec.ts index 8397b2a373..2431b2af33 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/radio-buttons/radio-buttons.widget.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/radio-buttons/radio-buttons.widget.spec.ts @@ -138,6 +138,7 @@ describe('RadioButtonsWidget', () => { }); radioButtonWidget.field.options = [{id: 'opt-1', name: 'opt-name-1'}, {id: 'opt-2', name: 'opt-name-2'}]; radioButtonWidget.field.isVisible = true; + fixture.detectChanges(); }); afterEach(() => { @@ -145,7 +146,7 @@ describe('RadioButtonsWidget', () => { TestBed.resetTestingModule(); }); - it('should show visible radio buttons', () => { + it('should show visible radio buttons', async(() => { fixture.detectChanges(); fixture.whenStable() .then(() => { @@ -155,9 +156,9 @@ describe('RadioButtonsWidget', () => { expect(element.querySelector('#opt-2')).toBeDefined(); expect(element.querySelector('#radio-id-opt-2')).toBeDefined(); }); - }); + })); - it('should not show invisible radio buttons', () => { + it('should not show invisible radio buttons', async(() => { radioButtonWidget.field.isVisible = false; fixture.detectChanges(); fixture.whenStable() @@ -166,10 +167,9 @@ describe('RadioButtonsWidget', () => { expect(element.querySelector('#opt-1')).toBeNull(); expect(element.querySelector('#opt-2')).toBeNull(); }); - }); + })); - it('should hide radio button when it becomes not visible', () => { - radioButtonWidget.checkVisibility(null); + it('should hide radio button when it becomes not visible', async(() => { radioButtonWidget.fieldChanged.subscribe((res) => { radioButtonWidget.field.isVisible = false; fixture.detectChanges(); @@ -180,12 +180,12 @@ describe('RadioButtonsWidget', () => { expect(element.querySelector('#opt-2')).toBeNull(); }); }); - }); + radioButtonWidget.checkVisibility(null); + })); - it('should show radio button when it becomes visible', () => { + it('should show radio button when it becomes visible', async(() => { radioButtonWidget.field.isVisible = false; fixture.detectChanges(); - radioButtonWidget.checkVisibility(null); radioButtonWidget.fieldChanged.subscribe((res) => { radioButtonWidget.field.isVisible = true; fixture.detectChanges(); @@ -198,7 +198,8 @@ describe('RadioButtonsWidget', () => { expect(element.querySelector('#radio-id-opt-2')).toBeDefined(); }); }); - }); + radioButtonWidget.checkVisibility(null); + })); }); }); diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/tabs/tabs.widget.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/tabs/tabs.widget.spec.ts index 4a253835fa..c61bf2c9ce 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/tabs/tabs.widget.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/tabs/tabs.widget.spec.ts @@ -111,7 +111,8 @@ describe('TabsWidget', () => { })); beforeEach(() => { - componentHandler = jasmine.createSpyObj('componentHandler', ['upgradeAllRegistered', 'upgradeElement']); + componentHandler = jasmine.createSpyObj('componentHandler', + ['upgradeAllRegistered', 'upgradeElement', 'downgradeElements']); window['componentHandler'] = componentHandler; fakeTabVisible = new TabModel(new FormModel(fakeFormJson), { id: 'tab-id-visible', @@ -144,8 +145,8 @@ describe('TabsWidget', () => { }); }); - it('should show tab when it became visible', () => { - tabWidgetComponent.tabChanged(null); + it('should show tab when it became visible', async(() => { + fixture.detectChanges(); tabWidgetComponent.formTabChanged.subscribe((res) => { tabWidgetComponent.tabs[1].isVisible = true; fixture.detectChanges(); @@ -155,10 +156,11 @@ describe('TabsWidget', () => { expect(element.querySelector('#title-tab-id-invisible').innerHTML).toContain('tab-title-invisible'); }); }); - }); - - it('should hide tab when it became not visible', () => { tabWidgetComponent.tabChanged(null); + })); + + it('should hide tab when it became not visible', async(() => { + fixture.detectChanges(); tabWidgetComponent.formTabChanged.subscribe((res) => { tabWidgetComponent.tabs[0].isVisible = false; fixture.detectChanges(); @@ -168,7 +170,8 @@ describe('TabsWidget', () => { expect(element.querySelector('#title-tab-id-visible')).toBeNull(); }); }); - }); + tabWidgetComponent.tabChanged(null); + })); }); });