updated eslint rules

.eslintrc

@@ -19,9 +19,22 @@
     "no-extra-boolean-cast": 0,
     "quotes": ["error", "single"],
     "curly": ["error", "all"],
-    "no-console": ["warn", { "allow": ["error"] }],
+    "no-console": [
+      "error",
+      {
+        "allow": [
+          "error"
+        ]
+      }
+    ],
     "no-debugger": 1,
-    "semi": [1, "always"],
+    "semi": [
+      "error",
+      "always",
+      {
+        "omitLastInOneLineBlock": true
+      }
+    ],
     "no-trailing-spaces": 0,
     "no-else-return": 0,
     "no-extra-bind": 0,
@@ -30,14 +43,21 @@
     "no-return-assign": 0,
     "eol-last": 0,
     "no-unused-vars": 0,
-    "no-extra-semi": 1,
+    "no-extra-semi": 0,
     "no-underscore-dangle": 0,
     "no-lone-blocks": 0,
+    "array-bracket-spacing": 2,
+    "brace-style": [2, "1tbs", {"allowSingleLine": true}],
+    "comma-spacing": 2,
+    "comma-style": 2,
+    "key-spacing": 2,
     "one-var": ["error", "never"],
+    "semi-style": ["error", "last"],
+    "space-in-parens": ["error", "never"],
+    "keyword-spacing": [2, {"before": true, "after": true}],
     "padding-line-between-statements": [
-      "warn",
-      { "blankLine": "always", "prev": "*", "next": "return" },
-      { "blankLine": "any", "prev": ["const"], "next": "*"}
+      "error",
+      { "blankLine": "always", "prev": "*", "next": "return" }
     ],
     "indent": [
       "error",

examples/globalsModule.js

@@ -30,15 +30,15 @@ module.exports = {
   // Automatically retrying failed assertions - You can tell Nightwatch to automatically retry failed assertions until a given timeout is reached, before the test runner gives up and fails the test.
   retryAssertionTimeout: 1000,
 
-  'default' : {
-    myGlobal : function() {
+  'default': {
+    myGlobal: function() {
       return 'I\'m a method';
     }
   },
 
-  'test_env' : {
+  'test_env': {
     myGlobal: 'test_global',
-    beforeEach : function() {
+    beforeEach: function() {
 
     }
   },

examples/mocha/googleDemoTest.js

@@ -32,7 +32,7 @@ describe('Google demo test for Mocha', function() {
       client
         .setValue('input[type=text]', ['nightwatch', client.Keys.ENTER])
         .pause(1000)
-        .assert.containsText('#main', 'Night Watch')
+        .assert.containsText('#main', 'Night Watch');
     });
 
   });

examples/pages/nightwatchFeatures.js

@@ -5,23 +5,24 @@ var featuresCommands = {
         var countResult = {
           status: 0,
           value: result.value.length
-        }
+        };
         callback.call(this, countResult);
       } else {
         callback.call(this, result);
       }
     }.bind(this));
+
     return this;
   }
 };
 
 module.exports = {
-  commands : [featuresCommands],
-  elements : {
-    featuresHeading : {
-      selector : '#index-container h2',
+  commands: [featuresCommands],
+  elements: {
+    featuresHeading: {
+      selector: '#index-container h2',
       index: 1
     },
-    features : '#index-container .features h3'
+    features: '#index-container .features h3'
   }
 };

examples/tests/ecosia.js

@@ -10,7 +10,7 @@ describe('Ecosia.org Demo', function() {
       .setValue('input[type=search]', 'nightwatch')
       .assert.visible('button[type=submit]')
       .click('button[type=submit]')
-      .assert.containsText('.mainline-results', 'Nightwatch.js')
+      .assert.containsText('.mainline-results', 'Nightwatch.js');
   });
 
   after(browser => browser.end());

examples/tests/github/github.js

@@ -1,6 +1,6 @@
 module.exports = {
   tags: ['git'],
-  'Demo test GitHub' : function (client) {
+  'Demo test GitHub': function (client) {
     client
       .url('http://github.com/nightwatchjs/nightwatch')
       .waitForElementVisible('xbody', 1000)

examples/tests/google.js

@@ -2,7 +2,7 @@ module.exports = {
   tags: ['google'],
   '@disabled': true,
 
-  'Demo test Google' : function (client) {
+  'Demo test Google': function (client) {
     client
       .url('http://google.no')
       .pause(1000);

examples/tests/google/googleDemoTest.js

@@ -8,13 +8,13 @@
 module.exports = {
   '@disabled': false,
 
-  'demo test google' : function (client) {
+  'demo test google': function (client) {
     client
       .url('http://google.com')
       .waitForElementPresent('body', 1000);
   },
 
-  'part two' : function(client) {
+  'part two': function(client) {
     client
       .setValue('input[type=text]', ['nightwatch', client.Keys.ENTER])
       .pause(1000)

examples/tests/googlePageObject.js

@@ -1,5 +1,5 @@
 module.exports = {
-  'Demo Google search test using page objects' : function (client) {
+  'Demo Google search test using page objects': function (client) {
     var homePage = client.page.home();
     homePage.navigate();
     homePage.expect.element('@searchBar').to.be.enabled;

examples/tests/nightwatch.js

@@ -1,5 +1,5 @@
 module.exports = {
-  disabled : true,
+  disabled: true,
   '@tags': ['website'],
 
   beforeEach: function(client, done) {
@@ -8,7 +8,7 @@ module.exports = {
     });
   },
 
-  'Demo test NightwatchJS.org' : function (client) {
+  'Demo test NightwatchJS.org': function (client) {
     client
       .waitForElementVisible('body', 1000)
       .elements('css selector', '#index-container ul.features li', function (result) {
@@ -22,7 +22,8 @@ module.exports = {
   'Finished': function(client) {
     client
       .perform(() => {
-        console.log('[perform]: Finished Test:', client.currentTest.name)
+        // eslint-disable-next-line no-console
+        console.log('[perform]: Finished Test:', client.currentTest.name);
       })
       .end();
   }

examples/tests/nightwatchByIndex.js

@@ -1,7 +1,7 @@
 module.exports = {
   '@disabled': true,
 
-  'Show getting Nightwatch features using index' : function (client) {
+  'Show getting Nightwatch features using index': function (client) {
 
     client.url('http://nightwatchjs.org');
 

examples/tests/onbeforeunload.js

@@ -30,12 +30,12 @@ module.exports = {
 
   },
 
-  'go to nightwatch' : function(c) {
+  'go to nightwatch': function(c) {
     c.url('http://nightwatchjs.org')
       .waitForElementVisible('body', 1000);
   },
 
-  after : function(c) {
+  after: function(c) {
     c.end();
   }
 };

examples/unittests/demoTestAsync.js

@@ -1,9 +1,9 @@
 const assert = require('assert');
 
 module.exports = {
-  '@unitTest' : true,
+  '@unitTest': true,
 
-  'demo UnitTest' : function (done) {
+  'demo UnitTest': function (done) {
     assert.equal('TEST', 'TEST');
     setTimeout(function() {
       done();

examples/unittests/testUtils.js

@@ -2,7 +2,7 @@ const assert = require('assert');
 const Utils = require('../../lib/util/utils.js');
 
 module.exports = {
-  testFormatElapsedTime : function() {
+  testFormatElapsedTime: function() {
     var resultMs = Utils.formatElapsedTime(999);
     assert.equal(resultMs, '999ms');
 
@@ -13,7 +13,7 @@ module.exports = {
     assert.equal(resultMin, '2m 2s / 122299ms');
   },
 
-  testGetTestSuiteName : function() {
+  testGetTestSuiteName: function() {
     assert.equal(Utils.getTestSuiteName('test-case-one'), 'Test Case One');
     assert.equal(Utils.getTestSuiteName('test_case_two'), 'Test Case Two');
     assert.equal(Utils.getTestSuiteName('test.case.one'), 'Test Case One');

examples/unittests/testUtilsWithChai.js

@@ -2,7 +2,7 @@ var Utils = require('../../lib/util/utils.js');
 var expect = require('chai').expect;
 
 module.exports = {
-  testFormatElapsedTime : function() {
+  testFormatElapsedTime: function() {
     var resultMs = Utils.formatElapsedTime(999);
     var resultSec = Utils.formatElapsedTime(1999);
     var resultMin = Utils.formatElapsedTime(122299, true);
@@ -12,7 +12,7 @@ module.exports = {
     expect(resultMin).to.equal('2m 2s / 122299ms');
   },
 
-  testFormatElapsedTimeMore : function() {
+  testFormatElapsedTimeMore: function() {
     var resultMs = Utils.formatElapsedTime(999);
     expect(resultMs).to.equal('999ms');
   },

lib/api/_loaders/assertion-scheduler.js

@@ -123,7 +123,7 @@ class AssertionScheduler {
           return err;
         })
         .then(cbResult => {
-          Utils.makePromise(this.instance.doneCallback, this, [cbResult, this.instance])
+          Utils.makePromise(this.instance.doneCallback, this, [cbResult, this.instance]);
         });
     }.bind(this), this.instance);
   }

lib/api/_loaders/command.js

@@ -39,7 +39,7 @@ class CommandLoader extends BaseCommandLoader {
   static transportActions({actions, api}) {
     return new Proxy(actions, {
       get(target, name) {
-        return function (...args) {
+        return function(...args) {
           let callback;
           let method;
           let isLastArgFunction = Utils.isFunction(args[args.length-1]);
@@ -160,6 +160,7 @@ class CommandLoader extends BaseCommandLoader {
           .catch(err => {
             if (instance instanceof EventEmitter) {
               instance.emit('error', err);
+
               return;
             }
 

lib/api/_loaders/expect-assertion.js

@@ -57,7 +57,7 @@ class ExpectAssertionLoader extends BaseCommandLoader {
           assertion.emitter.once('error', error => {
             reject(error);
           });
-        })
+        });
       });
     });
   }

lib/api/assertions/_assertionInstance.js

@@ -171,9 +171,7 @@ class AssertionInstance {
 
   getActual() {
     if (this.hasFailure()) {
-      return this.options.elementSelector ?
-        'element could not be located' :
-        ''
+      return this.options.elementSelector ? 'element could not be located' : '';
     }
 
     if (Utils.isFunction(this.actual)) {

lib/api/assertions/attributeContains.js

@@ -25,7 +25,7 @@ exports.assertion = function(definition, attribute, expected, msg) {
     return {
       message,
       args: [`'${attribute}'`, this.elementSelector, `'${expected}'`]
-    }
+    };
   };
 
   this.evaluate = function(value) {

lib/api/assertions/attributeEquals.js

@@ -25,7 +25,7 @@ exports.assertion = function(definition, attribute, expected, msg) {
     return {
       message,
       args: [`'${attribute}'`, this.elementSelector, `'${expected}'`]
-    }
+    };
   };
 
   this.evaluate = function(value) {

lib/api/assertions/containsText.js

@@ -28,7 +28,7 @@ exports.assertion = function(definition, expectedText, msg) {
     return {
       message,
       args: [this.elementSelector, `'${expectedText}'`]
-    }
+    };
   };
 
   /*!

lib/api/assertions/cssClassNotPresent.js

@@ -22,6 +22,7 @@ exports.assertion = function(selector, className, msg) {
     elementSelector: true
   };
 
+  // eslint-disable-next-line no-console
   console.warn('DEPRECATED: the assertion .cssClassNotPresent() has been deprecated and will be ' +
     'removed from future versions. Use assert.not.cssClassPresent().');
 
@@ -31,7 +32,7 @@ exports.assertion = function(selector, className, msg) {
     return {
       message,
       args: [this.elementSelector, `'${className}'`]
-    }
+    };
   };
 
   this.expected = function() {

lib/api/assertions/cssClassPresent.js

@@ -32,7 +32,7 @@ exports.assertion = function(selector, expected, msg) {
     return {
       message,
       args: [this.elementSelector, `'${Array.isArray(expected) ? expected.join(' ') : expected}'`]
-    }
+    };
   };
 
   this.expected = function() {

lib/api/assertions/cssProperty.js

@@ -25,7 +25,7 @@ exports.assertion = function(definition, cssProperty, expected, msg) {
     return {
       message,
       args: [this.elementSelector, `'${cssProperty}`, `${expected}'`]
-    }
+    };
   };
 
   this.actual = function(passed) {

lib/api/assertions/domPropertyEquals.js

@@ -41,7 +41,7 @@ function formatMsg({msg, domProperty, expected, verb = function(negate) {}}) {
   return {
     message,
     args: [`'${domProperty}'`, this.elementSelector, `'${expectedArg}'`]
-  }
+  };
 }
 
 exports.assertion = function(selector, domProperty, expected, msg) {

lib/api/assertions/elementNotPresent.js

@@ -19,6 +19,7 @@ exports.assertion = function(selector, msg) {
     elementSelector: true
   };
 
+  // eslint-disable-next-line no-console
   console.warn('DEPRECATED: the assertion .elementNotPresent() has been deprecated and will be ' +
     'removed from future versions. Use assert.not.elementPresent().');
 
@@ -29,7 +30,7 @@ exports.assertion = function(selector, msg) {
     return {
       message,
       args: [this.elementSelector]
-    }
+    };
   };
 
   this.pass = function(value) {