Fix #2

globals.js

@@ -1,3 +1,3 @@
 export default {  
-  waitForConditionTimeout: 10000
+  waitForConditionTimeout: 100000
 };

nightwatch.conf.js

@@ -1,9 +1,52 @@
-require('babel-core/register');
-const fs = require("fs");
+require("babel-core/register")
 
 module.exports = ((settings) => {
-  const seleniumFileName =
-  fs.readdirSync("node_modules/selenium-standalone/.selenium/selenium-server/");
-  settings.selenium.server_path += seleniumFileName;
-  return settings;
-})(require("./nightwatch.json"));
+  settings.test_settings = {
+    default: {
+      launch_url: "https://nightwatchjs.org",
+    },
+
+    selenium: {
+      // Selenium Server is running locally and is managed by Nightwatch
+      selenium: {
+        start_process: true,
+        port: 4444,
+        server_path: require("selenium-server").path,
+        cli_args: {
+          "webdriver.gecko.driver": require("geckodriver").path,
+          "webdriver.chrome.driver": require("chromedriver").path,
+          "webdriver.ie.driver":
+            process.platform === "win32" ? require("iedriver").path : "",
+        },
+      },
+      webdriver: {
+        start_process: false,
+      },
+    },
+
+    "selenium.chrome": {
+      extends: "selenium",
+      desiredCapabilities: {
+        browserName: "chrome",
+        chromeOptions: {
+          w3c: false,
+        },
+      },
+    },
+
+    "selenium.firefox": {
+      extends: "selenium",
+      desiredCapabilities: {
+        browserName: "firefox",
+      },
+    },
+
+    "selenium.ie": {
+      extends: "selenium",
+      desiredCapabilities: {
+        browserName: "internet explorer",
+      },
+    },
+  }
+  return settings
+})(require("./nightwatch.json"))

nightwatch.json

@@ -4,38 +4,5 @@
   "custom_commands_path": "",
   "custom_assertions_path": "",
   "page_objects_path": "pages",
-  "globals_path": "globals",
-
-  "selenium": {
-    "start_process": true,
-    "server_path": "node_modules/selenium-standalone/.selenium/selenium-server/",
-    "log_path": "./reports",
-    "host": "127.0.0.1",
-    "port": 4444,
-    "cli_args": {
-      "webdriver.chrome.driver": ""
-    }
-  },
-  "test_settings": {
-    "default": {
-      "launch_url": "https://localhost",
-      "selenium_port": 80,
-      "selenium_host": "ondemand.saucelabs.com",
-      "silent": true,
-      "globals": {
-        "waitForConditionTimeout": 5000 
-      },
-      "username" : "${SAUCE_USERNAME}", 
-      "access_key" : "${SAUCE_ACCESS_KEY}"
-    },
-    "local": {
-      "selenium_port": 4444,
-      "selenium_host": "localhost",
-      "desiredCapabilities": {
-        "browserName": "chrome",
-        "javascriptEnabled": true,
-        "acceptSslCerts": true
-      }
-    }
-  }
+  "globals_path": "globals"
 }

package.json

@@ -5,8 +5,9 @@
   "main": "index.js",
   "scripts": {
     "e2e-setup": "selenium-standalone install",
-    "sauce": "nightwatch",
-    "test": "nightwatch --env local"
+    "firefox": "nightwatch --env firefox",
+    "sauce": "nightwatch --env saucelabs",
+    "test": "nightwatch"
   },
   "keywords": [],
   "author": "John Kennedy - @codejockie",
@@ -15,6 +16,10 @@
     "babel-cli": "^6.26.0",
     "babel-plugin-add-module-exports": "^0.2.1",
     "babel-preset-es2015": "^6.24.1",
+    "chromedriver": "^81.0.0",
+    "geckodriver": "^1.19.1",
+    "nightwatch": "^1.3.5",
+    "selenium-server": "^3.141.59",
     "selenium-standalone": "^6.7.0"
   }
 }

pages/signinPage.js

@@ -10,7 +10,7 @@ const signinCommands = {
 };
 
 export default {  
-  url: 'https://cjdocs.herokuapp.com/auth/signin',
+  url: 'https://cjdocs.herokuapp.com/signin',
   commands: [signinCommands],
   elements: {
     emailInput: {

tests/signin.spec.js

@@ -7,7 +7,7 @@ module.exports = {
       .navigate()
       .signin(process.env.EMAIL, process.env.PASSWORD);
 
-    instancesPage.expect.element('@homepageWelcomeTitle').text.to.contain('Welcome to the CJDocs Home!');
+    instancesPage.expect.element('@homepageWelcomeTitle').text.to.contain('Welcome to the Docs Home!');
 
     client.end();
   }