diff --git a/e2e-app/src/app/app.module.ts b/e2e-app/src/app/app.module.ts index cf0393d92d..a6bf2b9d27 100644 --- a/e2e-app/src/app/app.module.ts +++ b/e2e-app/src/app/app.module.ts @@ -10,6 +10,7 @@ import {NavigationComponent} from './navigation.component'; import {DatepickerAutoCloseComponent} from './datepicker/autoclose/datepicker-autoclose.component'; import {DatepickerFocusComponent} from './datepicker/focus/datepicker-focus.component'; +import {DatepickerMultipleComponent} from './datepicker/multiple/datepicker-multiple.component'; import {DropdownAutoCloseComponent} from './dropdown/autoclose/dropdown-autoclose.component'; import {DropdownFocusComponent} from './dropdown/focus/dropdown-focus.component'; import {DropdownPositionComponent} from './dropdown/position/dropdown-position.component'; @@ -35,6 +36,7 @@ import {TypeaheadValidationComponent} from './typeahead/validation/typeahead-val NavigationComponent, DatepickerAutoCloseComponent, DatepickerFocusComponent, + DatepickerMultipleComponent, DropdownAutoCloseComponent, DropdownFocusComponent, DropdownPositionComponent, diff --git a/e2e-app/src/app/app.routing.ts b/e2e-app/src/app/app.routing.ts index f5546eba64..6d867fc8a3 100644 --- a/e2e-app/src/app/app.routing.ts +++ b/e2e-app/src/app/app.routing.ts @@ -3,6 +3,7 @@ import {RouterModule, Routes} from '@angular/router'; import {DatepickerAutoCloseComponent} from './datepicker/autoclose/datepicker-autoclose.component'; import {DatepickerFocusComponent} from './datepicker/focus/datepicker-focus.component'; +import {DatepickerMultipleComponent} from './datepicker/multiple/datepicker-multiple.component'; import {DropdownAutoCloseComponent} from './dropdown/autoclose/dropdown-autoclose.component'; import {DropdownFocusComponent} from './dropdown/focus/dropdown-focus.component'; import {DropdownPositionComponent} from './dropdown/position/dropdown-position.component'; @@ -27,7 +28,8 @@ export const routes: Routes = [ path: 'datepicker', children: [ {path: 'focus', component: DatepickerFocusComponent}, - {path: 'autoclose', component: DatepickerAutoCloseComponent} + {path: 'autoclose', component: DatepickerAutoCloseComponent}, + {path: 'multiple', component: DatepickerMultipleComponent} ] }, { diff --git a/e2e-app/src/app/datepicker/datepicker.po.ts b/e2e-app/src/app/datepicker/datepicker.po.ts index e9d48b86f8..e9cc35bf5e 100644 --- a/e2e-app/src/app/datepicker/datepicker.po.ts +++ b/e2e-app/src/app/datepicker/datepicker.po.ts @@ -1,4 +1,4 @@ -import {$} from 'protractor'; +import {$, $$} from 'protractor'; export class DatepickerPage { getDatepicker(selector = 'ngb-datepicker') { return $(selector); } @@ -7,9 +7,9 @@ export class DatepickerPage { getToggle() { return $('#toggle'); } - getDayElement(date: Date) { + getDayElement(date: Date, index = 0) { const ariaLabel = date.toLocaleString('en', {weekday: 'long', year: 'numeric', month: 'long', day: 'numeric'}); - return this.getDatepicker().$(`div.ngb-dp-day[aria-label="${ariaLabel}"]`); + return $$('ngb-datepicker').get(index).$(`div.ngb-dp-day[aria-label="${ariaLabel}"]`); } getWeekdayElements() { return this.getDatepicker().$$('div.ngb-dp-weekday'); } diff --git a/e2e-app/src/app/datepicker/multiple/datepicker-multiple.component.html b/e2e-app/src/app/datepicker/multiple/datepicker-multiple.component.html new file mode 100644 index 0000000000..9ec3f7ee7c --- /dev/null +++ b/e2e-app/src/app/datepicker/multiple/datepicker-multiple.component.html @@ -0,0 +1,14 @@ +