diff --git a/packages/angular/demo/e2e/basic-inputs.e2e-spec.ts b/packages/angular/demo/e2e/basic-inputs.e2e-spec.ts index 146c7d1c19..b9fed68a2a 100644 --- a/packages/angular/demo/e2e/basic-inputs.e2e-spec.ts +++ b/packages/angular/demo/e2e/basic-inputs.e2e-spec.ts @@ -100,11 +100,11 @@ describe('Basic Inputs Page', () => { }); }); - describe('select input', () => { + describe('date time picker', () => { it('should be set the initial value', () => { page.navigateTo(); - const el = page.getIonicSelect(); - expect(el.getAttribute('value')).toEqual('brains'); + const el = page.getIonicDatetime(); + expect(el.getAttribute('value')).toEqual('2017-11-18T14:17:45-06:00'); }); }); diff --git a/packages/angular/demo/e2e/basic-inputs.po.ts b/packages/angular/demo/e2e/basic-inputs.po.ts index 2850dcd9ad..54d6eb2849 100644 --- a/packages/angular/demo/e2e/basic-inputs.po.ts +++ b/packages/angular/demo/e2e/basic-inputs.po.ts @@ -13,12 +13,12 @@ export class BasicInputsPage { return element(by.id('checkboxOutput')).getText(); } - getIonicSelect() { - return element(by.id('ionSelect')); + getIonicDatetime() { + return element(by.id('ionDatetimeInput')); } - getSelectOutput() { - return element(by.id('selectOutput')).getText(); + getDatetimeOutput() { + return element(by.id('datetimeOutput')).getText(); } getIonicToggle() { diff --git a/packages/angular/demo/e2e/group-inputs.e2e-spec.ts b/packages/angular/demo/e2e/group-inputs.e2e-spec.ts index 18cc3a6f3c..ef789cc124 100644 --- a/packages/angular/demo/e2e/group-inputs.e2e-spec.ts +++ b/packages/angular/demo/e2e/group-inputs.e2e-spec.ts @@ -100,4 +100,12 @@ describe('Group Inputs Page', () => { }); }); }); + + describe('select input', () => { + it('should be set the initial value', () => { + page.navigateTo(); + const el = page.getIonicSelect(); + expect(el.getAttribute('value')).toEqual('brains'); + }); + }); }); diff --git a/packages/angular/demo/e2e/group-inputs.po.ts b/packages/angular/demo/e2e/group-inputs.po.ts index 5dae783af0..4d21c87c09 100644 --- a/packages/angular/demo/e2e/group-inputs.po.ts +++ b/packages/angular/demo/e2e/group-inputs.po.ts @@ -50,4 +50,12 @@ export class GroupInputsPage { getRadioOutputText() { return element(by.id('radioOutput')).getText(); } + + getIonicSelect() { + return element(by.id('ionSelect')); + } + + getSelectOutput() { + return element(by.id('selectOutput')).getText(); + } } diff --git a/packages/angular/demo/src/app/basic-inputs-page/basic-inputs-page.component.html b/packages/angular/demo/src/app/basic-inputs-page/basic-inputs-page.component.html index 2f3eb0e960..011c9d0cf8 100644 --- a/packages/angular/demo/src/app/basic-inputs-page/basic-inputs-page.component.html +++ b/packages/angular/demo/src/app/basic-inputs-page/basic-inputs-page.component.html @@ -84,36 +84,24 @@ -

Select

+

Toggle

- - + + Value: - {{selectValue}} + {{toggleValue}} - Ionic Select (for tacos) - - Carne Asada - Lengua - Sesos - Tripa - Pollo - + Ionic Toggle + @@ -122,24 +110,24 @@ -

Toggle

+

Date Time Picker

- - + + Value: - {{toggleValue}} + {{datetimeValue}} - Ionic Toggle - + Ionic Date + diff --git a/packages/angular/demo/src/app/basic-inputs-page/basic-inputs-page.component.ts b/packages/angular/demo/src/app/basic-inputs-page/basic-inputs-page.component.ts index eff5f2c4fa..6f87ad0977 100644 --- a/packages/angular/demo/src/app/basic-inputs-page/basic-inputs-page.component.ts +++ b/packages/angular/demo/src/app/basic-inputs-page/basic-inputs-page.component.ts @@ -7,14 +7,13 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; encapsulation: ViewEncapsulation.None }) export class BasicInputsPageComponent implements OnInit { + datetimeValue = '2017-11-18T14:17:45-06:00'; textareaValue = 'This is the Textarea Input'; textValue = 'This is the Text Input'; checkboxValue = true; toggleValue = false; - selectValue = 'brains'; - constructor() {} ngOnInit() {} diff --git a/packages/angular/demo/src/app/group-inputs-page/group-inputs-page.component.html b/packages/angular/demo/src/app/group-inputs-page/group-inputs-page.component.html index 3424fbb2c8..f0aa2e0da0 100644 --- a/packages/angular/demo/src/app/group-inputs-page/group-inputs-page.component.html +++ b/packages/angular/demo/src/app/group-inputs-page/group-inputs-page.component.html @@ -116,5 +116,43 @@ + + +

Select

+
+
+ + + + + + + Value: + {{selectValue}} + + + + + + Ionic Select (for tacos) + + Carne Asada + Lengua + Sesos + Tripa + Pollo + + + + + + + Home diff --git a/packages/angular/demo/src/app/group-inputs-page/group-inputs-page.component.ts b/packages/angular/demo/src/app/group-inputs-page/group-inputs-page.component.ts index 4e3eaf264f..a48b8a8311 100644 --- a/packages/angular/demo/src/app/group-inputs-page/group-inputs-page.component.ts +++ b/packages/angular/demo/src/app/group-inputs-page/group-inputs-page.component.ts @@ -8,6 +8,7 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; }) export class GroupInputsPageComponent implements OnInit { radioValue = 'tripe'; + selectValue = 'brains'; constructor() {} diff --git a/packages/angular/demo/src/app/shared/ion-select-value-accessor/ion-select-value-accessor.directive.ts b/packages/angular/demo/src/app/shared/ion-select-value-accessor/ion-select-value-accessor.directive.ts index 343d12cd2a..e03e4920be 100644 --- a/packages/angular/demo/src/app/shared/ion-select-value-accessor/ion-select-value-accessor.directive.ts +++ b/packages/angular/demo/src/app/shared/ion-select-value-accessor/ion-select-value-accessor.directive.ts @@ -6,7 +6,7 @@ import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; // https://github.com/angular/angular/blob/5.0.2/packages/forms/src/directives/select_control_value_accessor.ts#L28-L158 @Directive({ /* tslint:disable-next-line:directive-selector */ - selector: 'ion-select, ion-radio-group, ion-segment', + selector: 'ion-select, ion-radio-group, ion-segment, ion-datetime', providers: [{ provide: NG_VALUE_ACCESSOR, useExisting: IonSelectValueAccessorDirective, multi: true }] }) export class IonSelectValueAccessorDirective implements ControlValueAccessor {