RubyGems - Fingertips-headless-squirrel - Versions diffs - 0.4.0 → 0.5.0 - Mend

Fingertips-headless-squirrel 0.4.0 → 0.5.0

Files changed (10) hide show

data/Rakefile +1 -1
data/VERSION.yml +1 -1
data/lib/headless_squirrel/test_case.rb +9 -8
data/test/fixtures/syntax_error.html +27 -0
data/test/fixtures/syntax_error.js +5 -0
data/test/fixtures/type_error.html +27 -0
data/test/fixtures/type_error.js +1 -0
data/test/unit/runner_test.rb +1 -1
data/test/unit/test_case_test.rb +53 -14
metadata +8 -3

data/Rakefile CHANGED Viewed

@@ -2,7 +2,7 @@ task :default => :test
 desc "Run the tests"
 task :test do
-  sh "ruby #{Dir['test/unit/*_test.rb'].join(' ')}"
+  sh "ruby -r#{Dir['test/unit/*_test.rb'].join(' -r')} -e ''"
 end
 # HeadlessSquirrel::Rake::Runner.new :regression do |t|

data/VERSION.yml CHANGED Viewed

@@ -1,4 +1,4 @@
 ---
 :major: 0
-:minor: 4
+:minor: 5
 :patch: 0

data/lib/headless_squirrel/test_case.rb CHANGED Viewed

@@ -46,7 +46,6 @@ module HeadlessSquirrel
       webView.mainFrame.DOMDocument
     end
     def log
       document.getElementsByClassName('logsummary').item(0) || document.getElementById('logsummary')
     end
@@ -78,13 +77,10 @@ module HeadlessSquirrel
     #   @delegate.test_case_finished(self)
     # end
-    # Logs js errors:
-    #
-    # webView.setUIDelegate(self)
-    #
-    # def webView_addMessageToConsole(_, msg)
-    #   p msg
-    # end
+    def webView_addMessageToConsole(_, info)
+      puts format_js_log(info)
+      OSX::NSApplication.sharedApplication.terminate(self) if info['message'].to_s =~ /^[A-Z]\w+Error/
+    end
     def handleEvent(event)
       element = event.target
@@ -115,9 +111,14 @@ module HeadlessSquirrel
       webView = self.class.sharedWebView
       webView.mainFrame.loadRequest(req)
       webView.frameLoadDelegate = self
+      webView.setUIDelegate(self)
       webView
     end
+    def format_js_log(info)
+      "#{info['sourceURL'][7..-1]}:#{info['lineNumber']}: #{info['message']}"
+    end
     def finalize_test(result)
       last_line = loglines.children.item(loglines.children.length-1)
       log_row = self.class.parse_log_row(last_line)

data/test/fixtures/syntax_error.html ADDED Viewed

@@ -0,0 +1,27 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <title>A HeadlessSquirrel Unit Test HTML File With Syntax Error</title>
+  <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+  <script type="text/javascript" charset="utf-8">
+    var eventResults = {};
+    var originalElement = window.Element;
+  </script>
+  <script src="../regression/prototype/unit/assets/prototype.js" type="text/javascript" charset="utf-8"></script>
+  <script src="../regression/prototype/unit/assets/unittest.js" type="text/javascript" charset="utf-8"></script>
+  <script src="syntax_error.js" type="text/javascript" charset="utf-8"></script>
+</head>
+<body>
+<div id="testlog"></div>
+<div id="content"></div>
+</body>
+</html>
+<script type="text/javascript" charset="utf-8">
+  eventResults.endOfDocument = true;
+</script>

data/test/fixtures/syntax_error.js ADDED Viewed

@@ -0,0 +1,5 @@
+new Test.Unit.Runner({
+  setup: function() {
+    this; new
+  },
+});

data/test/fixtures/type_error.html ADDED Viewed

@@ -0,0 +1,27 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <title>A HeadlessSquirrel Unit Test HTML File With Type Error</title>
+  <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+  <script type="text/javascript" charset="utf-8">
+    var eventResults = {};
+    var originalElement = window.Element;
+  </script>
+  <script src="../regression/prototype/unit/assets/prototype.js" type="text/javascript" charset="utf-8"></script>
+  <script src="../regression/prototype/unit/assets/unittest.js" type="text/javascript" charset="utf-8"></script>
+  <script src="type_error.js" type="text/javascript" charset="utf-8"></script>
+</head>
+<body>
+<div id="testlog"></div>
+<div id="content"></div>
+</body>
+</html>
+<script type="text/javascript" charset="utf-8">
+  eventResults.endOfDocument = true;
+</script>

data/test/fixtures/type_error.js ADDED Viewed

	@@ -0,0 +1 @@
1	+ this.doesNotExist();

data/test/unit/runner_test.rb CHANGED Viewed

@@ -142,7 +142,7 @@ describe "HeadlessSquirrel::Runner, when finalizing" do
   end
   it "should print the time it took to run the tests" do
-    @runner.expects(:puts).with("\nFinished in 2.3 seconds.")
+    @runner.expects(:puts).with("Finished in 2.3 seconds.")
     @runner.send(:finalize)
   end

data/test/unit/test_case_test.rb CHANGED Viewed

@@ -1,5 +1,12 @@
 require File.expand_path('../../test_helper', __FILE__)
+module TestCaseHelper
+  def run_test_case!
+    @test_case.run
+    sleep 0.25 while not @test_case.finished?
+  end
+end
 describe "HeadlessSquirrel::TestCase, class methods" do
   it "should return a shared WebView instance" do
     HeadlessSquirrel::TestCase.sharedWebView.should.be.instance_of OSX::WebView
@@ -47,6 +54,8 @@ describe "HeadlessSquirrel::TestCase" do
 end
 describe "HeadlessSquirrel::TestCase, when running" do
+  include TestCaseHelper
   before do
     @delegate = stub_everything('delegate')
     @test_case = HeadlessSquirrel::TestCase.alloc.initWithHTMLFile_delegate(fixture('a_unit_test.html'), @delegate)
@@ -78,13 +87,6 @@ describe "HeadlessSquirrel::TestCase, when running" do
     @test_case.webView_didFinishLoadForFrame(nil, nil)
   end
-  it "should not have finished yet if the inner html of the `log' element is `running...'" do
-    @test_case.instance_variable_set(:@finished, nil)
-    @test_case.log.stubs(:innerText).returns('running...')
-    @test_case.handleEvent(stubbed_log_event)
-    @test_case.should.not.be.finished
-  end
   it "should have finished once the inner html of the `log' element is not longer `running...'" do
     @test_case.instance_variable_set(:@finished, nil)
     @test_case.handleEvent(stubbed_log_event)
@@ -120,8 +122,7 @@ describe "HeadlessSquirrel::TestCase, when running" do
     @test_case.handleEvent(stubbed_loglines_event('failed'))
   end
-  # Eloy: Fails on my Mac Pro at the office, maybe because I've installed the Safari 4 beta?
-  it "should let its delegate know a test ran if the targets class is one of passed, failed, or error" do
+  xit "should let its delegate know a test ran if the targets class is one of passed, failed, or error" do
     @test_case = HeadlessSquirrel::TestCase.alloc.initWithHTMLFile_delegate(fixture('a_unit_test.html'), @delegate)
     @delegate.expects(:test_ran).times(3).with do |test|
@@ -151,11 +152,6 @@ describe "HeadlessSquirrel::TestCase, when running" do
   private
-  def run_test_case!
-    @test_case.run
-    sleep 0.25 while not @test_case.finished?
-  end
   def stubbed_log_event
     stub('Event', :target => @test_case.log.firstChild)
   end
@@ -165,4 +161,47 @@ describe "HeadlessSquirrel::TestCase, when running" do
     element.stubs(:parentNode).returns(@test_case.loglines.getElementsByClassName(klass).item(0))
     stub('Event', :target => element)
   end
+end
+describe "HeadlessSquirrel::TestCase, when running a file with problems" do
+  include TestCaseHelper
+  before do
+    @delegate = stub_everything('delegate')
+  end
+  it "should warn and terminate if a syntax error was encountered in the JavaScript" do
+    OSX::NSApplication.sharedApplication.expects(:terminate)
+    message = message_printed_while_running('syntax_error.html')
+    message.should == "#{fixture('syntax_error.js')}:4: SyntaxError: Parse error"
+  end
+  it "should warn and terminate if a type error was raised from the JavaScript runtime" do
+    OSX::NSApplication.sharedApplication.expects(:terminate)
+    message = message_printed_while_running('type_error.html')
+    message.should == "#{fixture('type_error.js')}:1: TypeError: Result of expression 'this.doesNotExist' [undefined] is not a function."
+  end
+  it "should only warn if a message was logged which does not match the error regexp" do
+    @test_case = HeadlessSquirrel::TestCase.alloc.initWithHTMLFile_delegate(fixture('a_unit_test.html'), @delegate)
+    info = { 'message' => 'some other message', 'sourceURL' => 'file:///some/file.js', 'lineNumber' => '1' }
+    OSX::NSApplication.sharedApplication.expects(:terminate).never
+    @test_case.expects(:puts).with("/some/file.js:1: some other message")
+    @test_case.webView_addMessageToConsole(@test_case.webView, info)
+  end
+  private
+  def message_printed_while_running(fixture)
+    @test_case = HeadlessSquirrel::TestCase.alloc.initWithHTMLFile_delegate(fixture(fixture), @delegate)
+    def @test_case.puts(message)
+      @printed_message = message
+      @finished = true
+    end
+    run_test_case!
+    @test_case.instance_variable_get(:@printed_message)
+  end
 end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Fingertips-headless-squirrel
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2009-06-17 00:00:00 -07:00
+date: 2009-08-21 00:00:00 -07:00
 default_executable: jstest
 dependencies: []
@@ -33,6 +33,10 @@ files:
 - lib/headless_squirrel/test_case.rb
 - test/fixtures/a_unit_test.html
 - test/fixtures/a_unit_test.js
+- test/fixtures/syntax_error.html
+- test/fixtures/syntax_error.js
+- test/fixtures/type_error.html
+- test/fixtures/type_error.js
 - test/regression/prototype/unit/ajax_test.html
 - test/regression/prototype/unit/array_test.html
 - test/regression/prototype/unit/assets/prototype.js
@@ -150,6 +154,7 @@ files:
 - test/unit/test_test.rb
 has_rdoc: true
 homepage: http://github.com/Fingertips/headless-squirrel/tree/master
+licenses:
 post_install_message:
 rdoc_options:
 - --charset=UTF-8
@@ -170,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubyforge_project:
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key:
 specification_version: 2
 summary: A command-line JavaScript test runner for the Mac.