Merge branch 'master' into pr/6

Conflicts:
	README.md

Author: dhimil

README.md

@@ -45,8 +45,8 @@ A sample configuration file:
     {
       "username": "<username>",
       "key": "<key>",
-      "test_path": "relative/path/to/test/page",
       "test_framework": "qunit/jasmine/mocha",
+      "test_path": ["relative/path/to/test/page1", "relative/path/to/test/page2"],
       "browsers":   [{
         "browser": "firefox",
         "browser_version": "15.0",

bin/runner.js

@@ -62,13 +62,10 @@ console.log("Launching server on port:", serverPort);
 var server = new Server(client, workers);
 server.listen(parseInt(serverPort, 10));
 
-function launchBrowser(browser) {
+function launchBrowser(browser, url) {
   var browserString = utils.browserString(browser);
   console.log("[%s] Launching", browserString);
 
-  var url = 'http://localhost:' + serverPort.toString() + '/';
-  url += config.test_path;
-
   var key = utils.uuid();
 
   if (url.indexOf('?') > 0) {
@@ -93,6 +90,7 @@ function launchBrowser(browser) {
 
   client.createWorker(browser, function (err, worker) {
     if (err || typeof worker !== 'object') {
+      console.log("Error from BrowserStack: ", err);
       utils.alertBrowserStack("Failed to launch worker",
                               "Arguments: " + JSON.stringify({
                                 err: err,
@@ -138,6 +136,20 @@ function launchBrowser(browser) {
   });
 }
 
+var launchBrowsers = function(config, browser) {
+  setTimeout(function () {
+    if(Object.prototype.toString.call(config.test_path) === '[object Array]'){
+      config.test_path.forEach(function(path){
+        var url = 'http://localhost:' + serverPort.toString() + '/' + path;
+        launchBrowser(browser,url);
+      });
+    } else {
+      var url = 'http://localhost:' + serverPort.toString() + '/' + config.test_path;
+      launchBrowser(browser,url);              
+    }
+  }, 100);
+}
+
 if (config.browsers && config.browsers.length > 0) {
   tunnel = new Tunnel(config.key, serverPort, config.tunnelIdentifier, function () {
     console.log("Launching BrowserStack workers");
@@ -149,14 +161,11 @@ if (config.browsers && config.browsers.length > 0) {
           console.log("[%s] Version is %s.",
                       utils.browserString(browser), version);
           browser.browser_version = version;
-
           // So that all latest logs come in together
-          setTimeout(function () {
-            launchBrowser(browser);
-          }, 100);
+          launchBrowsers(config, browser);
         });
       } else {
-        launchBrowser(browser);
+        launchBrowsers(config, browser);
       }
     });
   });

lib/config.js

@@ -56,18 +56,28 @@ if (commit_id) {
   }
 });
 
-// Convert absoulte path into relative paths.
-if (config.test_path.indexOf(pwd) === 0) {
-  config.test_path = config.test_path.slice(pwd.length + 1);
-}
-
-if (!fs.existsSync(config.test_path)){
-  console.error('Test path is invalid.');
-  process.exit(1);
+var formatPath = function(path) {
+  if (path.indexOf(pwd) === 0) {
+    path= path.slice(pwd.length + 1);
+  }
+  if (!fs.existsSync(path)){
+    console.error('Test path: '+ path + ' is invalid.');
+    process.exit(1);
+  }
+  return path;
 }
 
 config.tunnelIdentifier = process.env.TUNNEL_ID || process.env.TRAVIS_JOB_ID || process.env.TRAVIS_BUILD_ID;
 
+if(Object.prototype.toString.call(config.test_path) === '[object Array]') {
+  config.test_path.forEach(function(path){
+    path = formatPath(path);
+  });
+} else {
+  //Backward Compatibility, if test_path is not array of path
+  config.test_path = formatPath(config.test_path);
+}
+
 for (key in config) {
   if (config.hasOwnProperty(key)) {
     exports[key] = config[key];

lib/tunnel.js

@@ -24,7 +24,7 @@ var Tunnel = function Tunnel (key, port, tunnelIdentifier, callback, err) {
 
     console.log("Launching tunnel");
     var subProcess = exec(tunnelCommand, function (error, stdout, stderr) {
-      console.error(stderr);
+      console.log(stderr);
       if (stdout.indexOf('Error') >= 0) {
         console.log("Tunnel launching failed");
         console.log(stdout);