Cleanup code formatting and jshint errors

Author: jzaefferer

lib/_patch/mocha-plugin.js

@@ -1,4 +1,4 @@
-(function(){
+(function() {
   function stack(err) {
     var str = err.stack || err.toString();
 
@@ -20,39 +20,39 @@
     return test.fullTitle().replace(/#/g, '');
   }
 
-  return Mocha.BrowserStack = function (runner, root) {
+  return Mocha.BrowserStack = function(runner, root) {
     Mocha.reporters.HTML.call(this, runner, root);
 
     var count = 1,
-    that = this,
-    failures = 0,
-    passes = 0,
-    start = 0,
-    tracebacks = [];
+      that = this,
+      failures = 0,
+      passes = 0,
+      start = 0,
+      tracebacks = [];
 
-    runner.on('start', function () {
+    runner.on('start', function() {
       start = (new Date).getTime();
     });
-    
-    runner.on('test end', function (test) {
+
+    runner.on('test end', function(test) {
       count += 1;
     });
-    
-    runner.on('pass', function (test) {
+
+    runner.on('pass', function(test) {
       passes += 1;
     });
-    
-    runner.on('fail', function (test, err) {
+
+    runner.on('fail', function(test, err) {
       failures += 1;
-      
+
       if (err) {
-	tracebacks.push(err);
+        tracebacks.push(err);
       }
     });
-    
-    runner.on('end', function () {
-      results = {}
-      results.runtime = ((new Date).getTime() - start);
+
+    runner.on('end', function() {
+      results = {};
+      results.runtime = Date.now() - start;
       results.total = passes + failures;
       results.passed = passes;
       results.failed = failures;

lib/_patch/qunit-plugin.js

@@ -1,47 +1,58 @@
-// For logging assertions on the console, here's what grunt-contrib-qunit uses: 
+// For logging assertions on the console, here's what grunt-contrib-qunit uses:
 // https://github.com/gruntjs/grunt-contrib-qunit/blob/784597023e7235337ca9c0651aa45124a2d72341/tasks/qunit.js#L45
-(function(){
+(function() {
 
   var failedAssertions = [];
-  var options, currentModule, currentTest, setTimeoutVariable;
+  var options,
+    currentModule,
+    currentTest,
+    setTimeoutVariable;
   var pendingTest = {};
 
   var testTimeout = function() {
     var error = {
-      testName: currentTest, message: "Stuck on this test for 60 sec."
-    }
-    
-    BrowserStack.post('/_progress', {tracebacks: [error]}, function(){});    
-  }
+      testName: currentTest,
+      message: "Stuck on this test for 60 sec."
+    };
+
+    BrowserStack.post('/_progress', {
+      tracebacks: [error]
+    }, function(){});
+  };
 
-  QUnit.testDone(function( details ) {
+  QUnit.testDone(function(details) {
     var ct = details.module + " - " + details.name;
     clearTimeout(pendingTest[ct]);
   });
 
-  QUnit.testStart(function( details ) {
+  QUnit.testStart(function(details) {
     currentTest = details.module + " - " + details.name;
-    pendingTest[currentTest] = setTimeout(function(){
+    pendingTest[currentTest] = setTimeout(function() {
       testTimeout(currentTest);
     }, 60000);
   });
-  
-  QUnit.log(function( details ) {
-    if ( details.result ) {
+
+  QUnit.log(function(details) {
+    if (details.result) {
       return;
     }
-    
+
     var error = {
-      actual: details.actual, expected: encodeURIComponent(details.expected), message: encodeURIComponent(details.message), source: encodeURIComponent(details.source),
-      testName: (details.module + ": " + details.name)
-    }
-    
-    BrowserStack.post('/_progress', {tracebacks: [error]}, function(){});
+      actual: details.actual,
+      expected: encodeURIComponent(details.expected),
+      message: encodeURIComponent(details.message),
+      source: encodeURIComponent(details.source),
+      testName:( details.module + ": " + details.name)
+    };
+
+    BrowserStack.post('/_progress', {
+      tracebacks: [error]
+    }, function(){});
   });
-  
-  QUnit.done(function( results ) {
+
+  QUnit.done(function(results) {
     results.url = window.location.pathname;
     BrowserStack.post("/_report", results, function(){});
   });
-  
+
 })();

lib/config.js

@@ -1,5 +1,5 @@
 var path = require('path'),
-    fs = require('fs');
+  fs = require('fs');
 var pwd = process.cwd();
 
 config_path = process.env.BROWSERSTACK_JSON || 'browserstack.json';
@@ -46,10 +46,10 @@ if (!config.project) {
 var commit_id = process.env.TRAVIS_COMMIT;
 
 if (commit_id) {
-  config.build = "Commit-" + commit_id.slice(0, commit_id.length/2);
+  config.build = "Commit-" + commit_id.slice(0, commit_id.length / 2);
 }
 
-['username', 'key', 'test_path', 'browsers'].forEach(function (param) {
+['username', 'key', 'test_path', 'browsers'].forEach(function(param) {
   if (typeof config[param] === 'undefined') {
     console.error('Configuration parameter `%s` is required.', param);
     process.exit(1);
@@ -58,27 +58,27 @@ if (commit_id) {
 
 var formatPath = function(path) {
   if (path.indexOf(pwd) === 0) {
-    path= path.slice(pwd.length + 1);
+    path = path.slice(pwd.length + 1);
   }
-  if (!fs.existsSync(path)){
-    console.error('Test path: '+ path + ' is invalid.');
+  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){
+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) {
+for (var key in config) {
   if (config.hasOwnProperty(key)) {
     exports[key] = config[key];
   }

lib/local.js

@@ -1,30 +1,29 @@
 var exec = require('child_process').exec,
-    fs = require('fs'),
-    http = require('http'),
-    windows = ((process.platform.match(/win32/) || process.platform.match(/win64/)) != null),
-    localBinary = __dirname + (windows ? '/BrowserStackTunnel.jar' : '/BrowserStackLocal'),
-    utils = require('./utils'),
-    config = require('./config');
+  fs = require('fs'),
+  http = require('http'),
+  windows = ((process.platform.match(/win32/) || process.platform.match(/win64/)) !== null),
+  localBinary = __dirname + (windows ? '/BrowserStackTunnel.jar' : '/BrowserStackLocal'),
+  utils = require('./utils'),
+  config = require('./config');
 
-var Tunnel = function Tunnel (key, port, uniqueIdentifier, callback, err) {
+var Tunnel = function Tunnel(key, port, uniqueIdentifier, callback, err) {
   var that = {};
 
-  function tunnelLauncher () {
+  function tunnelLauncher() {
     var tunnelCommand = (windows ? 'java -jar ' : '') + localBinary + ' ';
-    if (config.debug)
-      tunnelCommand += ' -v ';
+    if (config.debug) tunnelCommand += ' -v ';
     tunnelCommand += key + ' ';
     tunnelCommand += 'localhost' + ',';
     tunnelCommand += port.toString() + ',';
     tunnelCommand += '0';
-    tunnelCommand += (typeof uniqueIdentifier === 'undefined')? ' -force -onlyAutomate' : ' -tunnelIdentifier ' + uniqueIdentifier;
+    tunnelCommand += (typeof uniqueIdentifier === 'undefined') ? ' -force -onlyAutomate' : ' -tunnelIdentifier ' + uniqueIdentifier;
 
     if (typeof callback !== 'function') {
-      callback = function () {};
+      callback = function(){};
     }
 
     console.log("[%s] Launching tunnel", new Date());
-    var subProcess = exec(tunnelCommand, function (error, stdout, stderr) {
+    var subProcess = exec(tunnelCommand, function(error, stdout, stderr) {
       console.log(stderr);
       console.log(error);
       if (stdout.indexOf('Error') >= 0) {
@@ -38,13 +37,13 @@ var Tunnel = function Tunnel (key, port, uniqueIdentifier, callback, err) {
     var running = false;
     var runMatcher = "You can now access your local server(s)";
 
-    setTimeout(function () {
+    setTimeout(function() {
       if (!running) {
         utils.alertBrowserStack("Tunnel launch timeout", 'Stdout:\n' + data);
       }
     }, 30 * 1000);
 
-    subProcess.stdout.on('data', function (_data) {
+    subProcess.stdout.on('data', function(_data) {
       if (running) {
         return;
       }
@@ -61,7 +60,7 @@ var Tunnel = function Tunnel (key, port, uniqueIdentifier, callback, err) {
     that.process = subProcess;
   }
 
-  fs.exists(localBinary, function (exists) {
+  fs.exists(localBinary, function(exists) {
     if (exists) {
       fs.unlinkSync(localBinary);
       // tunnelLauncher();
@@ -71,19 +70,20 @@ var Tunnel = function Tunnel (key, port, uniqueIdentifier, callback, err) {
 
     var file = fs.createWriteStream(localBinary);
     var request = http.get(
-      (windows ? "http://www.browserstack.com/BrowserStackTunnel.jar" : ("http://s3.amazonaws.com/browserStack/browserstack-local/BrowserStackLocal-" + process.platform + "-" + process.arch)),
-      function(response) {
-        response.pipe(file);
+    (windows ? "http://www.browserstack.com/BrowserStackTunnel.jar" : ("http://s3.amazonaws.com/browserStack/browserstack-local/BrowserStackLocal-" + process.platform + "-" + process.arch)),
+    function(response) {
+      response.pipe(file);
 
-        response.on('end', function () {
-          fs.chmodSync(localBinary, 0700);
-          setTimeout(function() {tunnelLauncher();}, 100);
-        });
-      }
-    );
+      response.on('end', function() {
+        fs.chmodSync(localBinary, 0700);
+        setTimeout(function() {
+          tunnelLauncher();
+        }, 100);
+      });
+    });
   });
 
   return that;
-}
+};
 
 exports.Tunnel = Tunnel;