public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of github.com:Mailtrain-org/mailtrain

Browse source 
Conflicts:
	test/e2e/index.js
	test/e2e/lib/mail.js
	test/e2e/lib/mocha-e2e.js
	test/e2e/lib/page.js
	test/e2e/lib/worker-counter.js
	test/e2e/page-objects/subscription.js
This commit is contained in:
Tomas Bures 2017-05-28 19:23:43 +02:00
commit 731226dfeb
20 changed files with 580 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

10
test/e2e/lib/page.js
View file

@ -32,9 +32,13 @@ module.exports = (...extras) => Object.assign({
return params;
},
async waitUntilVisible() {
async waitUntilVisible(selector) {
await driver.wait(until.elementLocated(By.css('body')), waitTimeout);
if (selector) {
await driver.wait(until.elementLocated(By.css(selector)), waitTimeout);
}
for (const elem of (this.elementsToWaitFor || [])) {
const sel = this.elements[elem];
if (!sel) {
@ -54,13 +58,13 @@ module.exports = (...extras) => Object.assign({
await driver.executeScript('document.mailTrainRefreshAcknowledged = true;');
},
async waitUntilVisibleAfterRefresh() {
async waitUntilVisibleAfterRefresh(selector) {
await driver.wait(new webdriver.Condition('for refresh', async driver => {
const val = await driver.executeScript('return document.mailTrainRefreshAcknowledged;');
return !val;
}), waitTimeout);
await this.waitUntilVisible();
await this.waitUntilVisible(selector);
},
async click(key) {