#9

.eslintrc.json

@@ -30,14 +30,11 @@
         "EC": true
     },
     "root": true,
-    "ecmaFeatures": {
-        "modules": true
-    },
     "rules": {
         // Possible Errors
         "comma-dangle": [2, "never"],
         "no-cond-assign": 2,
-        "no-console": 0,
+        "no-console": 1,
         "no-constant-condition": 2,
         "no-control-regex": 2,
         "no-debugger": 2,
@@ -88,7 +85,7 @@
         "no-caller": 2,
         "no-case-declarations": 2,
         "no-div-regex": 2,
-        "no-else-return": 1,
+        "no-else-return": 2,
         "no-empty-pattern": 2,
         "no-eq-null": 2,
         "no-eval": 2,
@@ -133,7 +130,7 @@
         "yoda": [2, "never", { "exceptRange": true }],
 
         // Strict Mode
-        "strict": [0, "global"],
+        "strict": [2, "global"],
 
         // Variables
         "init-declarations": 0,
@@ -145,7 +142,7 @@
         "no-undef-init": 2,
         "no-undef": 2,
         "no-undefined": 0,
-        "no-unused-vars": 1,
+        "no-unused-vars": 2,
         "no-use-before-define": 2,
 
         // Stylistic Issues
@@ -198,7 +195,7 @@
         "padded-blocks": 0,
         "quote-props": [2, "consistent-as-needed"],
         "quotes": [2, "single", "avoid-escape"],
-        "require-jsdoc": 2,
+        "require-jsdoc": 1,
         "semi-spacing": [2, {"before": false, "after": true}],
         "semi": [0, "always"],
         "sort-vars": 0,

.gitignore

@@ -9,7 +9,6 @@ node_modules
 .*
 !.travis.yml
 !.editorconfig
-!.eslintrc.json
 *.xml
 .settings
 downloads

.travis.yml

@@ -26,5 +26,6 @@ install:
 
 # http://docs.travis-ci.com/user/pull-requests/
 script:
+  - npm run lint  
   - npm run mocha
   - npm run cucumber

src/helpers/objects.processor.js

@@ -1,5 +1,3 @@
-'use strict'
-
 /* eslint no-param-reassign: 0*/
 /* eslint no-undef: 0 */
 
@@ -35,14 +33,10 @@ function injectInto(locator, injection) {
             const body = locator.replace(/\[[0-9]+\]$/, '')
 
             return injectInto(body, injection) + nums
-        } else {
-            // Locator ends with brackets, which contain some properties
-            return locator.substring(0, locator.length - 1) + ' and ' + injection
         }
-    } else {
-        // Locator contains no brackets
-        return locator + '[' + injection
+        return locator.substring(0, locator.length - 1) + ' and ' + injection
     }
+    return locator + '[' + injection
 }
 
 function pageObjectGetter(str) {
@@ -70,7 +64,7 @@ function getPageObject(str) {
     const pageObjectGetterFunc = objectsProcessor.pageObjectGetter || pageObjectGetter
     const value = pageObjectGetterFunc(str)
     const idValue = value.replace(_r(regDynamicId, 'g'), id.getId())
-    const injection = 'not(ancestor-or-self::*[contains(@style,"visibility: hidden") ' +
+    const injection = 'not(ancestor-or-self::*[contains(@style,"visibility: hidden;") ' +
     'or contains(@style,"display: none") or contains(@class,"x-hide-offsets")])'
     const injectedvalue = injectInto(idValue, injection)
 

src/helpers/utils.js

@@ -1,5 +1,3 @@
-'use strict'
-
 const escapeRegExp = function (str) {
     return str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, '\$&')
 }

src/steps/given.js

@@ -1,6 +1,5 @@
 /* eslint no-undef: 0 */
-
-'use strict'
+/* eslint new-cap: 0 */
 
 const { defineSupportCode } = require('cucumber')
 const { dictionaryObject, getDictionaryObject } = require('../helpers/objects.processor')

src/steps/then.js

@@ -1,6 +1,5 @@
 /* eslint no-undef: 0 */
-
-'use strict'
+/* eslint new-cap: 0 */
 
 const { defineSupportCode } = require('cucumber')
 const { pageObject, getPageObject } = require('../helpers/objects.processor')

test/features/page_objects/main.js

@@ -1,4 +1,3 @@
-'use strict'
 let e = {}
 
 e.txtHeader = '//*[@id="header"]'

test/mocha/objects.processor.spec.js

@@ -1,5 +1,3 @@
-'use strict'
-
 const { expect } = require('chai')
 
 const {
@@ -49,7 +47,7 @@ describe('getPageObject', () => {
         {
             step: 'When I click object from main page',
             regExp: _r(`When I click ${pageObject}`),
-            result: `//div[@id='${realId}' and not(ancestor-or-self::*[contains(@style,"visibility: hidden") ` +
+            result: `//div[@id='${realId}' and not(ancestor-or-self::*[contains(@style,"visibility: hidden;") ` +
                 'or contains(@style,"display: none") or contains(@class,"x-hide-offsets")])]'
         }
     ]