Bithound issues - linting

Fix #13, #14, #15, #16
arnaud-dezandee · Apr 20, 2015 · 8ed0e00 · 8ed0e00
1 parent 5368eed
commit 8ed0e00
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/lib/driver/methods/button.js b/lib/driver/methods/button.js
@@ -13,6 +13,7 @@ module.exports = function button(mixed, callback) {
     [
       function(cb) {
         _this.elements(mixed, function(err, elements) {
+          if (err) { return cb(null); }
           cb(null, elements);
         });
       },

diff --git a/lib/driver/methods/elementsWithText.js b/lib/driver/methods/elementsWithText.js
@@ -14,8 +14,9 @@ module.exports = function elementsWithText(selector, text, callback) {
     if (err) { return callback(err); }
 
     function checkText(WebElement, cb) {
-      client.elementIdText(WebElement.ELEMENT, function (err, res) {
-        cb(res.value === text);
+      client.elementIdText(WebElement.ELEMENT, function (error, result) {
+        if (error) { return cb(false); }
+        cb(result.value === text);
       });
     }
 

diff --git a/lib/driver/methods/elementsWithValue.js b/lib/driver/methods/elementsWithValue.js
@@ -14,8 +14,9 @@ module.exports = function elementsWithValue(selector, value, callback) {
     if (err) { return callback(err); }
 
     function checkValue(WebElement, cb) {
-      client.elementIdAttribute(WebElement.ELEMENT, 'value', function(err, res) {
-        cb(res.value === value);
+      client.elementIdAttribute(WebElement.ELEMENT, 'value', function(error, result) {
+        if (error) { return cb(false); }
+        cb(result.value === value);
       });
     }
 

diff --git a/lib/driver/methods/link.js b/lib/driver/methods/link.js
@@ -13,6 +13,7 @@ module.exports = function link(mixed, callback) {
     [
       function(cb) {
         _this.elements(mixed, function(err, elements) {
+          if (err) { return cb(null); }
           cb(null, elements);
         });
       },

diff --git a/package.json b/package.json
@@ -39,13 +39,13 @@
   "dependencies": {
     "async": "^0.9.0",
     "chai": "^2.2.0",
-    "lodash": "^3.6.0",
+    "lodash": "^3.7.0",
     "webdriverio": "^2.4.5"
   },
   "devDependencies": {
     "cucumber": "^0.4.8",
     "gulp": "^3.8.11",
-    "gulp-eslint": "^0.8.0",
+    "gulp-eslint": "^0.9.0",
     "hapi": "^8.4.0",
     "istanbul": "^0.3.13",
     "swig": "^1.4.2"