added some error checking around eyes integration logic to fix #42 - if this fails, we need to back it out

Author: John Doherty

index.js

@@ -12,14 +12,12 @@ function collectPaths(value, paths) {
 }
 
 function coerceInt(value, defaultValue) {
+
     var int = parseInt(value);
 
-    if (typeof int == 'number') {
-        return int;
-    }
-    else {
-        return defaultValue;
-    }
+    if (typeof int === 'number') return int;
+
+    return defaultValue;
 }
 
 var config = {
@@ -28,7 +26,7 @@ var config = {
     sharedObjects: './shared-objects',
     reports: './reports',
     browser: 'chrome',
-    timeout: 10000
+    timeout: 15000
 };
 
 var configFileName = path.resolve(process.cwd(), 'selenium-cucumber-js.json');
@@ -61,7 +59,7 @@ program.on('--help', function () {
 global.browserName = program.browser;
 
 // store Eyes Api globally (used within world.js to set Eyes)
-global.eyeskey = config.eye_key
+global.eyesKey = config.eye_key
 
 // used within world.js to import page objects
 global.pageObjectPath = path.resolve(program.pageObjects);

package.json

@@ -33,8 +33,9 @@
     "url": "https://github.com/john-doherty/selenium-cucumber-js/issues"
   },
   "engines": {
-    "node": ">= 6.9.0"
+    "node": "6.11.0"
   },
+  "engineStrict": true,
   "homepage": "https://github.com/john-doherty/selenium-cucumber-js#readme",
   "dependencies": {
     "chai": "3.5.0",

runtime/world.js

@@ -72,17 +72,21 @@ function getDriverInstance() {
 
 
 /**
- * Initialize the eyes SDK and set your private API key via the config file.*/
+ * Initialize the eyes SDK and set your private API key via the config file.
+ */
 function getEyesInstance() {
 
-    var eyes = new Eyes();
+    if (global.eyesKey) {
 
-    //retrieve apikey from config file in the project root as defined by the user
-    eyes.setApiKey(eyeskey);
+        var eyes = new Eyes();
 
-    return eyes;
+        // retrieve eyes api key from config file in the project root as defined by the user
+        eyes.setApiKey(global.eyesKey);
 
+        return eyes;
+    }
 
+    return null;
 }
 
 function consoleInfo() {
@@ -136,7 +140,7 @@ function importSupportObjects() {
 
             if (fs.existsSync(itemPath)) {
 
-                var dir = requireDir(itemPath, {camelcase: true});
+                var dir = requireDir(itemPath, { camelcase: true });
 
                 merge(allDirs, dir);
             }
@@ -154,7 +158,7 @@ function importSupportObjects() {
     if (global.pageObjectPath && fs.existsSync(global.pageObjectPath)) {
 
         // require all page objects using camel case as object names
-        global.page = requireDir(global.pageObjectPath, {camelcase: true});
+        global.page = requireDir(global.pageObjectPath, { camelcase: true });
     }
 
     // add helpers
@@ -178,9 +182,10 @@ module.exports = function () {
 
         if (!global.driver || !global.eyes) {
             global.driver = getDriverInstance();
+
+            // TOOD: this all feels a bit hacky, needs rethinking...
             global.eyes = getEyesInstance();
         }
-
     });
 
     this.registerHandler('AfterFeatures', function (features, done) {
@@ -224,11 +229,17 @@ module.exports = function () {
 
                 return driver.close().then(function () {
                     return driver.quit();
-                }).then(function () {
-                    // If the test was aborted before eyes.close was called ends the test as aborted.
-                    return eyes.abortIfNotClosed();
+                })
+                .then(function() {
+
+                    if (eyes) {
+                        // If the test was aborted before eyes.close was called ends the test as aborted.
+                        return eyes.abortIfNotClosed();
+                    }
+
+                    return Promise.resolve();
                 });
-            })
+            });
         }
 
         return driver.close().then(function () {