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

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

View file

@ -13,10 +13,8 @@ const driver = new webdriver.Builder()
.forBrowser(config.app.seleniumwebdriver.browser || 'phantomjs')
.build();
const failHandlerRunning = new WorkerCounter();
function UseCaseReporter(runner) {
Mocha.reporters.Base.call(this, runner);
@ -212,4 +210,4 @@ module.exports = {
steps,
precondition,
driver
};
};