Fixed eslint errors.

test/e2e/index.js

@@ -1,7 +1,7 @@
 'use strict';
 
 require('./lib/exit-unless-test');
-const { mocha, driver } = require('./lib/mocha-e2e');
+const { mocha } = require('./lib/mocha-e2e');
 const path = require('path');
 
 global.USE_SHARED_DRIVER = true;

test/e2e/lib/mail.js

@@ -12,8 +12,8 @@ module.exports = (...extras) => page({
         await this.waitUntilVisible();
     },
 
-    async ensureUrl(path) {
+    async ensureUrl() {
         throw new Error('Unsupported method.');
-    },
+    }
 
 }, ...extras);

test/e2e/lib/mocha-e2e.js

@@ -1,217 +1,215 @@
-'use strict';
+'use strict';
-
+
-const Mocha = require('mocha');
+/* eslint-disable no-console */
-const color = Mocha.reporters.Base.color;
+
-const Semaphore = require('./semaphore');
+const Mocha = require('mocha');
-const fs = require('fs-extra');
+const color = Mocha.reporters.Base.color;
-const config = require('./config');
+const WorkerCounter = require('./worker-counter');
-const webdriver = require('selenium-webdriver');
+const fs = require('fs-extra');
-
+const config = require('./config');
-const driver = new webdriver.Builder()
+const webdriver = require('selenium-webdriver');
-    .forBrowser(config.app.seleniumwebdriver.browser || 'phantomjs')
+
-    .build();
+const driver = new webdriver.Builder()
-
+    .forBrowser(config.app.seleniumwebdriver.browser || 'phantomjs')
-
+    .build();
-const failHandlerRunning = new Semaphore();
+
-
+
-
+const failHandlerRunning = new WorkerCounter();
-function UseCaseReporter(runner) {
+
-    Mocha.reporters.Base.call(this, runner);
+
-
+function UseCaseReporter(runner) {
-    const self = this;
+    Mocha.reporters.Base.call(this, runner);
-    let indents = 0;
+
-
+    const self = this;
-    function indent () {
+    let indents = 0;
-        return Array(indents).join('  ');
+
-    }
+    function indent () {
-
+        return Array(indents).join('  ');
-    runner.on('start', function () {
+    }
-        console.log();
+
-    });
+    runner.on('start', () => {
-
+        console.log();
-    runner.on('suite', suite => {
+    });
-        ++indents;
+
-        console.log(color('suite', '%s%s'), indent(), suite.title);
+    runner.on('suite', suite => {
-    });
+        ++indents;
-
+        console.log(color('suite', '%s%s'), indent(), suite.title);
-    runner.on('suite end', () => {
+    });
-        --indents;
+
-        if (indents === 1) {
+    runner.on('suite end', () => {
-            console.log();
+        --indents;
-        }
+        if (indents === 1) {
-    });
+            console.log();
-
+        }
-    runner.on('use-case', useCase => {
+    });
-        ++indents;
+
-        console.log();
+    runner.on('use-case', useCase => {
-        console.log(color('suite', '%sUse case: %s'), indent(), useCase.title);
+        ++indents;
-    });
+        console.log();
-
+        console.log(color('suite', '%sUse case: %s'), indent(), useCase.title);
-    runner.on('use-case end', () => {
+    });
-        --indents;
+
-    });
+    runner.on('use-case end', () => {
-
+        --indents;
-    runner.on('steps', useCase => {
+    });
-        ++indents;
+
-        console.log(color('pass', '%s%s'), indent(), useCase.title);
+    runner.on('steps', useCase => {
-    });
+        ++indents;
-
+        console.log(color('pass', '%s%s'), indent(), useCase.title);
-    runner.on('steps end', () => {
+    });
-        --indents;
+
-    });
+    runner.on('steps end', () => {
-
+        --indents;
-    runner.on('step pass', step => {
+    });
-        console.log(indent() + color('checkmark', '  ' + Mocha.reporters.Base.symbols.ok) + color('pass', ' %s'), step.title);
+
-    });
+    runner.on('step pass', step => {
-
+        console.log(indent() + color('checkmark', '  ' + Mocha.reporters.Base.symbols.ok) + color('pass', ' %s'), step.title);
-    runner.on('step fail', step => {
+    });
-        console.log(indent() + color('fail', '  %s'), step.title);
+
-    });
+    runner.on('step fail', step => {
-
+        console.log(indent() + color('fail', '  %s'), step.title);
-    runner.on('pending', test => {
+    });
-        const fmt = indent() + color('pending', '  - %s');
+
-        console.log(fmt, test.title);
+    runner.on('pending', test => {
-    });
+        const fmt = indent() + color('pending', '  - %s');
-
+        console.log(fmt, test.title);
-    runner.on('pass', test => {
+    });
-        let fmt;
+
-        if (test.speed === 'fast') {
+    runner.on('pass', test => {
-            fmt = indent() +
+        let fmt;
-                color('checkmark', '  ' + Mocha.reporters.Base.symbols.ok) +
+        if (test.speed === 'fast') {
-                color('pass', ' %s');
+            fmt = indent() +
-            console.log(fmt, test.title);
+                color('checkmark', '  ' + Mocha.reporters.Base.symbols.ok) +
-        } else {
+                color('pass', ' %s');
-            fmt = indent() +
+            console.log(fmt, test.title);
-                color('checkmark', '  ' + Mocha.reporters.Base.symbols.ok) +
+        } else {
-                color('pass', ' %s') +
+            fmt = indent() +
-                color(test.speed, ' (%dms)');
+                color('checkmark', '  ' + Mocha.reporters.Base.symbols.ok) +
-            console.log(fmt, test.title, test.duration);
+                color('pass', ' %s') +
-        }
+                color(test.speed, ' (%dms)');
-    });
+            console.log(fmt, test.title, test.duration);
-
+        }
-    runner.on('fail', (test, err) => {
+    });
-        failHandlerRunning.enter();
+
-        (async () => {
+    runner.on('fail', (test, err) => {
-            const currentUrl = await driver.getCurrentUrl();
+        failHandlerRunning.enter();
-            const info = `URL: ${currentUrl}`;
+        (async () => {
-            await fs.writeFile('last-failed-e2e-test.info', info);
+            const currentUrl = await driver.getCurrentUrl();
-            await fs.writeFile('last-failed-e2e-test.html', await driver.getPageSource());
+            const info = `URL: ${currentUrl}`;
-            await fs.writeFile('last-failed-e2e-test.png', new Buffer(await driver.takeScreenshot(), 'base64'));
+            await fs.writeFile('last-failed-e2e-test.info', info);
-            failHandlerRunning.exit();
+            await fs.writeFile('last-failed-e2e-test.html', await driver.getPageSource());
-        })();
+            await fs.writeFile('last-failed-e2e-test.png', new Buffer(await driver.takeScreenshot(), 'base64'));
-
+            failHandlerRunning.exit();
-        console.log(indent() + color('fail', '  %s'), test.title);
+        })();
-        console.log();
+
-        console.log(err);
+        console.log(indent() + color('fail', '  %s'), test.title);
-        console.log();
+        console.log();
-        console.log(`Snaphot of and info about the current page are in last-failed-e2e-test.*`);
+        console.log(err);
-    });
+        console.log();
-
+        console.log('Snaphot of and info about the current page are in last-failed-e2e-test.*');
-    runner.on('end', () => {
+    });
-        const stats = self.stats;
+
-        let fmt;
+    runner.on('end', () => {
-
+        const stats = self.stats;
-        console.log();
+        let fmt;
-
+
-        // passes
+        console.log();
-        fmt = color('bright pass', ' ') + color('green', ' %d passing');
+
-        console.log(fmt, stats.passes);
+        // passes
-
+        fmt = color('bright pass', ' ') + color('green', ' %d passing');
-        // pending
+        console.log(fmt, stats.passes);
-        if (stats.pending) {
+
-            fmt = color('pending', ' ') + color('pending', ' %d pending');
+        // pending
-            console.log(fmt, stats.pending);
+        if (stats.pending) {
-        }
+            fmt = color('pending', ' ') + color('pending', ' %d pending');
-
+            console.log(fmt, stats.pending);
-        // failures
+        }
-        if (stats.failures) {
+
-            fmt = color('fail', '  %d failing');
+        // failures
-            console.log(fmt, stats.failures);
+        if (stats.failures) {
-        }
+            fmt = color('fail', '  %d failing');
-
+            console.log(fmt, stats.failures);
-        console.log();
+        }
-    });
+
-}
+        console.log();
-
+    });
-
+}
-const mocha = new Mocha()
+
-    .timeout(120000)
+
-    .reporter(UseCaseReporter)
+const mocha = new Mocha()
-    .ui('tdd');
+    .timeout(120000)
-
+    .reporter(UseCaseReporter)
-mocha._originalRun = mocha.run;
+    .ui('tdd');
-
+
-
+mocha._originalRun = mocha.run;
-let runner;
+
-mocha.run = fn => {
+
-    runner = mocha._originalRun(async () => {
+let runner;
-        await failHandlerRunning.waitForEmpty();
+mocha.run = fn => {
-        await driver.quit();
+    runner = mocha._originalRun(async () => {
-
+        await failHandlerRunning.waitForEmpty();
-        fn();
+        await driver.quit();
-    });
+
-};
+        fn();
-
+    });
-
+};
-async function useCaseExec(name, asyncFn) {
+
-    runner.emit('use-case', {title: name});
+
-
+async function useCaseExec(name, asyncFn) {
-    try {
+    runner.emit('use-case', {title: name});
-        await asyncFn();
+
-        runner.emit('use-case end');
+    try {
-    } catch (err) {
+        await asyncFn();
-        runner.emit('use-case end');
+        runner.emit('use-case end');
-        throw err;
+    } catch (err) {
-    }
+        runner.emit('use-case end');
-}
+        throw err;
-
+    }
-function useCase(name, asyncFn) {
+}
-    if (asyncFn) {
+
-        return test('Use case: ' + name, () => useCaseExec(name, asyncFn));
+function useCase(name, asyncFn) {
-    } else {
+    if (asyncFn) {
-        // Pending test
+        return test('Use case: ' + name, () => useCaseExec(name, asyncFn));
-        return test('Use case: ' + name);
+    } else {
-    }
+        // Pending test
-}
+        return test('Use case: ' + name);
-
+    }
-useCase.only = (name, asyncFn) => {
+}
-    return test.only('Use case: ' + name, () => useCaseExec(name, asyncFn));
+
-};
+useCase.only = (name, asyncFn) => test.only('Use case: ' + name, () => useCaseExec(name, asyncFn));
-
+
-useCase.skip = (name, asyncFn) => {
+useCase.skip = (name, asyncFn) => test.skip('Use case: ' + name, () => useCaseExec(name, asyncFn));
-    return test.skip('Use case: ' + name, () => useCaseExec(name, asyncFn));
+
-};
+async function step(name, asyncFn) {
-
+    try {
-async function step(name, asyncFn) {
+        await asyncFn();
-    try {
+        runner.emit('step pass', {title: name});
-        await asyncFn();
+    } catch (err) {
-        runner.emit('step pass', {title: name});
+        runner.emit('step fail', {title: name});
-    } catch (err) {
+        throw err;
-        runner.emit('step fail', {title: name});
+    }
-        throw err;
+}
-    }
+
-}
+async function steps(name, asyncFn) {
-
+    try {
-async function steps(name, asyncFn) {
+        runner.emit('steps', {title: name});
-    try {
+        await asyncFn();
-        runner.emit('steps', {title: name});
+        runner.emit('steps end');
-        await asyncFn();
+    } catch (err) {
-        runner.emit('steps end');
+        runner.emit('step end');
-    } catch (err) {
+        throw err;
-        runner.emit('step end');
+    }
-        throw err;
+}
-    }
+
-}
+async function precondition(preConditionName, useCaseName, asyncFn) {
-
+    await steps(`Including use case "${useCaseName}" to satisfy precondition "${preConditionName}"`, asyncFn);
-async function precondition(preConditionName, useCaseName, asyncFn) {
+}
-    await steps(`Including use case "${useCaseName}" to satisfy precondition "${preConditionName}"`, asyncFn);
+
-}
+module.exports = {
-
+    mocha,
-module.exports = {
+    useCase,
-    mocha,
+    step,
-    useCase,
+    steps,
-    step,
+    precondition,
-    steps,
+    driver
-    precondition,
-    driver
 };

test/e2e/lib/page.js

@@ -1,6 +1,5 @@
 'use strict';
 
-const config = require('./config');
 const webdriver = require('selenium-webdriver');
 const By = webdriver.By;
 const until = webdriver.until;
@@ -33,7 +32,7 @@ module.exports = (...extras) => Object.assign({
         return params;
     },
 
-    async waitUntilVisible(selector) {
+    async waitUntilVisible() {
         await driver.wait(until.elementLocated(By.css('body')), waitTimeout);
 
         for (const elem of (this.elementsToWaitFor || [])) {
@@ -45,9 +44,7 @@ module.exports = (...extras) => Object.assign({
         }
 
         for (const text of (this.textsToWaitFor || [])) {
-            await driver.wait(new webdriver.Condition(`for text "${text}"`, async (driver) => {
+            await driver.wait(new webdriver.Condition(`for text "${text}"`, async () => await this.containsText(text)), waitTimeout);
-                return await this.containsText(text);
-            }), waitTimeout);
         }
 
         if (this.url) {
@@ -57,13 +54,13 @@ module.exports = (...extras) => Object.assign({
         await driver.executeScript('document.mailTrainRefreshAcknowledged = true;');
     },
 
-    async waitUntilVisibleAfterRefresh(selector) {
+    async waitUntilVisibleAfterRefresh() {
-        await driver.wait(new webdriver.Condition('for refresh', async (driver) => {
+        await driver.wait(new webdriver.Condition('for refresh', async driver => {
             const val = await driver.executeScript('return document.mailTrainRefreshAcknowledged;');
             return !val;
         }), waitTimeout);
 
-        await this.waitUntilVisible(selector);
+        await this.waitUntilVisible();
     },
 
     async click(key) {

test/e2e/lib/web.js

@@ -15,7 +15,7 @@ module.exports = (...extras) => page({
             path = pathOrParams;
         } else {
             const urlPattern = new UrlPattern(this.requestUrl || this.url);
-            path = urlPattern.stringify(pathOrParams)
+            path = urlPattern.stringify(pathOrParams);
         }
 
         const parsedUrl = url.parse(path);

test/e2e/lib/worker-counter.js

@@ -1,35 +1,35 @@
-'use strict';
+'use strict';
-
+
-const Promise = require('bluebird');
+const Promise = require('bluebird');
-
+
-class Semaphore {
+class WorkerCounter {
-    constructor() {
+    constructor() {
-        this.counter = 0;
+        this.counter = 0;
-    }
+    }
-
+
-    enter() {
+    enter() {
-        this.counter++;
+        this.counter++;
-    }
+    }
-
+
-    exit() {
+    exit() {
-        this.counter--;
+        this.counter--;
-    }
+    }
-
+
-    async waitForEmpty() {
+    async waitForEmpty() {
-        const self = this;
+        const self = this;
-
+
-        function wait(resolve) {
+        function wait(resolve) {
-            if (self.counter == 0) {
+            if (self.counter === 0) {
-                resolve();
+                resolve();
-            } else {
+            } else {
-                setTimeout(wait, 500, resolve);
+                setTimeout(wait, 500, resolve);
-            }
+            }
-        }
+        }
-
+
-        return new Promise(resolve => {
+        return new Promise(resolve => {
-            setTimeout(wait, 500, resolve);
+            setTimeout(wait, 500, resolve);
-        })
+        });
-    }
+    }
-}
+}
-
+
-module.exports = Semaphore;
+module.exports = WorkerCounter;

test/e2e/page-objects/subscription.js

@@ -88,7 +88,7 @@ module.exports = list => ({
             form: `form[action="/subscription/${list.cid}/manage-address"]`,
             emailInput: '#main-form input[name="email"]',
             emailNewInput: '#main-form input[name="email-new"]',
-            submitButton: 'a[href="#submit"]',
+            submitButton: 'a[href="#submit"]'
         }
     }),
 
@@ -102,12 +102,12 @@ module.exports = list => ({
 
     webUpdatedNotice: web({
         url: `/subscription/${list.cid}/updated-notice`,
-        textsToWaitFor: ['Profile Updated'],
+        textsToWaitFor: ['Profile Updated']
     }),
 
     webUnsubscribedNotice: web({
         url: `/subscription/${list.cid}/unsubscribed-notice`,
-        textsToWaitFor: ['Unsubscribe Successful'],
+        textsToWaitFor: ['Unsubscribe Successful']
     }),
 
     mailUnsubscriptionConfirmed: mail({
@@ -116,17 +116,6 @@ module.exports = list => ({
         elements: {
             resubscribeLink: `a[href^="${config.settings['service-url']}subscription/${list.cid}"]`
         }
-    }),
+    })
-
-    /*
-    webUnsubscribe: web({ // FIXME
-        elementsToWaitFor: ['submitButton'],
-        elements: {
-            submitButton: 'a[href="#submit"]'
-        }
-    }),
-
-*/
-
 });
 

test/e2e/page-objects/user.js

@@ -22,8 +22,8 @@ module.exports = {
         url: '/users/account',
         elementsToWaitFor: ['form'],
         elements: {
-            form: `form[action="/users/account"]`,
+            form: 'form[action="/users/account"]',
             emailInput: 'form[action="/users/account"] input[name="email"]'
         }
-    }),
+    })
 };

test/e2e/tests/login.js

@@ -1,5 +1,7 @@
 'use strict';
 
+/* eslint-disable prefer-arrow-callback */
+
 const config = require('../lib/config');
 const { useCase, step, driver } = require('../lib/mocha-e2e');
 const expect = require('chai').expect;

test/e2e/tests/subscription.js

@@ -1,5 +1,7 @@
 'use strict';
 
+/* eslint-disable prefer-arrow-callback */
+
 const config = require('../lib/config');
 const { useCase, step, precondition, driver } = require('../lib/mocha-e2e');
 const shortid = require('shortid');