jasmine-rails 0.5.6 → 0.6.0

data/app/helpers/jasmine_rails/spec_runner_helper.rb

@@ -19,13 +19,25 @@ module JasmineRails
     # * jasmine-specs.js built by asset pipeline which merges application specific libraries and specs
     def jasmine_js_files
       files = Jasmine::Core.js_files
+      files << jasmine_boot_file
       if params[:console]
         files << 'jasmine-console-shims.js'
         files << 'jasmine-console-reporter.js'
       end
-      files << 'jasmine-boot.js'
       files << 'jasmine-specs.js'
       files
     end
+
+    def jasmine_boot_file
+      if jasmine2?
+        Jasmine::Core.boot_files.first
+      else
+        'jasmine-boot.js'
+      end
+    end
+
+    def jasmine2?
+      Jasmine::Core.respond_to?(:boot_files)
+    end
   end
 end

data/lib/assets/javascripts/jasmine-boot.js

@@ -1,7 +1,6 @@
 var jsApiReporter;
 (function() {
   var jasmineEnv = jasmine.getEnv();
-
   jsApiReporter = new jasmine.JsApiReporter();
   jasmineEnv.addReporter(jsApiReporter);
 
@@ -11,10 +10,6 @@ var jsApiReporter;
     return htmlReporter.specFilter(spec);
   };
 
-  if (jasmine.ConsoleReporter) {
-    jasmineEnv.addReporter(new jasmine.ConsoleReporter());
-  }
-
   function execJasmine() {
     jasmineEnv.execute();
   }

data/lib/assets/javascripts/jasmine-console-reporter.js

@@ -4,27 +4,29 @@
 
  Usage:
  // From your html file that loads jasmine:
- jasmine.getEnv().addReporter(new jasmine.ConsoleReporter());
  jasmine.getEnv().execute();
 */
 
-(function(jasmine, console) {
+(function() {
+  var ConsoleReporter,
+      root = this;
+
   if (!jasmine) {
     throw "jasmine library isn't loaded!";
   }
 
-  var ANSI = {}
+  var ANSI = {};
   ANSI.color_map = {
       "green" : 32,
       "red"   : 31
-  }
+  };
 
   ANSI.colorize_text = function(text, color) {
     var color_code = this.color_map[color];
     return "\033[" + color_code + "m" + text + "\033[0m";
-  }
+  };
 
-  var ConsoleReporter = function() {
+  ConsoleReporter = function() {
     if (!console || !console.log) { throw "console isn't present!"; }
     this.status = this.statuses.stopped;
   };
@@ -37,7 +39,7 @@
     success : "success"
   };
 
-  proto.reportRunnerStarting = function(runner) {
+  proto.reportRunnerStarting = proto.jasmineStarted = function(runner) {
     this.status = this.statuses.running;
     this.start_time = (new Date()).getTime();
     this.executed_specs = 0;
@@ -45,7 +47,7 @@
     this.log("Starting...");
   };
 
-  proto.reportRunnerResults = function(runner) {
+  proto.reportRunnerResults = proto.jasmineDone = function(runner) {
     var failed = this.executed_specs - this.passed_specs;
     var spec_str = this.executed_specs + (this.executed_specs === 1 ? " spec, " : " specs, ");
     var fail_str = failed + (failed === 1 ? " failure in " : " failures in ");
@@ -65,40 +67,51 @@
     this.log("ConsoleReporter finished");
   };
 
-
-  proto.reportSpecStarting = function(spec) {
+  proto.reportSpecStarting = proto.specStarted = function(spec) {
     this.executed_specs++;
   };
 
-  proto.reportSpecResults = function(spec) {
-    if (spec.results().skipped) {
-      return;
+  proto.reportSpecResults = proto.specDone = function(spec) {
+    if(spec.results) { //jasmine 1.x
+      var specResult = spec.results()
+      if(specResult.skipped) {
+        return;
+      } else if(specResult.passed()) {
+        this.passed_specs++;
+        return;
+      }
+    } else { //jasmine 2.x
+      if(spec.status === "passed") {
+        this.passed_specs++;
+        return;
+      } else if(spec.status !== "failed") {
+        //Skipped or Pending
+        return;
+      }
     }
-    if (spec.results().passed()) {
-      this.passed_specs++;
-      return;
-    }
-
-    var resultText = spec.suite.description + " : " + spec.description;
-    this.log(resultText, "red");
 
-    var items = spec.results().getItems()
-    for (var i = 0; i < items.length; i++) {
-      var item = items[i];
-      var output = '  ' + item.message;
-      this.log(output, "red");
+    var fullName, failedExpectations;
+    if(spec.suite) { //jasmine 1.x
+      fullName = spec.suite.description + " " + spec.description;
+      failedExpectations = spec.results().getItems().map(function(expectation){
+        console.log(JSON.stringify(expectation))
+        return "  " + expectation.message +
+               (expectation.trace && expectation.trace.stack ? "\n    " + expectation.trace.stack : "" );
+      });
+    } else { //jasmine 2.x
+      fullName = spec.fullName;
+      failedExpectations = spec.failedExpectations.map(function(expectation){
+        if(expectation.message === "undefined: undefined") {
+          return "  An unstructured exception was thrown (use `new Error(message)` for better output).";
+        } else {
+          return "  " + expectation.message + "\n" +
+                 "    " + expectation.stack;
+        }
+      });
     }
-  };
 
-  proto.reportSuiteResults = function(suite) {
-    if (suite.parentSuite) { return; }
-    var results = suite.results();
-    if (results.totalCount === 0) {
-      return;
-    }
-    var failed = results.totalCount - results.passedCount;
-    var color = (failed > 0)? "red" : "green";
-    this.log(suite.description + ": " + results.passedCount + " of " + results.totalCount + " passed.", color);
+    this.log(fullName, "red");
+    this.log(failedExpectations.join("\n\n"), "red");
   };
 
   proto.log = function(str, color) {
@@ -107,4 +120,5 @@
   };
 
   jasmine.ConsoleReporter = ConsoleReporter;
-})(jasmine, console);
+  jasmine.getEnv().addReporter(new jasmine.ConsoleReporter());
+})();

data/lib/assets/javascripts/jasmine-runner.js

@@ -47,17 +47,34 @@
   page.onInitialized = function() {
     return page.evaluate(function() {
       return window.onload = function() {
-        jsApiReporter.exitCode = 0;
+        var exitCode = 0,
+            originalReportSpecResults = jsApiReporter.reportSpecResults,
+            originalJasmineDone = jsApiReporter.reportRunnerResults || jsApiReporter.jasmineDone;
+
+        //jasmine 1.x - determine failure by overwriting #reportSpecResults
         jsApiReporter.reportSpecResults = function(spec) {
+          originalReportSpecResults.call(jsApiReporter, spec);
           if (spec.results().failedCount > 0) {
-            jsApiReporter.exitCode = 1;
+            exitCode = 1;
           }
         };
-        jsApiReporter.reportRunnerResults = function() {
+
+        jsApiReporter.reportRunnerResults = jsApiReporter.jasmineDone = function(runner) {
+          originalJasmineDone.call(jsApiReporter, runner);
+
+          //jasmine 2.x - loop over the specs stored on the reporter to find failures
+          if(jsApiReporter.specs) {
+            jsApiReporter.specs().forEach(function(spec) {
+              if(spec.status === "failed") {
+                exitCode = 1;
+              }
+            })
+          }
+
           setTimeout(function() {
             window.callPhantom({
               event: 'exit',
-              exitCode: jsApiReporter.exitCode
+              exitCode: exitCode
             });
           }, 1);
         };

data/lib/jasmine_rails/runner.rb

@@ -57,7 +57,10 @@ module JasmineRails
         JasmineRails::OfflineAssetPaths.disabled = false
         app.get path, :console => 'true', :spec => spec_filter
         JasmineRails::OfflineAssetPaths.disabled = true
-        raise "Jasmine runner at '#{path}' returned a #{app.response.status} error: #{app.response.message}" unless app.response.success?
+        unless app.response.success?
+          raise "Jasmine runner at '#{path}' returned a #{app.response.status} error: #{app.response.message} \n\n" +
+                "The most common cause is an asset compilation failure. Full HTML response: \n\n #{app.response.body}"
+        end
         app.response.body
       end
 

data/lib/jasmine_rails/version.rb

@@ -1,3 +1,3 @@
 module JasmineRails
-  VERSION = "0.5.6"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jasmine-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-11 00:00:00.000000000 Z
+date: 2014-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -50,17 +50,23 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.3'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.3'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: phantomjs
   requirement: !ruby/object:Gem::Requirement
@@ -142,7 +148,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3911435305490844820
+      hash: -2098666322319327429
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -151,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3911435305490844820
+      hash: -2098666322319327429
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23