added parallel

Author: tr4n2uil

browserstack_async.js

@@ -0,0 +1,16 @@
+exports.config = {
+  user: 'BROWSERSTACK_USERNAME',
+  key: 'BROWSERSTACK_ACCESS_KEY',
+
+  seleniumHost: 'hub-cloud.browserstack.com',
+  seleniumPort: 80,
+
+  test: '../tests/local_test.js',
+
+  capabilities: [{
+    browserName: 'chrome',
+    name: "local_test",
+    build: "wd-browserstack",
+    'browserstack.local': true
+  }]
+}

browserstack_local_async.js

@@ -0,0 +1,30 @@
+exports.config = {
+  user: 'BROWSERSTACK_USERNAME',
+  key: 'BROWSERSTACK_ACCESS_KEY',
+
+  seleniumHost: 'hub-cloud.browserstack.com',
+  seleniumPort: 80,
+
+  test: '../tests/single_test.js',
+
+  commonCapabilities: {
+    name: "parallel_test",
+    build: "wd-browserstack"
+  },
+
+  capabilities: [{
+    browserName: 'chrome'
+  },{
+    browserName: 'firefox'
+  },{
+    browserName: 'safari'
+  },{
+    browserName: 'internet explorer'
+  }]
+}
+
+// Code to support common capabilities
+exports.config.capabilities.forEach(function(caps){
+  for(var i in exports.config.commonCapabilities) caps[i] = caps[i] || exports.config.commonCapabilities[i];
+});
+

browserstack_promises.js

@@ -2,8 +2,8 @@ exports.config = {
   user: 'BROWSERSTACK_USERNAME',
   key: 'BROWSERSTACK_ACCESS_KEY',
 
-  selenium_host: 'hub-cloud.browserstack.com',
-  selenium_port: 80,
+  seleniumHost: 'hub-cloud.browserstack.com',
+  seleniumPort: 80,
 
   test: '../tests/single_test.js',
 

conf/local.conf.js

@@ -2,16 +2,26 @@ var chai = require("chai"),
     chaiAsPromised = require("chai-as-promised"),
     wd = require('wd'),
     colors = require('colors'),
-    child_process = require('child_process');
+    child_process = require('child_process'),
+    browserstack = require('browserstack-local');
 
 chai.use(chaiAsPromised);
 chai.should();
 chaiAsPromised.transferPromiseness = wd.transferPromiseness;
 
-function setupBrowser(){
-  var username = process.env.BROWSERSTACK_USERNAME || config.user;
-  var accessKey = process.env.BROWSERSTACK_ACCESS_KEY || config.key;
-  var browser = wd.promiseChainRemote(config.selenium_host, config.selenium_port, username, accessKey);
+var username = process.env.BROWSERSTACK_USERNAME || config.user;
+var accessKey = process.env.BROWSERSTACK_ACCESS_KEY || config.key;
+
+wd.addPromiseChainMethod(
+  'onQuit', function(done) {
+    if(done) done();
+    return this;
+  }
+);
+
+function runOnBrowserStack(caps, test, done){
+  console.log("Running Test: " + test.name.green + '\n');
+  var browser = wd.promiseChainRemote(config.seleniumHost, config.seleniumPort, username, accessKey);
 
   // optional extra logging
   browser.on('status', function(info) {
@@ -24,16 +34,26 @@ function setupBrowser(){
     console.log(' > ' + meth.yellow, path, (data || '').grey);
   });
 
-  return browser;
+  test.run(browser.init(caps)).fin(function() { return browser.quit(); }).onQuit(done).done();
 }
 
 var config_file = process.argv[2] || 'conf.js'
 var config = require(config_file).config;
 var test = require(config.test);
 
-console.log("Running Test: " + test.name.green + '\n');
-
 for(var i in config.capabilities){
-  var browser = setupBrowser();
-  test.run(browser.init(config.capabilities[i])).fin(function() { return browser.quit(); }).done();
+  var caps = config.capabilities[i];
+  if(caps["browserstack.local"]){
+    console.log("Connecting local");
+    var bs_local = new browserstack.Local();
+    bs_local.start({'key': accessKey }, function(error) {
+      if (error) return console.log(error.red);
+      console.log('Connected. Now testing...');
+
+      runOnBrowserStack(caps, test, function(){ bs_local.stop(); });
+    });
+  }
+  else {
+    runOnBrowserStack(caps, test);
+  }
 }

conf/parallel.conf.js

@@ -0,0 +1,11 @@
+module.exports = {
+  name: 'BrowserStack Local Testing',
+  run : function (browser) {
+    return browser
+      .get("http://bs-local.com:45691/check")
+      .source()
+      .then(function(data){
+        data.should.match(/Up and running/i);
+      })
+  }
+};