simplify

browserstack · Aug 11, 2016 · 1508507 · 1508507
1 parent e5f1d67
commit 1508507
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 31 deletions.
diff --git a/conf/suite.conf.js b/conf/suite.conf.js
@@ -7,33 +7,14 @@ nightwatch_config = {
     "port" : 80
   },
 
-  common_capabilities: {
-    'build': 'nightwatch-browserstack',
-    'browserstack.user': process.env.BROWSERSTACK_USERNAME || 'BROWSERSTACK_USERNAME',
-    'browserstack.key': process.env.BROWSERSTACK_ACCESS_KEY || 'BROWSERSTACK_ACCESS_KEY',
-    'browserstack.debug': true
-  },
-
   test_settings: {
-    default: {},
-    chrome: {
-      desiredCapabilities: {
-        browser: "chrome"
-      }
-    },
-    firefox: {
-      desiredCapabilities: {
-        browser: "firefox"
-      }
-    },
-    safari: {
-      desiredCapabilities: {
-        browser: "safari"
-      }
-    },
-    ie: {
+    default: {
       desiredCapabilities: {
-        browser: "internet explorer"
+        'build': 'nightwatch-browserstack',
+        'browserstack.user': process.env.BROWSERSTACK_USERNAME || 'BROWSERSTACK_USERNAME',
+        'browserstack.key': process.env.BROWSERSTACK_ACCESS_KEY || 'BROWSERSTACK_ACCESS_KEY',
+        'browserstack.debug': true,
+        'browser': 'chrome'
       }
     }
   },
@@ -44,15 +25,11 @@ nightwatch_config = {
   }   
 };
 
-// Code to support common capabilites
+// Code to copy seleniumhost/port into test settings
 for(var i in nightwatch_config.test_settings){
   var config = nightwatch_config.test_settings[i];
   config['selenium_host'] = nightwatch_config.selenium.host;
   config['selenium_port'] = nightwatch_config.selenium.port;
-  config['desiredCapabilities'] = config['desiredCapabilities'] || {};
-  for(var j in nightwatch_config.common_capabilities){
-    config['desiredCapabilities'][j] = config['desiredCapabilities'][j] || nightwatch_config.common_capabilities[j];
-  }
 }
 
 module.exports = nightwatch_config;
diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
     "local": "./scripts/local.runner.js -c conf/local.conf.js",
     "parallel": "./node_modules/.bin/nightwatch -c conf/parallel.conf.js -e chrome,firefox,safari,ie",
     "parallel_local": "./scripts/local.runner.js -c conf/parallel_local.conf.js -e chrome,firefox,safari",
-    "suite": "./node_modules/.bin/nightwatch -c conf/suite.conf.js -e chrome"
+    "suite": "./node_modules/.bin/nightwatch -c conf/suite.conf.js"
   },
   "repository": {
     "type": "git",