fix(e2e-tests): make sure they are all waiting

This commit is contained in:
Ken Sodemann
2017-10-30 16:36:12 -05:00
parent fda7a5a133
commit d0e486d2d8
4 changed files with 35 additions and 25 deletions

View File

@ -0,0 +1,16 @@
const webdriver = require('selenium-webdriver');
const By = webdriver.By;
const until = webdriver.until;
module.exports = class E2ETestPage {
constructor(driver, url) {
this.url = url;
this.driver = driver;
}
navigate() {
this.driver.navigate().to(this.url);
this.driver.wait(until.elementLocated(By.css('.hydrated')));
return this.driver.wait(until.elementIsVisible(this.driver.findElement(By.css('.hydrated'))));
}
}

View File

@ -5,17 +5,11 @@ const By = webdriver.By;
const until = webdriver.until;
const register = require('../../../../scripts/register-e2e-test');
const E2ETestPage = require('../../../../scripts/E2ETestPage');
class Page {
class ActionSheetE2ETestPage extends E2ETestPage {
constructor(driver) {
this.url = 'http://localhost:3333/src/components/action-sheet/test/basic.html';
this.driver = driver;
}
navigate() {
this.driver.navigate().to(this.url);
this.driver.wait(until.elementLocated(By.id('cancelOnly')));
return this.driver.wait(until.elementIsVisible(this.driver.findElement(By.id('cancelOnly'))));
super(driver, 'http://localhost:3333/src/components/action-sheet/test/basic.html');
}
present(buttonId) {
@ -28,38 +22,38 @@ class Page {
describe('action-sheet: basic', () => {
register('navigates', driver => {
const page = new Page(driver);
const page = new ActionSheetE2ETestPage(driver);
return page.navigate();
});
describe('present', () => {
register('shows basic', driver => {
const page = new Page(driver);
const page = new ActionSheetE2ETestPage(driver);
return page.present('basic');
});
register('shows noBackdropDismiss', (driver) => {
const page = new Page(driver);
const page = new ActionSheetE2ETestPage(driver);
return page.present('noBackdropDismiss');
});
register('shows alertFromActionSheet', (driver) => {
const page = new Page(driver);
const page = new ActionSheetE2ETestPage(driver);
return page.present('alertFromActionSheet');
});
register('shows scrollableOptions', (driver) => {
const page = new Page(driver);
const page = new ActionSheetE2ETestPage(driver);
return page.present('scrollableOptions');
});
register('shows scrollWithoutCancel', (driver) => {
const page = new Page(driver);
const page = new ActionSheetE2ETestPage(driver);
return page.present('scrollWithoutCancel');
});
register('shows cancelOnly', (driver) => {
const page = new Page(driver);
const page = new ActionSheetE2ETestPage(driver);
return page.present('cancelOnly');
});
});

View File

@ -1,11 +1,11 @@
const webdriver = require('selenium-webdriver');
const By = webdriver.By;
const until = webdriver.until;
'use strict';
const register = require('../../../../scripts/register-e2e-test');
const E2ETestPage = require('../../../../scripts/E2ETestPage');
describe('button: basic', () => {
register('navigates', (driver) => {
return driver.navigate().to('http://localhost:3333/src/components/button/test/basic.html');
register('navigates', driver => {
const page = new E2ETestPage(driver, 'http://localhost:3333/src/components/button/test/basic.html');
return page.navigate();
});
});

View File

@ -1,11 +1,11 @@
const webdriver = require('selenium-webdriver');
const By = webdriver.By;
const until = webdriver.until;
'use strict';
const register = require('../../../../scripts/register-e2e-test');
const E2ETestPage = require('../../../../scripts/E2ETestPage');
describe('button: toolbar', () => {
register('navigates', (driver) => {
return driver.navigate().to('http://localhost:3333/src/components/button/test/toolbar.html');
const page = new E2ETestPage(driver, 'http://localhost:3333/src/components/button/test/toolbar.html');
return page.navigate();
});
});