diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/hyperlink/hyperlink.widget.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/hyperlink/hyperlink.widget.spec.ts index c619be10e5..d6ce5d8d78 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/hyperlink/hyperlink.widget.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/hyperlink/hyperlink.widget.spec.ts @@ -18,6 +18,7 @@ import { HyperlinkWidget } from './hyperlink.widget'; import { FormModel } from './../core/form.model'; import { FormFieldModel } from './../core/form-field.model'; +import { WidgetComponent } from './../widget.component'; describe('HyperlinkWidget', () => { @@ -33,6 +34,7 @@ describe('HyperlinkWidget', () => { widget.field = new FormFieldModel(new FormModel(), { displayText: text }); + widget.ngOnInit(); expect(widget.linkText).toBe(text); }); @@ -44,12 +46,15 @@ describe('HyperlinkWidget', () => { displayText: null, hyperlinkUrl: url }); + widget.ngOnInit(); expect(widget.linkText).toBe(url); }); it('should require field to get link text', () => { widget.field = null; + widget.ngOnInit(); + expect(widget.linkText).toBeNull(); }); @@ -58,21 +63,25 @@ describe('HyperlinkWidget', () => { displayText: null, hyperlinkUrl: null }); + widget.ngOnInit(); expect(widget.linkText).toBeNull(); }); it('should return default url for missing field', () => { widget.field = null; - expect(widget.linkUrl).toBe(HyperlinkWidget.DEFAULT_HYPERLINK_URL); + widget.ngOnInit(); + + expect(widget.linkUrl).toBe(WidgetComponent.DEFAULT_HYPERLINK_URL); }); it('should return default url for missing field property', () => { widget.field = new FormFieldModel(new FormModel(), { hyperlinkUrl: null }); + widget.ngOnInit(); - expect(widget.linkUrl).toBe(HyperlinkWidget.DEFAULT_HYPERLINK_URL); + expect(widget.linkUrl).toBe(WidgetComponent.DEFAULT_HYPERLINK_URL); }); it('should prepend url with scheme', () => { @@ -80,8 +89,9 @@ describe('HyperlinkWidget', () => { widget.field = new FormFieldModel(new FormModel(), { hyperlinkUrl: url }); + widget.ngOnInit(); - expect(widget.linkUrl).toBe(`${HyperlinkWidget.DEFAULT_HYPERLINK_SCHEME}${url}`); + expect(widget.linkUrl).toBe(`${WidgetComponent.DEFAULT_HYPERLINK_SCHEME}${url}`); }); it('should not prepend url with scheme', () => { @@ -89,6 +99,7 @@ describe('HyperlinkWidget', () => { widget.field = new FormFieldModel(new FormModel(), { hyperlinkUrl: url }); + widget.ngOnInit(); expect(widget.linkUrl).toBe(url); }); diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/hyperlink/hyperlink.widget.ts b/ng2-components/ng2-activiti-form/src/components/widgets/hyperlink/hyperlink.widget.ts index 32857a7063..82983f9fd0 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/hyperlink/hyperlink.widget.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/hyperlink/hyperlink.widget.ts @@ -26,8 +26,8 @@ import { WidgetComponent } from './../widget.component'; }) export class HyperlinkWidget extends WidgetComponent implements OnInit { - linkUrl: string; - linkText: string; + linkUrl: string = WidgetComponent.DEFAULT_HYPERLINK_URL; + linkText: string = null; ngOnInit() { if (this.field) {