Merge pull request #78 from browserstack/jasmine2.0

Jasmine2.0

Author: nakula

.gitmodules

@@ -10,3 +10,6 @@
 [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

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",

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);
+})();
+

lib/server.js

@@ -79,6 +79,7 @@ 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']
         };
 
@@ -103,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";

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": [
+  ]
+}

tests/external-repos/Comparatorsjs

@@ -64,11 +64,16 @@ 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