Merge branch 'master' of https://github.com/browserstack/browserstack-runner

nakula · nakula · commit 7561403b5a3b · 2014-04-22T15:21:33.000+05:30
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,15 @@
+[submodule "tests/external-repos/underscorejs"]
+	path = tests/external-repos/underscorejs
+	url = https://github.com/browserstack/underscore
+[submodule "tests/external-repos/Modernizr"]
+	path = tests/external-repos/Modernizr
+	url = https://github.com/browserstack/Modernizr
+[submodule "tests/external-repos/url.js"]
+	path = tests/external-repos/url.js
+	url = https://github.com/browserstack/url.js.git
+[submodule "tests/external-repos/mout"]
+	path = tests/external-repos/mout
+	url = https://github.com/browserstack/mout
+[submodule "tests/external-repos/Comparatorsjs"]
+	path = tests/external-repos/Comparatorsjs
+	url = https://github.com/browserstack/Comparators.js
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 A command line interface to run browser tests over BrowserStack.
 
 ## Install
-Go to the `browserstack-runner` directory.  
+Go to the `browserstack-runner` directory.
 Install browserstack-runner
 
     npm -g install
@@ -36,7 +36,7 @@ If nothing is provided as `preset` **default** is used.
    in a browser.
 
  - *test_framework*: Specify test framework which will execute the tests.
-    We support qunit, jasmine and mocha.
+    We support qunit, jasmine, jasmine 2.0 and mocha.
 
  - *timeout*: Specify worker timeout with BrowserStack.
 
@@ -48,7 +48,7 @@ A sample configuration file:
 {
   "username": "<username>",
   "key": "<key>",
-  "test_framework": "qunit/jasmine/mocha",
+  "test_framework": "qunit/jasmine/jasmine2/mocha",
   "test_path": ["relative/path/to/test/page1", "relative/path/to/test/page2"],
   "browsers":   [{
     "browser": "firefox",
diff --git a/bin/cli.js b/bin/cli.js
@@ -290,6 +290,8 @@ function runTests() {
         });
       });
     });
+  } else {
+    launchServer();
   }
 }
 
diff --git a/lib/_patch/browserstack.js b/lib/_patch/browserstack.js
@@ -42,6 +42,9 @@
   console.log = function (arguments) {
     post('/_log/', arguments, function () {});
   };
+  console.warn = function (arguments) {
+    post('/_log/', arguments, function () {});
+  };
 
   BrowserStack.post = post;
   BrowserStack.getParameterByName = getParameterByName;
diff --git a/lib/_patch/jasmine2-plugin.js b/lib/_patch/jasmine2-plugin.js
@@ -0,0 +1,28 @@
+(function() {
+  var checker = setInterval(function() {
+    if (!jasmine.running) {
+      var results = {};
+      var specs = jsApiReporter.specs();
+      results.runtime = jsApiReporter.executionTime();
+      results.total = 0;
+      results.passed = 0;
+      results.failed = 0;
+      results.tracebacks = [];
+
+      for (var spec in specs) {
+        if (specs[spec].status === 'passed') {
+            results.passed++;
+        } else {
+            results.tracebacks.push(specs[spec].description);
+            results.failed = true;
+        }
+      }
+
+      results.total = results.passed + results.failed;
+      results.url = window.location.pathname;
+      BrowserStack.post('/_report', results, function(){});
+    }
+    clearInterval(checker);
+  }, 1000);
+})();
+
diff --git a/lib/server.js b/lib/server.js
@@ -79,10 +79,19 @@ exports.Server = function Server(bsClient, workers) {
         framework_scripts = {
           'qunit': ['qunit-plugin.js'],
           'jasmine': ['jasmine-jsreporter.js', 'jasmine-plugin.js'],
+          'jasmine2': ['jasmine2-plugin.js'],
           'mocha': ['mocha-plugin.js']
         };
 
-        if (mimeType === 'text/html') {
+        var filePath = path.relative(process.cwd(), filename);
+        var pathMatches;
+
+        if (typeof config.test_path === 'object') {
+          pathMatches = (config.test_path.indexOf(filePath) != -1);
+        } else {
+          pathMatches = (filePath == config.test_path);
+        }
+        if (pathMatches && mimeType === 'text/html') {
           var matcher = /(.*)<\/head>/;
           var patch = "$1";
           scripts.forEach(function(script) {
@@ -95,6 +104,10 @@ exports.Server = function Server(bsClient, workers) {
               patch += "<script type='text/javascript' src='/_patch/" + script + "'></script>\n";
             });
             patch += "<script type='text/javascript'>jasmine.getEnv().addReporter(new jasmine.JSReporter());</script>\n";
+          } else if (config['test_framework'] && config['test_framework'] == "jasmine2") {
+            framework_scripts['jasmine2'].forEach(function(script) {
+              patch += "<script type='text/javascript' src='/_patch/" + script + "'></script>\n";
+            });
           } else if (config['test_framework'] && config['test_framework'] == "mocha") {
             framework_scripts['mocha'].forEach(function(script) {
               patch += "<script type='text/javascript' src='/_patch/" + script + "'></script>\n";
diff --git a/lib/utils.js b/lib/utils.js
@@ -26,7 +26,12 @@ var uuid = function uuidGenerator() {
 };
 
 var browserString = function browserString(config) {
-  return config.os + ' ' + config.os_version + ', ' + (config.browser == 'ie' ? 'IE' : titleCase(config.browser || config.device)) + ' ' + (config.browser_version || config.device);
+  var os_details = config.os + ' ' + config.os_version;
+  if (config.browser) {
+    return os_details + ', ' + (config.browser == 'ie' ? 'Internet Explorer' : titleCase(config.browser)) + ' ' + config.browser_version;
+  } else {
+    return os_details + (config.device ? (', ' + config.device) : "");
+  }
 };
 
 var objectSize = function objectSize(obj) {
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "browserstack-runner",
   "description": "A command line interface to run browser tests over BrowserStack",
-  "version": "0.1.11",
+  "version": "0.1.13",
   "homepage": "https://github.com/browserstack/browserstack-runner",
   "repository": {
     "type": "git",
@@ -12,6 +12,9 @@
     "chalk": "0.4.0",
     "tunnel": "0.0.3"
   },
+  "devDependencies": {
+    "mocha": "~1.15.1"
+  },
   "licenses": [
     {
       "type": "MIT",
diff --git a/tests/conf/Comparatorsjs.json b/tests/conf/Comparatorsjs.json
@@ -0,0 +1,9 @@
+{
+  "username": "BROWSERSTACK_USERNAME",
+  "key": "BROWSERSTACK_KEY",
+  "test_path": "comparators.spec-runner.html",
+  "test_framework": "jasmine2",
+  "debug": true,
+  "browsers": [
+  ]
+}
diff --git a/tests/conf/Modernizr.json b/tests/conf/Modernizr.json
@@ -0,0 +1,8 @@
+{
+  "username": "BROWSERSTACK_USERNAME",
+  "key": "BROWSERSTACK_KEY",
+  "test_path": "test/index.html",
+  "debug": true,
+  "browsers": [
+  ]
+}
diff --git a/tests/conf/mout.json b/tests/conf/mout.json
@@ -0,0 +1,9 @@
+{
+  "username": "BROWSERSTACK_USERNAME",
+  "key": "BROWSERSTACK_KEY",
+  "test_path": "tests/runner.html",
+  "test_framework": "jasmine",
+  "debug": true,
+  "browsers": [
+  ]
+}
diff --git a/tests/conf/underscorejs.json b/tests/conf/underscorejs.json
@@ -0,0 +1,8 @@
+{
+  "username": "BROWSERSTACK_USERNAME",
+  "key": "BROWSERSTACK_KEY",
+  "test_path": "test/index.html",
+  "debug": true,
+  "browsers": [
+  ]
+}
diff --git a/tests/conf/url.js.json b/tests/conf/url.js.json
@@ -0,0 +1,9 @@
+{
+  "username": "BROWSERSTACK_USERNAME",
+  "key": "BROWSERSTACK_KEY",
+  "test_path": "test.html",
+  "test_framework": "mocha",
+  "debug": true,
+  "browsers": [
+  ]
+}
diff --git a/tests/external-repos/Comparatorsjs b/tests/external-repos/Comparatorsjs
@@ -0,0 +1 @@
+Subproject commit 45e37987467702ec01d63a90cc53bcf4aab3f65a
diff --git a/tests/external-repos/Modernizr b/tests/external-repos/Modernizr
@@ -0,0 +1 @@
+Subproject commit f5149720b4c72d2364ce8aaa0927601d0564096b
diff --git a/tests/external-repos/mout b/tests/external-repos/mout
@@ -0,0 +1 @@
+Subproject commit dce89bbf013fe6acb5c111f0b6a464a9bb728e4f
diff --git a/tests/external-repos/underscorejs b/tests/external-repos/underscorejs
@@ -0,0 +1 @@
+Subproject commit cceb54a25af9a86aaf17845823caabfe8991fe14
diff --git a/tests/external-repos/url.js b/tests/external-repos/url.js
@@ -0,0 +1 @@
+Subproject commit 36dec9c6242812fe9f2823a89e78038f603861d4
diff --git a/tests/test.rb b/tests/test.rb
@@ -0,0 +1,80 @@
+require 'rubygems'
+
+RUNNER_DIR = Dir.pwd.gsub(/\/tests$/,"") + "/"
+
+def execute(cmd)
+  `#{cmd}`
+end
+
+def runBg(cmd, linestomatch, genre, test_strings)
+  pid = Process.fork {
+    counter = 0
+    matched_counter = 0
+    IO.popen(cmd) {|io|
+      io.each {|line|
+        if line.match(/Completed in /)
+          counter += 1
+          puts "[#{genre.upcase}] : " + line
+          test_strings.each do |test_string|
+            matched_counter += 1 if line.match(/#{test_string}/)
+          end
+        end
+        if counter >= linestomatch
+          if matched_counter != counter
+            puts "\n####\n#{genre.upcase} FAILED\n####\n"
+          end
+          execute("ps -ef | grep #{io.pid} | grep -v grep | awk '{print $2}' | xargs kill -9")
+        end
+      }
+    }
+  }
+  pid
+end
+
+class Test
+  def run_project(reponame, test_framework, passed_array, browser_url)
+    repo_path = "#{RUNNER_DIR}tests/external-repos/"
+    conf_path = "#{RUNNER_DIR}tests/conf/"
+
+    execute("cd #{repo_path}#{reponame} && npm install")
+    execute("cd #{repo_path}#{reponame} && cp #{conf_path}#{reponame}.json #{repo_path}#{reponame}/browserstack.json")
+    pid = runBg("cd #{repo_path}#{reponame} && ../../../bin/cli.js", 1, "#{test_framework}-#{reponame}", passed_array)
+    sleep(1)
+    execute("open http://localhost:8888/#{browser_url}")
+    Process.wait(pid)
+    sleep(1)
+    execute("cd #{repo_path}#{reponame} && git clean -f -d && git reset --hard")
+  end
+  
+  def qunit
+    run_project("underscorejs", "qunit", ["631 of 631 passed"], "test/index.html")
+    run_project("Modernizr", "qunit", ["20 of 41 passed"], "test/index.html")
+    # https://github.com/bitovi/funcunit/
+    # https://github.com/twbs/bootstrap
+  end
+
+  def mocha
+    run_project("url.js", "mocha", ["35 of 35 passed"], "test.html")    
+    # https://github.com/browserstack/microjungle
+    # https://github.com/dhimil/mocha
+    # https://github.com/auth0/auth0.js
+  end
+
+  def jasmine
+    run_project("mout", "jasmine", ["978 of 978 passed"], "tests/runner.html")
+  end
+
+  def jasmine2
+    run_project("Comparatorsjs", "jasmine2", ["6 of 6 passed"], "comparators.spec-runner.html")
+  end
+
+  def run
+    execute("cd #{RUNNER_DIR} && git submodule init && git submodule update")
+    qunit
+    mocha
+    jasmine
+    jasmine2
+  end
+end
+
+Test.new.run
diff --git a/tests/unit/utils_spec.js b/tests/unit/utils_spec.js
@@ -0,0 +1,39 @@
+var  utils = require("./../../lib/utils");
+var assert = require("assert");
+
+describe('Utilities', function(){
+  it('should titlize all strings properly', function(){
+    assert.equal("Hello", utils.titleCase("hello"));
+    assert.equal("Are You Serious?", utils.titleCase("are you serious?"));
+  });
+  
+  it('should generate 32 char uuid', function(){
+    assert.equal(5, utils.uuid().split("-").length);
+    assert.equal(32 + 4, utils.uuid().length);
+  });
+
+  it('should generate random uuid always', function(){
+    assert.notEqual(utils.uuid(), utils.uuid());
+    assert.notEqual(utils.uuid(), utils.uuid());
+  });
+  
+  it('should generate proper browser string for config', function(){
+    var chrome_mac = {os: "OS X", os_version: "Mavericks", "browser": "chrome", "browser_version": "latest"};
+    var chrome_windows = {os: "Windows", os_version: "XP", "browser": "chrome", "browser_version": "latest"};
+    // var safari_mac = {os: "OS X", os_version: "Mountain Lion", "browser": "safari", "browser_version": "6.1"};
+    var ie_windows = {os: "Windows", os_version: "7", "browser": "ie", "browser_version": "9.0"};
+    var iOS = {os: "iOS", os_version: "6.0", device: "iPhone 5"};
+    var androidConfig = {os: "android", os_version: "4.1"};
+    
+    assert.equal("OS X Mavericks, Chrome latest", utils.browserString(chrome_mac));
+    assert.equal("Windows XP, Chrome latest", utils.browserString(chrome_windows));
+    assert.equal("Windows 7, Internet Explorer 9.0", utils.browserString(ie_windows));
+    assert.equal("iOS 6.0, iPhone 5", utils.browserString(iOS));
+    assert.equal("android 4.1", utils.browserString(androidConfig));
+  });
+  
+  it('should return number of keys for this object', function(){
+    assert.equal(0, utils.objectSize({}));
+    assert.equal(1, utils.objectSize({a: 2}));
+  });
+});

Original file line number	Diff line number	Diff line change
`@@ -290,6 +290,8 @@ function runTests() {`
`290`	`290`	`});`
`291`	`291`	`});`
`292`	`292`	`});`
	`293`	`+ } else {`
	`294`	`+ launchServer();`
`293`	`295`	`}`
`294`	`296`	`}`
`295`	`297`