qunited 0.3.1 → 0.4.0

data/test/unit/test_rhino_driver.rb

@@ -1,64 +1,64 @@
 require File.expand_path('../../test_helper', __FILE__)
 require File.expand_path('../driver_common_tests', __FILE__)
-require 'stringio'
 
 # Test running tests with the Rhino driver.
 class TestRhinoDriver < MiniTest::Unit::TestCase
   include QUnited::DriverCommonTests
 
   def test_undefined_error_in_source
-    runner = QUnited::Driver::Rhino.new(
+    driver = QUnited::Driver::Rhino.new(
       [File.join(FIXTURES_DIR, 'errors_project/app/assets/javascripts/undefined_error.js')],
       [File.join(FIXTURES_DIR, 'errors_project/test/javascripts/this_test_has_no_errors_in_it.js')])
 
-    stderr = capture_stderr { runner.run }
-    assert stderr.size > 10, 'Got some stderr output to describe the crash'
-    results = runner.results
-    assert results.passed?, 'Should succeed even if crash in source file as long as tests pass'
-    assert_equal 1, results.total_tests, 'Correct number of tests run'
-    assert_equal 1, results.total_assertions, 'Correct number of assertions executed'
-    assert_equal 0, results.total_failures, 'Correct number of failures given'
+    driver.run
+    assert captured_stderr.size > 10, 'Got some stderr output to describe the crash'
+    @results = driver.results
+    assert @results.all? { |r| r.passed? }, 'Should succeed even if crash in source file as long as tests pass'
+    assert_equal 1, total_tests, 'Correct number of tests run'
+    assert_equal 1, total_assertions, 'Correct number of assertions executed'
+    assert_equal 0, total_failed_tests, 'Correct number of test failures given'
+    assert_equal 0, total_failed_assertions, 'Correct number of assertion failures given'
   end
 
   def test_syntax_error_in_source
-    runner = QUnited::Driver::Rhino.new(
+    driver = QUnited::Driver::Rhino.new(
       [File.join(FIXTURES_DIR, 'errors_project/app/assets/javascripts/syntax_error.js')],
       [File.join(FIXTURES_DIR, 'errors_project/test/javascripts/this_test_has_no_errors_in_it.js')])
 
-    stderr = capture_stderr { runner.run }
-    assert stderr.size > 10, 'Got some stderr output to describe the crash'
-    results = runner.results
-    assert runner.results.passed?, 'Should succeed even if crash in source file as long as tests pass'
-    assert_equal 1, results.total_tests, 'Correct number of tests run'
-    assert_equal 1, results.total_assertions, 'Correct number of assertions executed'
-    assert_equal 0, results.total_failures, 'Correct number of failures given'
+    driver.run
+    assert captured_stderr.size > 10, 'Got some stderr output to describe the crash'
+    @results = driver.results
+    assert @results.all? { |r| r.passed? }, 'Should succeed even if crash in source file as long as tests pass'
+    assert_equal 1, total_tests, 'Correct number of tests run'
+    assert_equal 1, total_assertions, 'Correct number of assertions executed'
+    assert_equal 0, total_failed_tests, 'Correct number of failures given'
+    assert_equal 0, total_failed_assertions, 'Correct number of assertion failures given'
   end
 
   def test_undefined_error_in_test
-    runner = QUnited::Driver::Rhino.new(
+    driver = QUnited::Driver::Rhino.new(
       [File.join(FIXTURES_DIR, 'errors_project/app/assets/javascripts/no_error.js')],
       [File.join(FIXTURES_DIR, 'errors_project/test/javascripts/this_test_has_undefined_error.js')])
 
-    stderr = capture_stderr { runner.run }
-    assert stderr.strip.empty?, 'No stderr if test crashes - should have been caught'
-    results = runner.results
-    assert results.failed?, 'We got a failure with the undefined error'
-    assert_equal 2, results.total_tests, 'Correct number of tests run'
-    # "assertions" count will actually be 1, plus the unefined error being recorded
-    assert_equal 2, results.total_assertions, 'Correct number of assertions executed'
-    assert_equal 0, results.total_failures, 'Correct number of failures given'
+    driver.run
+    assert captured_stderr.strip.empty?, 'No stderr if test crashes - should have been caught'
+    @results = driver.results
+    assert_equal 2, total_tests, 'Correct number of tests run'
+    # "assertions" count will actually be 1, plus the undefined error being recorded
+    assert_equal 2, total_assertions, 'Correct number of assertions executed'
+    assert_equal 0, total_failed_tests, 'Correct number of failures given'
     # The crashed test errors, but the other should be allowed to succeed
-    assert_equal 1, results.total_errors, 'Correct number of errors given'
+    assert_equal 1, total_error_tests, 'Correct number of errors given'
   end
 
   def test_no_tests_in_test_file_means_failure
-    runner = QUnited::Driver::Rhino.new(
+    driver = QUnited::Driver::Rhino.new(
       [File.join(FIXTURES_DIR, 'errors_project/app/assets/javascripts/no_error.js')],
       [File.join(FIXTURES_DIR, 'errors_project/test/javascripts/this_test_has_no_tests.js')])
-    runner.run
+    driver.run
 
-    results = runner.results
-    assert results.failed?, 'No tests in a file means failure'
+    @results = driver.results
+    assert @results.find { |r| r.failed? }, 'No tests in a file means failure'
   end
 
   private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qunited
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-21 00:00:00.000000000 Z
+date: 2013-03-06 00:00:00.000000000 Z
 dependencies: []
 description: QUnited runs headless QUnit tests as part of your normal build
 email:
@@ -32,14 +32,18 @@ files:
 - lib/qunited/driver/phantomjs/phantomjs.rb
 - lib/qunited/driver/phantomjs/support/runner.js
 - lib/qunited/driver/phantomjs/support/tests_page.html.erb
+- lib/qunited/driver/results_collector.rb
 - lib/qunited/driver/rhino/rhino.rb
 - lib/qunited/driver/rhino/support/env.rhino.js
 - lib/qunited/driver/rhino/support/js.jar
 - lib/qunited/driver/rhino/support/runner.js
 - lib/qunited/driver/support/qunit.js
 - lib/qunited/driver/support/qunited.js
+- lib/qunited/formatter.rb
+- lib/qunited/formatter/base.rb
+- lib/qunited/formatter/dots.rb
+- lib/qunited/qunit_test_result.rb
 - lib/qunited/rake_task.rb
-- lib/qunited/results.rb
 - lib/qunited/runner.rb
 - lib/qunited/server.rb
 - lib/qunited/server/qunit.css
@@ -63,9 +67,10 @@ files:
 - test/fixtures/failures_project/test/javascripts/test_basics.js
 - test/fixtures/failures_project/test/javascripts/test_math.js
 - test/test_helper.rb
+- test/unit/driver/test_results_collector.rb
 - test/unit/driver_common_tests.rb
+- test/unit/formatter/test_dots.rb
 - test/unit/test_phantomjs_driver.rb
-- test/unit/test_results.rb
 - test/unit/test_rhino_driver.rb
 - test/unit/test_runner.rb
 homepage: https://github.com/aaronroyer/qunited
@@ -109,8 +114,9 @@ test_files:
 - test/fixtures/failures_project/test/javascripts/test_basics.js
 - test/fixtures/failures_project/test/javascripts/test_math.js
 - test/test_helper.rb
+- test/unit/driver/test_results_collector.rb
 - test/unit/driver_common_tests.rb
+- test/unit/formatter/test_dots.rb
 - test/unit/test_phantomjs_driver.rb
-- test/unit/test_results.rb
 - test/unit/test_rhino_driver.rb
 - test/unit/test_runner.rb

data/lib/qunited/results.rb

@@ -1,195 +0,0 @@
-require 'yaml'
-
-module QUnited
-
-  # Simple tests results compiler. Takes a raw results hash that was produced by a runner.
-  class Results
-    class ModuleResults
-      def initialize(data)
-        @data = data
-      end
-
-      def tests
-        @tests ||= @data[:tests].map { |test_data| TestResults.new test_data, @data[:name] }
-      end
-    end
-
-    class TestResults
-      def initialize(data, module_name)
-        @data, @module_name = data, module_name
-      end
-
-      def assertions
-        @data[:assertion_data].map do |assertion_data|
-          AssertionResults.new assertion_data, @data[:name], @module_name, @data[:file]
-        end
-      end
-
-      def passed?; result == :passed end
-      def failed?; result == :failed end
-      def error?; result == :error end
-
-      def result
-        @result ||= if assertions.find { |a| a.error? }
-          :error
-        else
-          assertions.find { |a| a.failed? } ? :failed : :passed
-        end
-      end
-
-      def duration; @data[:duration] end
-
-      def to_s; passed? ? '.' : (error? ? 'E' : 'F') end
-    end
-
-    class AssertionResults
-      def initialize(data, test_name, module_name, file)
-        @data, @test_name, @module_name, @file = data, test_name, module_name, file
-      end
-
-      def message
-        @data[:message]
-      end
-
-      def result
-        if @data[:result]
-          :passed
-        else
-          @data[:message] =~ /^Died on test/ ? :error : :failed
-        end
-      end
-
-      def passed?; result == :passed end
-      def failed?; result == :failed end
-      def error?; result == :error end
-
-      def output(count)
-        return "" if passed?
-        msg = "  " + (count ? "#{count.to_s}) " : "")
-        msg << "#{error? ? 'Error' : 'Failure'}:\n"
-        msg << "#{@test_name} (#{@module_name}) [#{@file}]\n"
-        msg << "#{@data[:message] || 'Failed assertion, no message given.'}\n"
-
-        # Results can be nil. Also, JavaScript nulls will be converted, by the YAML serializer, to
-        # Ruby nil. Convert that back to 'null' for the output.
-        if @data.key? :expected
-          expected, actual = @data[:expected], @data[:actual]
-          msg << "Expected: #{expected.nil? ? 'null' : expected.inspect}\n"
-          msg <<   "  Actual: #{actual.nil? ? 'null' : actual.inspect}\n"
-        end
-        msg
-      end
-    end
-
-    def self.from_javascript_produced_json(json)
-      self.new clean_up_results(YAML.load(json))
-    end
-
-    def initialize(modules_results_array)
-      @data = modules_results_array.freeze
-      @module_results = @data.map { |module_data| ModuleResults.new module_data }
-    end
-
-    def to_s
-      return <<-OUTPUT
-#{dots}
-#{"\n\n#{failures_output}\n\n" unless failures_output.empty?}
-#{times_line}
-
-#{bottom_line}
-      OUTPUT
-    end
-
-    def to_i
-      passed? ? 0 : 1
-    end
-
-    def passed?
-      total_failures.zero? && total_errors.zero?
-    end
-
-    def failed?
-      !passed?
-    end
-
-    def dots
-      tests.map { |test| test.to_s }.join
-    end
-
-    def bottom_line
-      "#{total_tests} tests, #{total_assertions} assertions, " +
-      "#{total_failures} failures, #{total_errors} errors, 0 skips"
-    end
-
-    def times_line
-      tests_per = (total_time > 0) ? (total_tests / total_time) : total_tests
-      assertions_per = (total_time > 0) ? (total_assertions / total_time) : total_assertions
-
-      "Finished in #{"%.6g" % total_time} seconds, #{"%.6g" % tests_per} tests/s, " +
-      "#{"%.6g" % assertions_per} assertions/s."
-    end
-
-    def failures_output
-      failures_output_array.join("\n")
-    end
-
-    # Array of failure output block strings
-    def failures_output_array
-      return @failures_output_array if @failures_output_array
-      count = 0
-      @failures_output_array = (failures + errors).map { |failure| failure.output(count += 1) }
-    end
-
-    def total_tests
-      @total_tests ||= @module_results.inject(0) { |count, mod| count += mod.tests.size }
-    end
-
-    def total_assertions; assertions.size end
-    def total_failures; failures.size end
-    def total_errors; errors.size end
-
-    def total_time
-      @total_time ||= tests.inject(0) { |total, test| total += test.duration }
-    end
-
-    private
-
-    def tests
-      @tests ||= @module_results.inject([]) { |tests, mod| tests += mod.tests }
-    end
-
-    def assertions
-      @assertions ||= tests.inject([]) { |asserts, test| asserts += test.assertions }
-    end
-
-    def failures
-      @failures ||= assertions.select { |assert| assert.failed? }
-    end
-
-    def errors
-      @errors ||= assertions.select { |assert| assert.error? }
-    end
-
-    # The YAML serializing JavaScript library does not put things into the cleanest form
-    # for us to work with. This turns the String keys into Symbols and converts Strings
-    # representing dates and numbers into their appropriate objects.
-    def self.clean_up_results(results)
-      results.map! { |mod_results| symbolize_keys mod_results }
-      results.each do |mod_results|
-        mod_results[:tests].map! { |test| clean_up_test_results(symbolize_keys(test)) }
-      end
-    end
-
-    def self.clean_up_test_results(test_results)
-      test_results[:start] = DateTime.parse(test_results[:start])
-      test_results[:assertion_data].map! { |data| symbolize_keys data }
-      test_results
-    end
-
-    def self.symbolize_keys(hash)
-      new_hash = {}
-      hash.keys.each { |key| new_hash[key.to_sym] = hash[key] }
-      new_hash
-    end
-  end
-end

data/test/unit/test_results.rb

@@ -1,338 +0,0 @@
-require File.expand_path('../../test_helper', __FILE__)
-
-class TestResults < MiniTest::Unit::TestCase
-
-  def test_gives_you_various_counts
-    results = QUnited::Results.new test_module_results
-    assert results.passed?, 'passed? is true when all tests have passed'
-    assert !results.failed?, 'failed? is false when all tests have passed'
-    assert_equal 3, results.total_tests, 'total_tests gives total tests count'
-    assert_equal 4, results.total_assertions, 'total_assertions gives total assertions count'
-    assert_equal 0, results.total_failures, 'total_failures gives total failures count when there are none'
-    assert_equal 0, results.total_errors, 'total_errors gives total errors when there are none'
-
-    other_results = QUnited::Results.new test_failed_module_results
-
-    assert !other_results.passed?, 'passed? is false when there are failures'
-    assert other_results.failed?, 'failed? is true when there are failures'
-    assert_equal 4, other_results.total_tests, 'total_tests gives total tests count'
-    assert_equal 5 + 1, other_results.total_assertions, 'total_assertions gives total assertions count'
-    assert_equal 4, other_results.total_failures, 'total_failures gives total failures count when there are some'
-    assert_equal 0, results.total_errors, 'total_errors gives total errors when there are none'
-  end
-
-  def test_basic_output
-    results = QUnited::Results.new test_module_results
-    assert_equal "3 tests, 4 assertions, 0 failures, 0 errors, 0 skips", results.bottom_line
-    assert_equal "...", results.dots
-  end
-
-  def test_failures_output
-    results = QUnited::Results.new test_failed_module_results
-
-    assert_equal "4 tests, 6 assertions, 4 failures, 0 errors, 0 skips", results.bottom_line
-    assert_equal "F.FF", results.dots
-
-    failure = results.failures_output_array[0].split("\n")
-    assert_equal 3, failure.size
-    assert_equal '  1) Failure:', failure[0]
-    assert_equal 'This has one failure (Basics) [test/javascripts/test_basics.js]', failure[1]
-    assert_equal 'Failed assertion, no message given.', failure[2]
-
-    failure = results.failures_output_array[1].split("\n")
-    assert_equal 5, failure.size
-    assert_equal '  2) Failure:', failure[0]
-    assert_equal 'Addition is hard (Math) [test/javascripts/test_math.js]', failure[1]
-    assert_equal 'I got my math right', failure[2]
-    assert_equal 'Expected: 3', failure[3]
-    assert_equal '  Actual: 2', failure[4]
-
-    failure = results.failures_output_array[2].split("\n")
-    assert_equal 5, failure.size
-    assert_equal '  3) Failure:', failure[0]
-    assert_equal 'Addition is hard (Math) [test/javascripts/test_math.js]', failure[1]
-    assert_equal 'These strings match', failure[2]
-    assert_equal 'Expected: "String here"', failure[3]
-    assert_equal '  Actual: "Identical string here"', failure[4]
-
-    failure = results.failures_output_array[3].split("\n")
-    assert_equal 3, failure.size
-    assert_equal '  4) Failure:', failure[0]
-    assert_equal 'Check some subtraction (Math) [test/javascripts/test_math.js]', failure[1]
-    assert_equal 'Expected 2 assertions, but 1 were run', failure[2]
-  end
-
-  # Test results are converted to JavaScript appropriate null, not nil
-  def test_null_failures_output
-    results = QUnited::Results.new test_failed_module_results_with_null
-
-    failure = results.failures_output_array[0].split("\n")
-    assert_equal 5, failure.size
-    assert_equal '  1) Failure:', failure[0]
-    assert_equal 'The test (The module) [test/javascripts/test_module.js]', failure[1]
-    assert_equal 'Was it null?', failure[2]
-    assert_equal 'Expected: 5', failure[3]
-    assert_equal '  Actual: null', failure[4]
-  end
-
-  def test_errors_and_error_output
-    results = QUnited::Results.new test_failed_module_results_with_an_error
-
-    assert results.failed?, 'failed? is true when there are errors'
-    assert_equal 2, results.total_tests, 'total_tests gives total tests count'
-    assert_equal 3, results.total_assertions, 'total_assertions gives total assertions count'
-    assert_equal 0, results.total_failures, 'total_failures gives total failures count when there are none'
-    assert_equal 1, results.total_errors, 'total_errors gives total errors when there are none'
-
-    error = results.failures_output_array[0].split("\n")
-    assert_equal 3, error.size
-    assert_equal '  1) Error:', error[0]
-    assert_equal 'Error test (The module) [test/javascripts/test_module.js]', error[1]
-    assert_equal 'Died on test #3: asdf is undefined', error[2]
-
-    assert_equal "2 tests, 3 assertions, 0 failures, 1 errors, 0 skips", results.bottom_line
-    assert_equal "E.", results.dots
-  end
-
-  private
-
-  def test_module_results
-    [
-      {
-        :name => "(no module)",
-        :tests => [
-          { :name => "The source code was loaded",
-            :failures => [],
-            :start => DateTime.parse('2012-06-12T23:52:33+00:00'),
-            :assertions => 1,
-            :duration => 0.002,
-            :failed => 0,
-            :total => 1,
-            :file => 'test/javascripts/test_basics.js',
-            :assertion_data => [
-              { :result => true,
-                :message => "We have loaded it",
-                :actual => 1,
-                :expected => 1
-              }
-            ]
-          }
-        ]
-      },
-      { :name => "Math",
-        :tests =>[
-          {
-            :name => "Addition works",
-            :failures => [],
-            :start => DateTime.parse('2012-06-12T23:52:33+00:00'),
-            :assertions => 2,
-            :duration => 0.01,
-            :failed => 0,
-            :total => 2,
-            :file => 'test/javascripts/test_math.js',
-            :assertion_data => [
-              {
-                :result => true,
-                :message => "One plus one does equal two",
-                :actual => 2,
-                :expected => 2
-              },
-              {
-                :result => true,
-                :message => "Two plus two does equal four",
-                :actual => 4,
-                :expected => 4
-              }
-            ]
-          },
-          { :name => "Subtraction works",
-            :failures => [],
-            :start => DateTime.parse('2012-06-12T23:52:33+00:00'),
-            :assertions => 1,
-            :duration => 0.009,
-            :failed => 0,
-            :total => 1,
-            :file => 'test/javascripts/test_math.js',
-            :assertion_data => [
-              {
-                :result=>true,
-                :message=>"Two minus one equals one",
-                :actual=>1,
-                :expected=>1
-              }
-            ]
-          }
-        ]
-      }
-    ]
-  end
-
-  def test_failed_module_results
-    [
-      {
-        :name => "Basics",
-        :tests =>  [
-          {
-            :name => "This has one failure",
-            :assertion_data => [
-              {
-                :result => false,
-                :message => nil
-              }
-            ],
-            :start => DateTime.parse('2012-06-14T13:24:11+00:00'),
-            :assertions => 1,
-            :file => "test/javascripts/test_basics.js",
-            :duration => 0.002,
-            :failed => 1,
-            :total => 1
-          },
-          {
-            :name => "This has no failures",
-            :assertion_data => [
-              {
-                :result => true,
-                :message => "It is 1",
-                :actual => 1,
-                :expected => 1
-              }
-            ],
-            :start => DateTime.parse('2012-06-14T13:24:11+00:00'),
-            :assertions => 1,
-            :file => "test/javascripts/test_basics.js",
-            :duration => 0.006,
-            :failed => 0,
-            :total => 1
-          }
-        ]
-      },
-      {
-        :name => "Math",
-        :tests => [
-          {
-            :name => "Addition is hard",
-            :assertion_data => [
-              {
-                :result => false,
-                :message => "I got my math right",
-                :actual => 2,
-                :expected => 3
-              },
-              {
-                :result => false,
-                :message => "These strings match",
-                :actual => "Identical string here",
-                :expected => "String here"
-              }
-            ],
-            :start => DateTime.parse('2012-06-14T13:24:11+00:00'),
-            :assertions => 2,
-            :file => "test/javascripts/test_math.js",
-            :duration => 0.02,
-            :failed => 2,
-            :total => 2
-          },
-          {
-            :name => "Check some subtraction",
-            :assertion_data => [
-              {
-                :result => true,
-                :message => "Two minus one equals one",
-                :actual => 1,
-                :expected => 1
-              },
-              {
-                :result => false,
-                :message => "Expected 2 assertions, but 1 were run"
-              }
-            ],
-            :start => DateTime.parse('2012-06-14T13:24:11+00:00'),
-            :assertions => 2,
-            :file => "test/javascripts/test_math.js",
-            :duration => 0.008,
-            :failed => 1,
-            :total => 2
-          }
-        ]
-      }
-    ]
-  end
-
-  def test_failed_module_results_with_null
-    [
-      {
-        :name => "The module",
-        :tests =>  [
-          {
-            :name => "The test",
-            :assertion_data => [
-              {
-                :result => false,
-                :message => "Was it null?",
-                :actual => nil,
-                :expected => 5
-              }
-            ],
-            :start => DateTime.parse('2012-06-14T13:24:11+00:00'),
-            :assertions => 1,
-            :file => "test/javascripts/test_module.js",
-            :duration => 0.002,
-            :failed => 1,
-            :total => 1
-          }
-        ]
-      }
-    ]
-  end
-
-  def test_failed_module_results_with_an_error
-    [
-      {
-        :name => "The module",
-        :tests =>  [
-          {
-            :name => "Error test",
-            :assertion_data => [
-              {
-                :result => true,
-                :message => "This one fine",
-                :actual => "String",
-                :expected => "String"
-              },
-              {
-                :result => false,
-                :message => "Died on test #3: asdf is undefined"
-              }
-
-            ],
-            :start => DateTime.parse('2012-06-14T13:24:11+00:00'),
-            :assertions => 2,
-            :file => "test/javascripts/test_module.js",
-            :duration => 0.002,
-            :failed => 1,
-            :total => 2
-          },
-          {
-            :name => "OK test",
-            :assertion_data => [
-              {
-                :result => true,
-                :message => "All good",
-                :actual => 5,
-                :expected => 5
-              }
-
-            ],
-            :start => DateTime.parse('2012-06-14T13:24:11+00:00'),
-            :assertions => 1,
-            :file => "test/javascripts/test_module.js",
-            :duration => 0.002,
-            :failed => 0,
-            :total => 1
-          }
-        ]
-      }
-    ]
-  end
-
-end