jasmine-headless-webkit 0.7.3.2 → 0.8.0.alpha.1

data/spec/spec_helper.rb

@@ -1,11 +1,35 @@
+if ENV['COVERAGE']
+  require 'simplecov'
+  SimpleCov.start
+end
+
+if ENV['PROFILE']
+  require 'perftools'
+  PerfTools::CpuProfiler.start("/tmp/jhw-profile")
+end
+
 require 'jasmine-headless-webkit'
 require 'fakefs/spec_helpers'
 
 RSpec.configure do |c|
   c.mock_with :mocha
+  c.backtrace_clean_patterns = []
   
   c.before(:each) do
     Jasmine::Headless::CacheableAction.enabled = false
+    Jasmine::Headless::FilesList.reset!
+  end
+
+  c.before(:each, :type => :integration) do
+    let(:report) { 'spec/report.txt' }
+
+    before do
+      FileUtils.rm_f report
+    end
+
+    after do
+      FileUtils.rm_f report
+    end
   end
 end
 
@@ -17,6 +41,20 @@ if !File.file?(specrunner)
   end
 end
 
+class FakeFS::File
+  class << self
+    def fnmatch?(pattern, file)
+      RealFile.fnmatch?(pattern, file)
+    end
+  end
+
+  class Stat
+    def file?
+      File.file?(@file)
+    end
+  end
+end
+
 module RSpec::Matchers
   define :be_a_report_containing do |total, failed, used_console|
     match do |filename|
@@ -51,4 +89,25 @@ module RSpec::Matchers
       File.file?(file)
     end
   end
+
+  define :contain_in_order_in_file_list do |*files|
+    match do |lines|
+      file_list = files.dup
+
+      lines.each do |line|
+        next if !file_list.first
+
+        if line[file_list.first]
+          file_list.shift
+        end
+      end
+
+      file_list.length == 0
+    end
+
+    failure_message_for_should do |lines|
+      %{expected\n#{lines.join("\n")}\nto contain the following files, in order:\n#{files.join("\n")}}
+    end
+  end
 end
+

data/vendor/assets/coffeescripts/headless_reporter_result.coffee

@@ -6,20 +6,21 @@ class window.HeadlessReporterResult
   addResult: (message) ->
     @results.push(message)
 
-  print: ->
-    output = @name.foreground('red')
+  toString: ->
+    output = "\n" + @name.foreground('red')
     bestChoice = HeadlessReporterResult.findSpecLine(@splitName)
     output += " (#{bestChoice.file}:#{bestChoice.lineNumber})".foreground('blue') if bestChoice.file
 
-    JHW.stdout.puts "\n\n#{output}"
     for result in @results
-      output = result.message.foreground('red')
+      line = result.message.foreground('red')
       if result.lineNumber
-        output += " (line ~#{bestChoice.lineNumber + result.lineNumber})".foreground('red').bright()
-      JHW.stdout.puts("  " + output)
+        line += " (line ~#{bestChoice.lineNumber + result.lineNumber})".foreground('red').bright()
+      output += "\n  #{line}"
 
       if result.line?
-        JHW.stdout.puts("    #{result.line}".foreground('yellow'))
+        output += "\n    #{result.line}".foreground('yellow')
+
+    output
 
   @findSpecLine: (splitName) ->
     bestChoice = { accuracy: 0, file: null, lineNumber: null }
@@ -43,4 +44,6 @@ class window.HeadlessReporterResult
       if index > bestChoice.accuracy
         bestChoice = { accuracy: index, file: file, lineNumber: lineNumber }
 
+      break if index == splitName.length
+
     bestChoice

data/vendor/assets/coffeescripts/intense.coffee

@@ -20,6 +20,7 @@ window.Intense = {
       else
         this
   useColors: true
+  moveBack: (count = 1) -> "\033[#{count}D"
 }
 
 for method, code of Intense.methods

data/vendor/assets/coffeescripts/jasmine-extensions.coffee

@@ -73,7 +73,10 @@ if window.JHW
 
     pauseAndRun = (onComplete) ->
       JHW.timerPause()
+      jasmine.getEnv().reporter.reportSpecWaiting()
+
       this._execute ->
+        jasmine.getEnv().reporter.reportSpecRunning()
         JHW.timerDone()
         onComplete()
 
@@ -88,3 +91,13 @@ if window.JHW
       result.expectations = jasmine.NestedResults.parseAndStore(arguments.callee.caller.caller.caller.toString())
 
       this.addResult_(result)
+
+    for method in [ "reportSpecWaiting", "reportSpecRunning" ]
+      generator = (method) ->
+        (args...) ->
+          for reporter in @subReporters_
+            if reporter[method]?
+              reporter[method](args...)
+
+      jasmine.MultiReporter.prototype[method] = generator(method)
+

data/vendor/assets/coffeescripts/jasmine.HeadlessConsoleReporter.coffee

@@ -6,6 +6,9 @@ class jasmine.HeadlessConsoleReporter
     @results = []
     @failedCount = 0
     @length = 0
+    @timer = null
+    @position = 0
+    @positions = "|/-\\"
 
   reportRunnerResults: (runner) ->
     return if this.hasError()
@@ -25,7 +28,9 @@ class jasmine.HeadlessConsoleReporter
     output = "TOTAL||#{@length}||#{@failedCount}||#{runtime}||#{if JHW._hasErrors then "T" else "F"}"
 
     JHW.report.puts(output)
-    result.print() for result in @results
+
+    for result in @results
+      JHW.stdout.puts(result.toString())
 
     if window.JHW
       window.onbeforeunload = null
@@ -34,7 +39,7 @@ class jasmine.HeadlessConsoleReporter
 
   reportRunnerStarting: (runner) ->
     @startTime = new Date()
-    JHW.stdout.puts("\nRunning Jasmine specs...".bright())
+    JHW.stdout.puts("\nRunning Jasmine specs...".bright()) if !this.hasError()
 
   reportSpecResults: (spec) ->
     return if this.hasError()
@@ -67,6 +72,33 @@ class jasmine.HeadlessConsoleReporter
       spec.finish()
       spec.suite.finish()
 
+  reportSpecWaiting: ->
+    runner = null
+
+    if !@timer
+      @timer = true
+      first = true
+
+      runner = =>
+        @timer = setTimeout(
+          =>
+            if @timer
+              JHW.stdout.print(Intense.moveBack()) if !first
+              JHW.stdout.print(@positions.substr(@position, 1).foreground('yellow'))
+              @position += 1
+              @position %= @positions.length
+              first = false
+              runner()
+          , 750
+        )
+      runner()
+
+  reportSpecRunning: ->
+    if @timer
+      clearTimeout(@timer)
+      @timer = null
+      JHW.stdout.print(Intense.moveBack())
+
   reportSuiteResults: (suite) ->
   hasError: ->
     JHW._hasErrors

data/vendor/assets/coffeescripts/prolog.coffee

@@ -2,7 +2,7 @@ if window.JHW
   window.console =
     log: (data) ->
       if typeof(jQuery) != 'undefined' && data instanceof jQuery
-        JHW.log(style_html($("<div />").append(data).html(), { indent_size: 2 }))
+        JHW.log(style_html($("<div />").append(data.clone()).html(), { indent_size: 2 }))
       else
         useJsDump = true
 

data/vendor/assets/javascripts/headless_reporter_result.js

@@ -1,34 +1,38 @@
-(function() {
+
   window.HeadlessReporterResult = (function() {
+
     function HeadlessReporterResult(name, splitName) {
       this.name = name;
       this.splitName = splitName;
       this.results = [];
     }
+
     HeadlessReporterResult.prototype.addResult = function(message) {
       return this.results.push(message);
     };
-    HeadlessReporterResult.prototype.print = function() {
-      var bestChoice, output, result, _i, _len, _ref, _results;
-      output = this.name.foreground('red');
+
+    HeadlessReporterResult.prototype.toString = function() {
+      var bestChoice, line, output, result, _i, _len, _ref;
+      output = "\n" + this.name.foreground('red');
       bestChoice = HeadlessReporterResult.findSpecLine(this.splitName);
       if (bestChoice.file) {
         output += (" (" + bestChoice.file + ":" + bestChoice.lineNumber + ")").foreground('blue');
       }
-      JHW.stdout.puts("\n\n" + output);
       _ref = this.results;
-      _results = [];
       for (_i = 0, _len = _ref.length; _i < _len; _i++) {
         result = _ref[_i];
-        output = result.message.foreground('red');
+        line = result.message.foreground('red');
         if (result.lineNumber) {
-          output += (" (line ~" + (bestChoice.lineNumber + result.lineNumber) + ")").foreground('red').bright();
+          line += (" (line ~" + (bestChoice.lineNumber + result.lineNumber) + ")").foreground('red').bright();
+        }
+        output += "\n  " + line;
+        if (result.line != null) {
+          output += ("\n    " + result.line).foreground('yellow');
         }
-        JHW.stdout.puts("  " + output);
-        _results.push(result.line != null ? JHW.stdout.puts(("    " + result.line).foreground('yellow')) : void 0);
       }
-      return _results;
+      return output;
     };
+
     HeadlessReporterResult.findSpecLine = function(splitName) {
       var bestChoice, file, index, lastLine, line, lineNumber, lines, newLineNumberInfo, _i, _len, _ref;
       bestChoice = {
@@ -49,9 +53,7 @@
             for (_i = 0, _len = newLineNumberInfo.length; _i < _len; _i++) {
               line = newLineNumberInfo[_i];
               lastLine = line;
-              if (line > lineNumber) {
-                break;
-              }
+              if (line > lineNumber) break;
             }
             lineNumber = lastLine;
           }
@@ -64,9 +66,11 @@
             lineNumber: lineNumber
           };
         }
+        if (index === splitName.length) break;
       }
       return bestChoice;
     };
+
     return HeadlessReporterResult;
+
   })();
-}).call(this);

data/vendor/assets/javascripts/intense.js

@@ -1,5 +1,6 @@
 (function() {
   var code, method, _ref;
+
   window.Intense = {
     colors: {
       black: 0,
@@ -27,11 +28,17 @@
         }
       }
     },
-    useColors: true
+    useColors: true,
+    moveBack: function(count) {
+      if (count == null) count = 1;
+      return "\033[" + count + "D";
+    }
   };
+
   _ref = Intense.methods;
   for (method in _ref) {
     code = _ref[method];
     String.prototype[method] = code;
   }
+
 }).call(this);

data/vendor/assets/javascripts/jasmine-extensions.js

@@ -1,8 +1,11 @@
 (function() {
-  var getSplitName, pauseAndRun;
+  var generator, getSplitName, method, pauseAndRun, _i, _len, _ref;
+  var __slice = Array.prototype.slice;
+
   if (!(typeof jasmine !== "undefined" && jasmine !== null)) {
     throw new Error("jasmine not laoded!");
   }
+
   if (window.JHW) {
     getSplitName = function(parts) {
       parts.push(String(this.description).replace(/[\n\r]/g, ' '));
@@ -83,7 +86,9 @@
       jasmine.WaitsForBlock.prototype._execute = jasmine.WaitsForBlock.prototype.execute;
       pauseAndRun = function(onComplete) {
         JHW.timerPause();
+        jasmine.getEnv().reporter.reportSpecWaiting();
         return this._execute(function() {
+          jasmine.getEnv().reporter.reportSpecRunning();
           JHW.timerDone();
           return onComplete();
         });
@@ -96,6 +101,29 @@
         result.expectations = jasmine.NestedResults.parseAndStore(arguments.callee.caller.caller.caller.toString());
         return this.addResult_(result);
       };
+      _ref = ["reportSpecWaiting", "reportSpecRunning"];
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        method = _ref[_i];
+        generator = function(method) {
+          return function() {
+            var args, reporter, _j, _len2, _ref2, _results;
+            args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
+            _ref2 = this.subReporters_;
+            _results = [];
+            for (_j = 0, _len2 = _ref2.length; _j < _len2; _j++) {
+              reporter = _ref2[_j];
+              if (reporter[method] != null) {
+                _results.push(reporter[method].apply(reporter, args));
+              } else {
+                _results.push(void 0);
+              }
+            }
+            return _results;
+          };
+        };
+        jasmine.MultiReporter.prototype[method] = generator(method);
+      }
     }
   }
+
 }).call(this);

data/vendor/assets/javascripts/jasmine.HeadlessConsoleReporter.js

@@ -1,19 +1,23 @@
-(function() {
+
   if (!(typeof jasmine !== "undefined" && jasmine !== null)) {
     throw new Error("jasmine not loaded!");
   }
+
   jasmine.HeadlessConsoleReporter = (function() {
+
     function HeadlessConsoleReporter(callback) {
       this.callback = callback != null ? callback : null;
       this.results = [];
       this.failedCount = 0;
       this.length = 0;
+      this.timer = null;
+      this.position = 0;
+      this.positions = "|/-\\";
     }
+
     HeadlessConsoleReporter.prototype.reportRunnerResults = function(runner) {
       var output, result, resultLine, runtime, _i, _len, _ref;
-      if (this.hasError()) {
-        return;
-      }
+      if (this.hasError()) return;
       runtime = (new Date() - this.startTime) / 1000.0;
       JHW.stdout.print("\n");
       resultLine = this._formatResultLine(runtime);
@@ -28,22 +32,22 @@
       _ref = this.results;
       for (_i = 0, _len = _ref.length; _i < _len; _i++) {
         result = _ref[_i];
-        result.print();
-      }
-      if (window.JHW) {
-        window.onbeforeunload = null;
+        JHW.stdout.puts(result.toString());
       }
+      if (window.JHW) window.onbeforeunload = null;
       return JHW.finishSuite();
     };
+
     HeadlessConsoleReporter.prototype.reportRunnerStarting = function(runner) {
       this.startTime = new Date();
-      return JHW.stdout.puts("\nRunning Jasmine specs...".bright());
+      if (!this.hasError()) {
+        return JHW.stdout.puts("\nRunning Jasmine specs...".bright());
+      }
     };
+
     HeadlessConsoleReporter.prototype.reportSpecResults = function(spec) {
       var failureResult, foundLine, result, results, testCount, _i, _len, _ref;
-      if (this.hasError()) {
-        return;
-      }
+      if (this.hasError()) return;
       JHW.ping();
       results = spec.results();
       this.length++;
@@ -70,16 +74,51 @@
         return this.results.push(failureResult);
       }
     };
+
     HeadlessConsoleReporter.prototype.reportSpecStarting = function(spec) {
       if (this.hasError()) {
         spec.finish();
         return spec.suite.finish();
       }
     };
+
+    HeadlessConsoleReporter.prototype.reportSpecWaiting = function() {
+      var first, runner;
+      var _this = this;
+      runner = null;
+      if (!this.timer) {
+        this.timer = true;
+        first = true;
+        runner = function() {
+          return _this.timer = setTimeout(function() {
+            if (_this.timer) {
+              if (!first) JHW.stdout.print(Intense.moveBack());
+              JHW.stdout.print(_this.positions.substr(_this.position, 1).foreground('yellow'));
+              _this.position += 1;
+              _this.position %= _this.positions.length;
+              first = false;
+              return runner();
+            }
+          }, 750);
+        };
+        return runner();
+      }
+    };
+
+    HeadlessConsoleReporter.prototype.reportSpecRunning = function() {
+      if (this.timer) {
+        clearTimeout(this.timer);
+        this.timer = null;
+        return JHW.stdout.print(Intense.moveBack());
+      }
+    };
+
     HeadlessConsoleReporter.prototype.reportSuiteResults = function(suite) {};
+
     HeadlessConsoleReporter.prototype.hasError = function() {
       return JHW._hasErrors;
     };
+
     HeadlessConsoleReporter.prototype._formatResultLine = function(runtime) {
       var line;
       line = [];
@@ -91,6 +130,7 @@
       line.push((runtime === 1.0 ? "sec" : "secs") + '.');
       return line.join(' ');
     };
+
     return HeadlessConsoleReporter;
+
   })();
-}).call(this);

data/vendor/assets/javascripts/prolog.js

@@ -1,11 +1,12 @@
 (function() {
   var createHandle, handle, _i, _len, _ref;
+
   if (window.JHW) {
     window.console = {
       log: function(data) {
         var dump, useJsDump;
         if (typeof jQuery !== 'undefined' && data instanceof jQuery) {
-          return JHW.log(style_html($("<div />").append(data).html(), {
+          return JHW.log(style_html($("<div />").append(data.clone()).html(), {
             indent_size: 2
           }));
         } else {
@@ -40,9 +41,7 @@
       e = e || window.event;
       JHW.hasError();
       JHW.stdout.puts('The code tried to leave the test page. Check for unhandled form submits and link clicks.');
-      if (e) {
-        e.returnValue = 'string';
-      }
+      if (e) e.returnValue = 'string';
       return 'string';
     };
     window.confirm = function(message) {
@@ -84,6 +83,9 @@
       return JHW.stdout.puts(msg);
     };
   }
+
   window.CoffeeScriptToFilename = {};
+
   window.CSTF = window.CoffeeScriptToFilename;
+
 }).call(this);