jasmine-headless-webkit 0.7.3.1 → 0.7.3.2

data/ext/jasmine-webkit-specrunner/common.pri

@@ -4,6 +4,6 @@ QMAKE_INFO_PLIST = Info.plist
 QMAKESPEC = macx-g++
 QT += network webkit
 
-SOURCES = Page.cpp Runner.cpp ConsoleOutput.cpp ReportFileOutput.cpp
-HEADERS = Page.h Runner.h ConsoleOutput.h ReportFileOutput.h
+SOURCES = Page.cpp Runner.cpp
+HEADERS = Page.h Runner.h
 

data/ext/jasmine-webkit-specrunner/specrunner.cpp

@@ -21,7 +21,6 @@
    THE SOFTWARE.
    */
 
-#include "Page.h"
 #include "Runner.h"
 
 #if QT_VERSION < QT_VERSION_CHECK(4, 7, 0)

data/ext/jasmine-webkit-specrunner/specrunner.pro

@@ -2,3 +2,4 @@ include(common.pri)
 
 SOURCES += specrunner.cpp
 TARGET = jasmine-webkit-specrunner
+

data/lib/jasmine/files_list.rb

@@ -6,14 +6,30 @@ module Jasmine
   class FilesList
     attr_reader :files, :spec_files, :filtered_files, :spec_outside_scope
 
+    class << self
+      def find_vendored_asset_paths(*names)
+        require 'rubygems'
+
+        raise StandardError.new("A newer version of Rubygems is required to use vendored assets. Please upgrade.") if !Gem::Specification.respond_to?(:map)
+        all_spec_files.find_all do |file|
+          names.any? { |name| file["/#{name}.js"] }
+        end
+      end
+
+      def all_spec_files
+        @all_spec_files ||= Gem::Specification.map { |spec| spec.files.find_all { |file|
+          file["vendor/assets/javascripts"]
+        }.compact.collect { |file| File.join(spec.gem_dir, file) } }.flatten
+      end
+    end
+
     DEFAULT_FILES = [
       File.join(Jasmine::Core.path, "jasmine.js"),
       File.join(Jasmine::Core.path, "jasmine-html.js"),
-      File.join(Jasmine::Core.path, "jasmine.css"),
-      Jasmine::Headless.root.join('jasmine/jasmine.headless-reporter.js').to_s,
-      Jasmine::Headless.root.join('js-lib/jsDump.js').to_s,
-      Jasmine::Headless.root.join('js-lib/beautify-html.js').to_s
-    ]
+      File.join(Jasmine::Core.path, "jasmine.css")
+    ] + %w{jasmine-extensions intense headless_reporter_result jasmine.HeadlessConsoleReporter jsDump beautify-html}.collect { |name|
+      Jasmine::Headless.root.join("vendor/assets/javascripts/#{name}.js").to_s
+    }
 
     PLEASE_WAIT_IM_WORKING_TIME = 2
 
@@ -72,13 +88,10 @@ module Jasmine
             cache = Jasmine::Headless::CoffeeScriptCache.new(file)
             source = cache.handle
             if cache.cached?
-              %{
-                <script type="text/javascript" src="#{cache.cache_file}"></script>S
+              %{<script type="text/javascript" src="#{cache.cache_file}"></script>
                 <script type="text/javascript">
-                  window.CoffeeScriptToFilename = window.CoffeeScriptToFilename || {};
-                  window.CoffeeScriptToFilename['#{File.split(cache.cache_file).last}'] = '#{file}';
-                </script>
-              }
+                  window.CSTF['#{File.split(cache.cache_file).last}'] = '#{file}';
+                </script>}
             else
               %{<script type="text/javascript">#{source}</script>}
             end
@@ -158,19 +171,6 @@ module Jasmine
     def expanded_dir(path)
       Dir[path].collect { |file| File.expand_path(file) }
     end
-
-    def self.find_vendored_asset_path(name)
-      require 'rubygems'
-
-      raise StandardError.new("A newer version of Rubygems is required to use vendored assets. Please upgrade.") if !Gem::Specification.respond_to?(:map)
-      all_spec_files.find_all { |file| file["vendor/assets/javascripts/#{name}.js"] }
-    end
-
-    def self.all_spec_files
-      @all_spec_files ||= Gem::Specification.map { |spec| spec.files.find_all { |file|
-        file["vendor/assets/javascripts"]
-      }.compact.collect { |file| File.join(spec.gem_dir, file) } }.flatten
-    end
   end
 end
 

data/lib/jasmine/headless.rb

@@ -16,7 +16,7 @@ module Jasmine::Headless
 
   class << self
     def root
-      @root ||= Pathname.new(File.expand_path('../../..', __FILE__))
+      @root ||= Pathname(File.expand_path('../../..', __FILE__))
     end
   end
 end

data/lib/jasmine/headless/spec_file_analyzer.rb

@@ -14,7 +14,7 @@ module Jasmine::Headless
       data = File.read(file)
 
       if data.respond_to?(:encode)
-        data.encode!('US-ASCII', 'UTF-8', :invalid => :replace)
+        data.encode!('US-ASCII', 'UTF-8', :invalid => :replace, :undef => :replace)
       else
         require 'iconv'
         ic = Iconv.new('UTF-8//IGNORE', 'US-ASCII')

data/lib/jasmine/headless/version.rb

@@ -1,5 +1,5 @@
 module Jasmine
   module Headless
-    VERSION = "0.7.3.1"
+    VERSION = "0.7.3.2"
   end
 end

data/lib/qt/qmake.rb

@@ -39,11 +39,7 @@ module Qt
 
         system command(project_file)
 
-        system %{make #{make_options}}
-      end
-
-      def make_options
-        ""
+        system %{make}
       end
 
       #

data/skel/template.html.erb

@@ -3,47 +3,7 @@
   <head>
     <meta content="text/html;charset=UTF-8" http-equiv="Content-Type"/>
     <title>Jasmine Test Runner - Generated by jasmine-headless-webkit</title>
-    <script type="text/javascript">
-      if (window.JHW) {
-        window.console = { log: function(data) { 
-          if (typeof(jQuery) !== 'undefined' && data instanceof jQuery) {
-            JHW.log(style_html($("<div />").append(data).html(), { indent_size: 2 }));
-          } else {
-            var usejsDump = true;
-            try {
-              if (typeof data.toJSON == 'function') {
-                JHW.log("JSON: " + JSON.stringify(data, null, 2));
-                usejsDump = false;
-              }
-            } catch (e) {}
-
-            if (usejsDump) {
-              var dump = jsDump.doParse(data);
-              if (dump.indexOf("\\n") == -1) {
-                JHW.log(dump);
-              } else {
-                JHW.log("jsDump: " + dump);
-              }
-            }
-          }
-        }, pp: function(data) {
-          JHW.log(jasmine ? jasmine.pp(data) : JSON.stringify(data));
-        }, peek: function(data) {
-          console.log(data);
-          return data;
-        } };
-
-        window.onbeforeunload = function(e) {
-          JHW.leavePageAttempt('The code tried to leave the test page. Check for unhandled form submits and link clicks.');
-
-          if (e = e || window.event) {
-            e.returnValue = "leaving";
-          }
-
-          return "leaving";
-        };
-      }
-    </script>
+    <script type="text/javascript" src="<%= Jasmine::Headless.root.join('vendor/assets/javascripts/prolog.js') %>"></script>
     <%= files.join("\n") %>
     <script type="text/javascript">
       if (window.JHW) { HeadlessReporterResult.specLineNumbers = <%= MultiJson.encode(spec_lines) %>; }
@@ -51,18 +11,21 @@
   </head>
   <body>
     <script type="text/javascript">
+      jasmine.getEnv().console = {
+        log: function(msg) { JHW.stdout.puts(msg) }
+      }
+
       window._onload = window.onload
 
       window.onload = function() {
         if (window._onload) { window._onload() }
+
         if (window.JHW) {
-          jasmine.getEnv().addReporter(new jasmine.HeadlessReporter(function() {
-            window.onbeforeunload = null;
-          }));
+          jasmine.getEnv().addReporter(new jasmine.HeadlessConsoleReporter());
         } else {
           jasmine.getEnv().addReporter(new jasmine.HtmlReporter());
         }
-        
+
         jasmine.getEnv().execute();
       }
     </script>

data/spec/javascripts/headless_reporter_result_spec.coffee

@@ -0,0 +1,14 @@
+describe 'HeadlessReporterResult', ->
+  result = null
+  name = "name"
+  splitName = "splitName"
+  message = 'message'
+
+  beforeEach ->
+    result = new HeadlessReporterResult(name, splitName)
+
+  describe '#addResult', ->
+    it 'should add a message', ->
+      result.addResult(message)
+
+      expect(result.results).toEqual([ message ])

data/spec/javascripts/{jasmine.headless-reporter_spec.coffee → jasmine.HeadlessConsoleReporter_spec.coffee}

@@ -12,11 +12,11 @@ describe 'HeadlessReporterResult', ->
     expect(HeadlessReporterResult.findSpecLine([ 'name', 'of', 'test' ]).lineNumber).toEqual(3)
     expect(HeadlessReporterResult.findSpecLine([ 'other', 'of', 'test' ]).lineNumber).toEqual(10)
 
-describe 'jasmine.HeadlessReporter', ->
+describe 'jasmine.HeadlessConsoleReporter', ->
   reporter = null
 
   beforeEach ->
-    reporter = new jasmine.HeadlessReporter()
+    reporter = new jasmine.HeadlessConsoleReporter()
 
   it 'should stop running specs if there are errors reported', ->
     # otherwise it gets really confusing!

data/spec/javascripts/support/jasmine.yml

@@ -1,4 +1,4 @@
-src_files: [ 'jasmine/*.coffee' ]
+src_files: [ 'vendor/assets/coffeescripts/*.coffee' ]
 spec_files: [ 'spec/javascripts/*_spec.coffee' ]
 src_dir: .
 spec_dir: .

data/spec/lib/jasmine/files_list_spec.rb

@@ -14,9 +14,12 @@ describe Jasmine::FilesList do
         File.join(Jasmine::Core.path, "jasmine.js"),
         File.join(Jasmine::Core.path, "jasmine-html.js"),
         File.join(Jasmine::Core.path, "jasmine.css"),
-        File.expand_path('jasmine/jasmine.headless-reporter.js'),
-        File.expand_path('js-lib/jsDump.js'),
-        File.expand_path('js-lib/beautify-html.js'),
+        File.expand_path('vendor/assets/javascripts/jasmine-extensions.js'),
+        File.expand_path('vendor/assets/javascripts/intense.js'),
+        File.expand_path('vendor/assets/javascripts/headless_reporter_result.js'),
+        File.expand_path('vendor/assets/javascripts/jasmine.HeadlessConsoleReporter.js'),
+        File.expand_path('vendor/assets/javascripts/jsDump.js'),
+        File.expand_path('vendor/assets/javascripts/beautify-html.js'),
       ]
     end
   end

data/spec/lib/jasmine/headless/spec_file_analyzer_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Jasmine::Headless::SpecFileAnalyzer do
-  include FakeFS::SpecHelpers
 
   let(:file) { 'file' }
   let(:analyzer) { described_class.new(file) }
@@ -11,45 +10,57 @@ describe Jasmine::Headless::SpecFileAnalyzer do
       analyzer.action
     end
 
-    before do
-      File.open(file, 'wb') { |fh| fh.print file_data }
-    end
+    context 'fake files' do
+      include FakeFS::SpecHelpers
 
-    context 'coffeescript' do
-      let(:file_data) do
-        <<-SPEC
-describe 'test', ->
-  context 'yes', ->
-    it 'should do something', ->
-      "yes"
-      "PR.registerLangHandler(PR.createSimpleLexer([[\"com\",/^#[^\\n\\r]*/,null,\"#\"],[\"pln\",/^[\\t\\n\\r \\xa0]+/,null,\"\\t\\n\\r \xC2\\xa0\"],[\"str\",/^\"(?:[^\"\\\\]|\\\\[\\S\\s])*(?:\"|$)/,null,'\"']],[[\"kwd\",/^(?:ADS|AD|AUG|BZF|BZMF|CAE|CAF|CA|CCS|COM|CS|DAS|DCA|DCOM|DCS|DDOUBL|DIM|DOUBLE|DTCB|DTCF|DV|DXCH|EDRUPT|EXTEND|INCR|INDEX|NDX|INHINT|LXCH|MASK|MSK|MP|MSU|NOOP|OVSK|QXCH|RAND|READ|RELINT|RESUME|RETURN|ROR|RXOR|SQUARE|SU|TCR|TCAA|OVSK|TCF|TC|TS|WAND|WOR|WRITE|XCH|XLQ|XXALQ|ZL|ZQ|ADD|ADZ|SUB|SUZ|MPY|MPR|MPZ|DVP|COM|ABS|CLA|CLZ|LDQ|STO|STQ|ALS|LLS|LRS|TRA|TSQ|TMI|TOV|AXT|TIX|DLY|INP|OUT)\\s/,\n"
-SPEC
+      before do
+        File.open(file, 'wb') { |fh| fh.print file_data }
       end
 
-      it 'should get the line numbers' do
-        line_numbers['test'].should == [ 1 ]
-        line_numbers['yes'].should == [ 2 ]
-        line_numbers['should do something'].should == [ 3 ]
+      context 'coffeescript' do
+        let(:file_data) do
+          <<-SPEC
+  describe 'test', ->
+    context 'yes', ->
+      it 'should do something', ->
+        "yes"
+  SPEC
+        end
+
+        it 'should get the line numbers' do
+          line_numbers['test'].should == [ 1 ]
+          line_numbers['yes'].should == [ 2 ]
+          line_numbers['should do something'].should == [ 3 ]
+        end
       end
-    end
 
-    context 'javascript' do
-      let(:file_data) do
-        <<-SPEC
-describe('test', function() {
-  context('yes', function() {
-    it('should do something', function() {
+      context 'javascript' do
+        let(:file_data) do
+          <<-SPEC
+  describe('test', function() {
+    context('yes', function() {
+      it('should do something', function() {
 
+      });
     });
   });
-});
-SPEC
+  SPEC
+        end
+
+        it 'should get the line numbers' do
+          line_numbers['test'].should == [ 1 ]
+          line_numbers['yes'].should == [ 2 ]
+          line_numbers['should do something'].should == [ 3 ]
+        end
       end
+    end
+
+    context 'utf 8' do
+      let(:analyzer) { described_class.new('spec/files/UTF-8-test.txt') }
+      let(:file_data) { '' }
 
-      it 'should get the line numbers' do
-        line_numbers['test'].should == [ 1 ]
-        line_numbers['yes'].should == [ 2 ]
-        line_numbers['should do something'].should == [ 3 ]
+      it 'should not explode' do
+        line_numbers
       end
     end
   end

data/spec/lib/qt/qmake_spec.rb

@@ -138,11 +138,5 @@ describe Qt::Qmake do
       end
     end
   end
-
-  describe '.make_options' do
-    subject { Qt::Qmake.make_options }
-
-    it { should == "" }
-  end
 end
 

data/vendor/assets/coffeescripts/headless_reporter_result.coffee

@@ -0,0 +1,46 @@
+# Try to get the line number of a failed spec
+class window.HeadlessReporterResult
+  constructor: (@name, @splitName) ->
+    @results = []
+
+  addResult: (message) ->
+    @results.push(message)
+
+  print: ->
+    output = @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')
+      if result.lineNumber
+        output += " (line ~#{bestChoice.lineNumber + result.lineNumber})".foreground('red').bright()
+      JHW.stdout.puts("  " + output)
+
+      if result.line?
+        JHW.stdout.puts("    #{result.line}".foreground('yellow'))
+
+  @findSpecLine: (splitName) ->
+    bestChoice = { accuracy: 0, file: null, lineNumber: null }
+
+    for file, lines of HeadlessReporterResult.specLineNumbers
+      index = 0
+      lineNumber = 0
+      while newLineNumberInfo = lines[splitName[index]]
+        if newLineNumberInfo.length == 0
+          lineNumber = newLineNumberInfo[0]
+        else
+          lastLine = null
+          for line in newLineNumberInfo
+            lastLine = line
+            break if line > lineNumber
+
+          lineNumber = lastLine
+
+        index++
+
+      if index > bestChoice.accuracy
+        bestChoice = { accuracy: index, file: file, lineNumber: lineNumber }
+
+    bestChoice

data/vendor/assets/coffeescripts/intense.coffee

@@ -0,0 +1,27 @@
+window.Intense = {
+  colors:
+    black: 0
+    red: 1
+    green: 2
+    yellow: 3
+    blue: 4
+    magenta: 5
+    cyan: 6
+    white: 7
+  methods:
+    foreground: (color) ->
+      if Intense.useColors
+        "\033[3#{Intense.colors[color]}m#{this}\033[0m"
+      else
+        this
+    bright: ->
+      if Intense.useColors
+        "\033[1m#{this}\033[0m"
+      else
+        this
+  useColors: true
+}
+
+for method, code of Intense.methods
+  String.prototype[method] = code
+