Bump js-reporters version and update jasmine patch

Author: vedharish

bin/cli.js

@@ -382,7 +382,7 @@ function runTests(config, callback) {
       logger.trace('runTests: creating tunnel');
       tunnel = new Tunnel(config.key, serverPort, config.tunnelIdentifier, config, function (err) {
         if(err) {
-          cleanUpAndExit(null, err, {}, callback);
+          cleanUpAndExit(null, err, [], callback);
         } else {
           logger.trace('runTests: created tunnel');
 

bin/runner.js

@@ -26,22 +26,22 @@ try {
   config = require(config_path);
 } catch (e) {
   if (e.code === 'MODULE_NOT_FOUND') {
-    console.err('Configuration file `browserstack.json` is missing.');
+    console.error('Configuration file `browserstack.json` is missing.');
     throw new Error('Configuration file `browserstack.json` is missing.');
   } else {
-    console.err('Invalid configuration in `browserstack.json` file');
-    console.err(e.message);
-    console.err(e.stack);
+    console.error('Invalid configuration in `browserstack.json` file');
+    console.error(e.message);
+    console.error(e.stack);
     throw new Error('Invalid configuration in `browserstack.json` file');
   }
 }
 
 var runner = require('./cli.js');
 runner.run(config, function(err) {
   if(err) {
-    console.err(err);
-    console.err(err.stack);
-    console.err('Invalid Command');
+    console.error(err);
+    console.error(err.stack);
+    console.error('Invalid Command');
     process.exit(1);
   }
   process.exit(0);

lib/_patch/browserstack.js

@@ -23,12 +23,12 @@
         if (req.readyState==4)
           cb(req.responseText);
       };
-    var data = "data=" + encodeURIComponent(JSON.stringify(json));
+    var data = JSON.stringify(json);
     req.open("POST", url, true);
     req.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
     req.setRequestHeader('X-Browser-String', BrowserStack.browser_string);
     req.setRequestHeader('X-Worker-UUID', BrowserStack.worker_uuid);
-    req.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
+    req.setRequestHeader('Content-type', 'application/json');
     req.send(data);
   }
 

lib/_patch/reporter.js

@@ -11,10 +11,10 @@
     throw new Error('JsReporters: No testing framework was found');
   }
 
-  runner.on('testEnd', function(test) {
+  runner.on('testEnd', function(eachTest) {
     BrowserStack.post("/_progress", {
-      test: test
-    });
+      'test': eachTest
+    }, function() {});
   });
 
   runner.on('runEnd', function(globalSuite) {

lib/server.js

@@ -154,11 +154,6 @@ exports.Server = function Server(bsClient, workers, config, callback) {
     }
   }
 
-  function parseBody(body) {
-    // TODO: Have better implementation
-    return JSON.parse(qs.parse(body).data.escapeSpecialChars());
-  }
-
   function formatTraceback(details) {
     var output = '"' + details.testName + '" failed';
     if(details.error) {
@@ -243,18 +238,18 @@ exports.Server = function Server(bsClient, workers, config, callback) {
       var query = null;
 
       try {
-        query = parseBody(body);
+        query = JSON.parse(body);
       } catch(e) {
         logger.info('[%s] Exception in parsing log', worker.string);
         logger.info('[%s] Log: ' + qs.parse(body).data, worker.string);
       }
 
-      var browserReport = getBrowserReport(browserInfo);
-      browserReport.tests.push(query.test || {});
-
       logger.trace('[%s] _progress', worker.id, JSON.stringify(query));
 
       if (query && query.test && query.test.errors) {
+        var browserReport = getBrowserReport(browserInfo);
+        browserReport.tests.push(query.test || {});
+
         query.test.errors.forEach(function(error) {
           logger.info('[%s] ' + chalk.red('Error:'), browserInfo, formatTraceback({
             error: error,
@@ -280,7 +275,7 @@ exports.Server = function Server(bsClient, workers, config, callback) {
 
       var query = null;
       try {
-        query = parseBody(body);
+        query = JSON.parse(body);
       } catch (e) {}
 
       logger.trace('[%s] _report', worker.id, JSON.stringify(query));
@@ -291,8 +286,13 @@ exports.Server = function Server(bsClient, workers, config, callback) {
         var browserReport = getBrowserReport(browserInfo);
         browserReport.suites = query;
 
-        if(query.testCounts) {
-          var color = query.status === 'failed' ? 'red' : 'green';
+        var color;
+        if(config['test_framework'] === 'jasmine') {
+          color = ( query.total !== query.passed ) ? 'red' : 'green';
+          logger.info('[%s] ' + chalk[color](( query.total !== query.passed ) ? 'Failed:' : 'Passed:') + ' %d tests, %d passed, %d failed; ran for %dms', browserInfo, query.total, query.passed, query.failed, query.runtime);
+          config.status += query.failed;
+        } else if(query.testCounts) {
+          color = query.status === 'failed' ? 'red' : 'green';
           logger.info('[%s] ' + chalk[color](query.status === 'failed' ? 'Failed:' : 'Passed:') + ' %d tests, %d passed, %d failed, %d skipped; ran for %dms', browserInfo, query.testCounts.total, query.testCounts.passed, query.testCounts.failed, query.testCounts.skipped, query.runtime);
           config.status += query.testCounts.failed;
         }
@@ -347,7 +347,7 @@ exports.Server = function Server(bsClient, workers, config, callback) {
     },
     '_log': function logHandler(uri, body, request, response) {
       var uuid = getWorkerUuid(request);
-      var query = parseBody(body);
+      var query = body;
       logger.trace('[%s] _log', ((uuid && workers[uuid]) || {}).id, query);
 
       var logged = false;

package.json

@@ -10,7 +10,7 @@
   "dependencies": {
     "browserstack": "1.3.0",
     "chalk": "0.4.0",
-    "js-reporters": "^1.0.0",
+    "js-reporters": "^1.1.0",
     "mime": "1.3.4",
     "send": "0.13.0",
     "tunnel": "0.0.3"

tests/external-tests.js

@@ -96,9 +96,9 @@ var repositories = [
       'test/browser/opts.html'
     ],
     expected_results: {
-      tests: 94,
-      passed: 80,
-      failed: 14
+      tests: 86,
+      passed: 78,
+      failed: 8
     }
   },
   {