jasmine-headless-webkit 0.7.1 → 0.7.2

data/.gitignore

@@ -13,3 +13,4 @@ hydra-runner.log
 jhw-test
 .jhw-cache/
 _site/
+jhw.*.html

data/CHANGELOG.md

@@ -1,3 +1,30 @@
+## 0.7.2
+
+* Improved finding of CoffeeScript spec line locations
+* Improved Runner reporting of which expectations failed
+* Initial vendored helper support, paving the way for Sprockets integratioon (maybe!)
+* Add 1.9.3-rc1 test support and fixes
+* Add console.peek()
+
+## 0.7.1
+
+* Bugfix for missing digest/sha1 import
+
+## 0.7.0
+
+* Major C++ cleanup, now much more modular
+* Greatly improved object inspection and printing provided by jsDump and beautify-js
+
+## 0.6.3
+
+* Ensure Rubygems is available before doing version comparison
+* Fix other build problems
+* Better output for jQuery nodes
+
+## 0.6.2
+
+* Clean up C++ and test running
+
 ## 0.6.1
 
 * Ensure YAML is loaded before use

data/Rakefile

@@ -14,12 +14,23 @@ require 'jasmine/headless/task'
 
 Jasmine::Headless::Task.new
 
+PLATFORMS = %w{1.8.7 1.9.2 ree 1.9.3-rc1}
+
+def rvm_bundle(command = '')
+  Bundler.with_clean_env do
+    system %{bash -c 'unset BUNDLE_BIN_PATH && unset BUNDLE_GEMFILE && rvm #{PLATFORMS.join(',')} do bundle #{command}'}
+  end
+end
+
+class SpecFailure < StandardError; end
+class BundleFailure < StandardError; end
+
 namespace :spec do
   desc "Run on three Rubies"
   task :platforms do
-    system %{rvm 1.8.7,1.9.2,ree ruby bundle}
-    system %{rvm 1.8.7,1.9.2,ree ruby bundle exec rake spec}
-    raise StandardError.new if $?.exitstatus != 0
+    rvm_bundle
+    rvm_bundle "exec rspec spec"
+    raise SpecError.new if $?.exitstatus != 0
   end
 end
 
@@ -31,3 +42,4 @@ task :build_runner do
     system %{ruby extconf.rb}
   end
 end
+

data/bin/jasmine-headless-webkit

@@ -10,19 +10,12 @@ end
 $:.unshift(File.join(gem_dir, 'lib'))
 require 'jasmine-headless-webkit'
 
-require 'jasmine/headless/errors'
-require 'jasmine/headless/runner'
-require 'jasmine/headless/options'
-
 begin
   options = Jasmine::Headless::Options.from_command_line
   runner = Jasmine::Headless::Runner.new(options)
 
   if options[:do_list]
-    files_list = Jasmine::FilesList.new(
-      :config => runner.jasmine_config
-    )
-
+    files_list = Jasmine::FilesList.new(:config => runner.jasmine_config)
     files_list.files.each { |file| puts file }
   else
     puts "Running Jasmine specs...".color(:white)

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

@@ -82,8 +82,17 @@ void ConsoleOutput::logSpecFilename(const QString &name) {
 }
 
 void ConsoleOutput::logSpecResult(const QString &result) {
+  QStringList lines = result.split("\n");
+  QStringListIterator linesIterator(lines);
+
   red();
-  *outputIO << "  " << qPrintable(result) << std::endl;
+  while (linesIterator.hasNext()) {
+    QString line = linesIterator.next();
+    if (!linesIterator.hasNext())
+      yellow();
+    *outputIO << "  " << qPrintable(line) << std::endl;
+  }
+
   clear();
 }
 

data/ext/jasmine-webkit-specrunner/ConsoleOutput.h

@@ -4,6 +4,7 @@
 #include <QObject>
 #include <iostream>
 #include <QStack>
+#include <QStringList>
 
 class ConsoleOutput : public QObject {
   public:

data/ext/jasmine-webkit-specrunner/test.rb

@@ -7,6 +7,8 @@ system %{make clean}
 $: << File.expand_path("../../../lib", __FILE__)
 require 'qt/qmake'
 
+result = 0
+
 Dir['*_test.pro'].each do |test|
   FileUtils.rm_f('jhw-test')
 
@@ -15,10 +17,15 @@ Dir['*_test.pro'].each do |test|
   if File.file?('jhw-test')
     system %{./jhw-test}
     if $?.exitstatus != 0
-      exit 1
+      result = 1
+      break
     end
   else
-    exit 1
+    result = 1
+    break
   end
 end
 
+Qt::Qmake.make!('jasmine-headless-webkit', 'specrunner.pro')
+
+exit result

data/jasmine/jasmine.headless-reporter.coffee

@@ -1,120 +1,175 @@
 if !jasmine?
   throw new Error("jasmine not laoded!")
 
+if window.JHW
 # Jasmine extensions
-getSplitName = (parts) ->
-  parts.push(String(@description).replace(/[\n\r]/g, ' '))
-  parts
+  getSplitName = (parts) ->
+    parts.push(String(@description).replace(/[\n\r]/g, ' '))
+    parts
 
-jasmine.Suite.prototype.getSuiteSplitName = ->
-  this.getSplitName(if @parentSuite then @parentSuite.getSuiteSplitName() else [])
+  jasmine.Suite.prototype.getSuiteSplitName = ->
+    this.getSplitName(if @parentSuite then @parentSuite.getSuiteSplitName() else [])
 
-jasmine.Spec.prototype.getSpecSplitName = ->
-  this.getSplitName(@suite.getSuiteSplitName())
+  jasmine.Spec.prototype.getSpecSplitName = ->
+    this.getSplitName(@suite.getSuiteSplitName())
 
-jasmine.Suite.prototype.getSplitName = getSplitName
-jasmine.Spec.prototype.getSplitName = getSplitName
+  jasmine.Suite.prototype.getSplitName = getSplitName
+  jasmine.Spec.prototype.getSplitName = getSplitName
 
-jasmine.Spec.prototype.getJHWSpecInformation = ->
-  parts = this.getSpecSplitName()
-  specLineInfo = HeadlessReporterResult.findSpecLine(parts)
-  if specLineInfo.file
-    parts.push("#{specLineInfo.file}:#{specLineInfo.lineNumber}")
-  else
-    parts.push('')
-  parts.join("||")
-
-if !jasmine.WaitsBlock.prototype._execute
-  jasmine.WaitsBlock.prototype._execute = jasmine.WaitsBlock.prototype.execute
-  jasmine.WaitsForBlock.prototype._execute = jasmine.WaitsForBlock.prototype.execute
-
-  pauseAndRun = (onComplete) ->
-    JHW.timerPause()
-    this._execute ->
-      JHW.timerDone()
-      onComplete()
-
-  jasmine.WaitsBlock.prototype.execute = pauseAndRun
-  jasmine.WaitsForBlock.prototype.execute = pauseAndRun
+  jasmine.Spec.prototype.getJHWSpecInformation = ->
+    parts = this.getSpecSplitName()
+    specLineInfo = HeadlessReporterResult.findSpecLine(parts)
+    if specLineInfo.file
+      parts.push("#{specLineInfo.file}:#{specLineInfo.lineNumber}")
+    else
+      parts.push('')
+    parts.join("||")
+
+  jasmine.Spec.prototype.fail = (e) ->
+    if e and e.sourceURL and window.CoffeeScriptToFilename
+      filename = e.sourceURL.split('/').pop()
+      if realFilename = window.CoffeeScriptToFilename[filename]
+        e = {
+          name: e.name,
+          message: e.message,
+          lineNumber: "~" + String(e.line),
+          sourceURL: realFilename
+        }
+
+    expectationResult = new jasmine.ExpectationResult({
+      passed: false,
+      message: if e then jasmine.util.formatException(e) else 'Exception',
+      trace: { stack: e.stack }
+    })
+    @results_.addResult(expectationResult)
+
+  jasmine.NestedResults.isValidSpecLine = (line) ->
+    line.match(/^\s*expect/) != null || line.match(/^\s*return\s*expect/) != null
+
+  jasmine.NestedResults.parseFunction = (func) ->
+    lines = []
+    lineCount = 0
+    for line in func.split("\n")
+      if jasmine.NestedResults.isValidSpecLine(line)
+        line = line.replace(/^\s*/, '').replace(/\s*$/, '').replace(/^return\s*/, '')
+        lines.push([line, lineCount])
+      lineCount += 1
+    lines
+
+  jasmine.NestedResults.parseAndStore = (func) ->
+    if !jasmine.NestedResults.ParsedFunctions[func]
+      jasmine.NestedResults.ParsedFunctions[func] = jasmine.NestedResults.parseFunction(func)
+    jasmine.NestedResults.ParsedFunctions[func]
+
+  jasmine.NestedResults.ParsedFunctions = []
+
+  if !jasmine.WaitsBlock.prototype._execute
+    jasmine.WaitsBlock.prototype._execute = jasmine.WaitsBlock.prototype.execute
+    jasmine.WaitsForBlock.prototype._execute = jasmine.WaitsForBlock.prototype.execute
+
+    pauseAndRun = (onComplete) ->
+      JHW.timerPause()
+      this._execute ->
+        JHW.timerDone()
+        onComplete()
+
+    jasmine.WaitsBlock.prototype.execute = pauseAndRun
+    jasmine.WaitsForBlock.prototype.execute = pauseAndRun
+
+    jasmine.NestedResults.prototype.addResult_ = jasmine.NestedResults.prototype.addResult
+    jasmine.NestedResults.prototype.addResult = (result) ->
+      result.expectations = []
+      # always three up?
+
+      result.expectations = jasmine.NestedResults.parseAndStore(arguments.callee.caller.caller.caller.toString())
+
+      this.addResult_(result)
 
 # 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
-    bestChoice = HeadlessReporterResult.findSpecLine(@splitName)
-    output += " (#{bestChoice.file}:#{bestChoice.lineNumber})" if bestChoice.file
-
-    JHW.printName(output)
-    for result in @results
-      JHW.printResult(result)
-  @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
+  class window.HeadlessReporterResult
+    constructor: (@name, @splitName) ->
+      @results = []
+    addResult: (message) ->
+      @results.push(message)
+    print: ->
+      output = @name
+      bestChoice = HeadlessReporterResult.findSpecLine(@splitName)
+      output += " (#{bestChoice.file}:#{bestChoice.lineNumber})" if bestChoice.file
+
+      JHW.printName(output)
+      for result in @results
+        output = result.message
+        if result.lineNumber
+          output += " (line ~#{bestChoice.lineNumber + result.lineNumber})\n  #{result.line}"
+        JHW.printResult(output)
+    @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
 
 # The reporter itself.
-class jasmine.HeadlessReporter
-  constructor: (@callback = null) ->
-    @results = []
-    @failedCount = 0
-    @length = 0
-  reportRunnerResults: (runner) ->
-    return if this.hasError()
-
-    for result in @results
-      result.print()
-
-    this.callback() if @callback
-    JHW.finishSuite((new Date() - @startTime) / 1000.0, @length, @failedCount)
-
-  reportRunnerStarting: (runner) ->
-    @startTime = new Date()
-
-  reportSpecResults: (spec) ->
-    return if this.hasError()
-
-    results = spec.results()
-    @length++
-    if results.passed()
-      JHW.specPassed(spec.getJHWSpecInformation())
-    else
-      JHW.specFailed(spec.getJHWSpecInformation())
-      @failedCount++
-      failureResult = new HeadlessReporterResult(spec.getFullName(), spec.getSpecSplitName())
-      for result in results.getItems()
-        if result.type == 'expect' and !result.passed_
-          failureResult.addResult(result.message)
-      @results.push(failureResult)
-
-  reportSpecStarting: (spec) ->
-    if this.hasError()
-      spec.finish()
-      spec.suite.finish()
-
-  reportSuiteResults: (suite) ->
-  hasError: ->
-    JHW.hasError()
+  class jasmine.HeadlessReporter
+    constructor: (@callback = null) ->
+      @results = []
+      @failedCount = 0
+      @length = 0
+    reportRunnerResults: (runner) ->
+      return if this.hasError()
+
+      for result in @results
+        result.print()
+
+      this.callback() if @callback
+      JHW.finishSuite((new Date() - @startTime) / 1000.0, @length, @failedCount)
+
+    reportRunnerStarting: (runner) ->
+      @startTime = new Date()
+
+    reportSpecResults: (spec) ->
+      return if this.hasError()
+
+      results = spec.results()
+      @length++
+      if results.passed()
+        JHW.specPassed(spec.getJHWSpecInformation())
+      else
+        JHW.specFailed(spec.getJHWSpecInformation())
+        @failedCount++
+        failureResult = new HeadlessReporterResult(spec.getFullName(), spec.getSpecSplitName())
+        testCount = 1
+        for result in results.getItems()
+          if result.type == 'expect' and !result.passed_
+            if foundLine = result.expectations[testCount - 1]
+              [ result.line, result.lineNumber ] = foundLine
+            failureResult.addResult(result)
+          testCount += 1
+        @results.push(failureResult)
+
+    reportSpecStarting: (spec) ->
+      if this.hasError()
+        spec.finish()
+        spec.suite.finish()
+
+    reportSuiteResults: (suite) ->
+    hasError: ->
+      JHW.hasError()