Skip to content

Commit d076f16

Browse files
vlio20vlio20
authored
updating npm deps (#468)
* updating deps + stabilising e2e tests
1 parent cabd11d commit d076f16

6 files changed

+11729
-8192
lines changed

‎e2e/app.po.ts

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import {$, $$, browser, by, element} from 'protractor';
1+
import {$, $$, browser, by, element, ElementFinder, ExpectedConditions} from 'protractor';
2+
23

34
export class DemoPage {
45
private popupSelector = '.dp-popup.dp-main';
@@ -180,4 +181,8 @@ export class DemoPage {
180181
clickOnMonthButtonInline(text: string) {
181182
return element(by.cssContainingText(`.dp-inline-month .dp-calendar-month`, text)).click();
182183
}
184+
185+
waitUntilPresent(elem: ElementFinder) {
186+
return browser.wait(ExpectedConditions.presenceOf(elem), 5000, 'Element taking too long to appear in the DOM');
187+
}
183188
}

‎e2e/daytimepicker-e2e.spec.ts

+31-31
Original file line numberDiff line numberDiff line change
@@ -3,71 +3,71 @@ import {DemoPage} from './app.po';
33
describe('dpDayPicker daytimePicker', () => {
44
let page: DemoPage;
55

6-
beforeEach(() => {
6+
beforeEach(async () => {
77
page = new DemoPage();
8-
page.navigateTo();
8+
await page.navigateTo();
99

10-
page.dateFormatInput.clear();
11-
page.dateFormatInput.sendKeys('DD-MM-YYYY HH:mm:ss');
12-
page.daytimePickerMenu.click();
10+
await page.dateFormatInput.clear();
11+
await page.dateFormatInput.sendKeys('DD-MM-YYYY HH:mm:ss');
12+
await page.daytimePickerMenu.click();
1313
});
1414

1515
it('should check if min date validation is working', async () => {
16-
page.minDateValidationPickerInput.clear();
16+
await page.minDateValidationPickerInput.clear();
1717
expect(await page.minDateValidationMsg.isPresent()).toBe(false);
18-
page.minDateValidationPickerInput.sendKeys('10-04-2017 10:08:07');
19-
page.daytimePickerInput.sendKeys('10-04-2017 09:08:07');
18+
await page.minDateValidationPickerInput.sendKeys('10-04-2017 10:08:07');
19+
await page.daytimePickerInput.sendKeys('10-04-2017 09:08:07');
2020
expect(await page.minDateValidationMsg.getText()).toEqual('minDate invalid');
21-
page.minDateValidationPickerInput.clear();
22-
page.minDateValidationPickerInput.sendKeys('10-04-2017 09:08:07');
21+
await page.minDateValidationPickerInput.clear();
22+
await page.minDateValidationPickerInput.sendKeys('10-04-2017 09:08:07');
2323
expect(await page.minDateValidationMsg.isPresent()).toBe(false);
2424
});
2525

2626
it('should check if max date validation is working', async () => {
27-
page.maxDateValidationPickerInput.clear();
27+
await page.maxDateValidationPickerInput.clear();
2828
expect(await page.maxDateValidationMsg.isPresent()).toBe(false);
29-
page.maxDateValidationPickerInput.sendKeys('12-04-2017 08:08:07');
30-
page.daytimePickerInput.sendKeys('12-04-2017 09:08:07');
29+
await page.maxDateValidationPickerInput.sendKeys('12-04-2017 08:08:07');
30+
await page.daytimePickerInput.sendKeys('12-04-2017 09:08:07');
3131
expect(await page.maxDateValidationMsg.getText()).toEqual('maxDate invalid');
32-
page.maxDateValidationPickerInput.clear();
33-
page.maxDateValidationPickerInput.sendKeys('12-04-2017 09:08:07');
32+
await page.maxDateValidationPickerInput.clear();
33+
await page.maxDateValidationPickerInput.sendKeys('12-04-2017 09:08:07');
3434
expect(await page.maxDateValidationMsg.isPresent()).toBe(false);
3535
});
3636

3737
it('should check that the min selectable option is working', async () => {
38-
page.minSelectableInput.clear();
39-
page.minSelectableInput.sendKeys('11-04-2017 09:08:07');
40-
page.daytimePickerInput.sendKeys('17-04-2017 09:08:07');
41-
page.daytimePickerInput.click();
38+
await page.minSelectableInput.clear();
39+
await page.minSelectableInput.sendKeys('11-04-2017 09:08:07');
40+
await page.daytimePickerInput.sendKeys('17-04-2017 09:08:07');
41+
await page.daytimePickerInput.click();
4242
expect(await page.calendarDisabledDays.count()).toBe(16);
43-
page.daytimePickerInput.clear();
44-
page.daytimePickerInput.sendKeys('11-04-2017 09:18:07');
43+
await page.daytimePickerInput.clear();
44+
await page.daytimePickerInput.sendKeys('11-04-2017 09:18:07');
4545
expect(await page.hourDownBtn.getAttribute('disabled')).toEqual('true');
4646
expect(await page.minuteDownBtn.getAttribute('disabled')).toBe(null);
4747
expect(await page.meridiemUpBtn.getAttribute('disabled')).toBe(null);
4848
expect(await page.meridiemDownBtn.getAttribute('disabled')).toBe(null);
4949
});
5050

5151
it('should check that the max selectable option is working', async () => {
52-
page.maxSelectableInput.clear();
53-
page.maxSelectableInput.sendKeys('11-04-2017 09:08:07');
54-
page.daytimePickerInput.sendKeys('12-04-2017 09:08:07');
55-
page.daytimePickerInput.click();
52+
await page.maxSelectableInput.clear();
53+
await page.maxSelectableInput.sendKeys('11-04-2017 09:08:07');
54+
await page.daytimePickerInput.sendKeys('12-04-2017 09:08:07');
55+
await page.daytimePickerInput.click();
5656
expect(await page.calendarDisabledDays.count()).toBe(25);
57-
page.daytimePickerInput.clear();
58-
page.daytimePickerInput.sendKeys('11-04-2017 09:06:07');
57+
await page.daytimePickerInput.clear();
58+
await page.daytimePickerInput.sendKeys('11-04-2017 09:06:07');
5959
expect(await page.hourUpBtn.getAttribute('disabled')).toEqual('true');
6060
expect(await page.minuteUpBtn.getAttribute('disabled')).toBe(null);
6161
expect(await page.meridiemUpBtn.getAttribute('disabled')).toBe('true');
6262
expect(await page.meridiemDownBtn.getAttribute('disabled')).toBe('true');
6363
});
6464

6565
it('should check that the max selectable option is working', async () => {
66-
page.daytimePickerInput.click();
67-
page.daytimePickerInput.sendKeys('11-04-2017 09:08:07');
66+
await page.daytimePickerInput.click();
67+
await page.daytimePickerInput.sendKeys('11-04-2017 09:08:07');
6868
expect(await page.selectedDays.count()).toEqual(1);
69-
page.daytimePickerInput.clear();
70-
page.daytimePickerInput.sendKeys(' ');
69+
await page.daytimePickerInput.clear();
70+
await page.daytimePickerInput.sendKeys(' ');
7171

7272
expect(await page.selectedDays.count()).toEqual(0);
7373
});

‎e2e/timepicker-e2e.spec.ts

+16-15
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,29 @@ import {DemoPage} from './app.po';
33
describe('dpDayPicker timePicker', () => {
44
let page: DemoPage;
55

6-
beforeEach(() => {
6+
beforeEach(async () => {
77
page = new DemoPage();
8-
page.navigateTo();
8+
await page.navigateTo();
99

10-
page.timePickerMenu.click();
11-
page.dateFormatInput.clear();
12-
page.dateFormatInput.sendKeys('HH:mm:ss');
10+
await page.timePickerMenu.click();
11+
await page.dateFormatInput.clear();
12+
await page.dateFormatInput.sendKeys('HH:mm:ss');
13+
await page.clickOnBody();
1314
});
1415

1516
it('should check if min time validation is working', async () => {
16-
page.minTimeValidationPickerInput.clear();
17+
await page.minTimeValidationPickerInput.click();
18+
await page.minTimeValidationPickerInput.clear();
1719
expect(await page.timePickerMinTimeValidationMsg.isPresent()).toBe(false);
18-
page.minTimeValidationPickerInput.clear();
19-
page.minTimeValidationPickerInput.sendKeys('10:11:12');
20-
page.timePickerInput.click();
21-
page.timePickerInput.clear();
22-
page.timePickerInput.sendKeys('09:00:00');
23-
page.clickOnBody();
20+
await page.minTimeValidationPickerInput.sendKeys('10:00:00');
21+
await page.timePickerInput.click();
22+
await page.timePickerInput.clear();
23+
await page.timePickerInput.sendKeys('09:00:00');
24+
await page.clickOnBody();
2425
expect(await page.timePickerMinTimeValidationMsg.getText()).toEqual('minTime invalid');
25-
page.minTimeValidationPickerInput.clear();
26-
page.minTimeValidationPickerInput.sendKeys('08:07:06');
27-
page.clickOnBody();
26+
await page.minTimeValidationPickerInput.clear();
27+
await page.minTimeValidationPickerInput.sendKeys('08:07:06');
28+
await page.clickOnBody();
2829
expect(await page.timePickerMinTimeValidationMsg.isPresent()).toBe(false);
2930
});
3031

0 commit comments

Comments
 (0)