minitest-reporters 0.14.5 → 0.14.6

data/lib/minitest/around_test_hooks.rb

@@ -1,17 +1,25 @@
 module MiniTest
   module AroundTestHooks
-    def self.included(base)
-      base.instance_eval do
-        alias_method :run_without_hooks, :run
-        alias_method :run, :run_with_hooks
+    def self.before_test(instance)
+      MiniTest::Unit.runner.before_test(instance.class, instance.__name__)
+    end
+
+    def self.after_test(instance)
+      # MiniTest < 4.1.0 sends #record after all teardown hooks, so don't call
+      # #after_test here.
+      if MiniTest::Unit::VERSION > "4.1.0"
+        MiniTest::Unit.runner.after_test(instance.class, instance.__name__)
       end
     end
 
-    def run_with_hooks(runner)
-      runner.before_test(self.class, self.__name__)
-      run_without_hooks(runner)
-    ensure
-      runner.after_test(self.class, self.__name__)
+    def before_setup
+      AroundTestHooks.before_test(self)
+      super
+    end
+
+    def after_teardown
+      super
+      AroundTestHooks.after_test(self)
     end
   end
 end

data/lib/minitest/reporter.rb

@@ -29,6 +29,7 @@ module MiniTest
     def before_suite(suite); end
     def after_suite(suite); end
     def before_test(suite, test); end
+    def after_test(suite, test); end
     def pass(suite, test, test_runner); end
     def skip(suite, test, test_runner); end
     def failure(suite, test, test_runner); end

data/lib/minitest/reporter_runner.rb

@@ -56,6 +56,10 @@ module MiniTest
       @test_results[suite] ||= {}
       @test_results[suite][test.to_sym] = runner
       @test_recorder.record(runner)
+
+      # MiniTest < 4.1.0 sends #record after all teardown hooks, so explicitly
+      # call #after_test here after recording.
+      after_test(suite, test) if Unit::VERSION <= "4.1.0"
     end
 
     def after_test(suite, test)
@@ -64,6 +68,8 @@ module MiniTest
       runners.each do |runner|
         trigger_callback(runner.result, suite, test.to_sym, runner)
       end
+
+      trigger_callback(:after_test, suite, test.to_sym)
     end
 
     # Stub out the three IO methods used by the built-in reporter.

data/lib/minitest/reporters.rb

@@ -22,7 +22,7 @@ module MiniTest
 
     def self.use!(console_reporters = ProgressReporter.new, env = ENV, backtrace_filter = ExtensibleBacktraceFilter.default_filter)
       use_runner!(console_reporters, env)
-      use_around_test_hooks!
+      use_before_test_hook!
       use_backtrace_filter!(backtrace_filter)
       use_parallel_length_method!
     end
@@ -33,8 +33,18 @@ module MiniTest
       Unit.runner = runner
     end
 
-    def self.use_around_test_hooks!
-      Unit::TestCase.send(:include, AroundTestHooks)
+    def self.use_before_test_hook!
+      if Unit::VERSION >= "3.3.0"
+        Unit::TestCase.send(:include, AroundTestHooks)
+      else
+        Unit::TestCase.send(:define_method, :before_setup) do
+          AroundTestHooks.before_test(self)
+        end
+
+        Unit::TestCase.send(:define_method, :after_teardown) do
+          AroundTestHooks.after_test(self)
+        end
+      end
     end
 
     def self.use_backtrace_filter!(backtrace_filter)

data/lib/minitest/reporters/default_reporter.rb

@@ -40,11 +40,11 @@ module MiniTest
       end
 
       def pass(suite, test, test_runner)
-        after_test(green('.'))
+        test_result(green('.'))
       end
 
       def skip(suite, test, test_runner)
-        after_test(yellow('S'))
+        test_result(yellow('S'))
       end
 
       def failure(suite, test, test_runner)
@@ -56,7 +56,7 @@ module MiniTest
           puts
           print_info(test_runner.exception)
         else
-          after_test(red('F'))
+          test_result(red('F'))
         end
       end
 
@@ -69,7 +69,7 @@ module MiniTest
           puts
           print_info(test_runner.exception)
         else
-          after_test(red('E'))
+          test_result(red('E'))
         end
       end
 
@@ -157,7 +157,7 @@ module MiniTest
         end
       end
 
-      def after_test(result)
+      def test_result(result)
         time = Time.now - (runner.test_start_time || Time.now)
         @test_times << [@test_name, time]
 

data/lib/minitest/reporters/progress_reporter.rb

@@ -43,7 +43,7 @@ module MiniTest
         }, true)
       end
 
-      def pass(suite, test, test_runner)
+      def after_test(suite, test)
         increment
       end
 
@@ -57,7 +57,6 @@ module MiniTest
         end
 
         self.color = YELLOW unless color == RED
-        increment
       end
 
       def failure(suite, test, test_runner)
@@ -69,7 +68,6 @@ module MiniTest
         puts
 
         self.color = RED
-        increment
       end
 
       def error(suite, test, test_runner)
@@ -81,7 +79,6 @@ module MiniTest
         puts
 
         self.color = RED
-        increment
       end
 
       def after_suites(suites, type)

data/lib/minitest/reporters/rubymine_reporter.rb

@@ -95,24 +95,25 @@ else
           log(@message_factory.create_test_started(test, minitest_test_location(fqn)))
         end
 
-        def pass(suite, test, test_runner)
-          test_finished(test, test_runner)
+        def after_test(suite, test)
+          duration_ms = get_current_time_in_ms() - get_time_in_ms(runner.test_start_time || Time.now)
+          log(@message_factory.create_test_finished(test, duration_ms.nil? ? 0 : duration_ms))
         end
 
         def skip(suite, test, test_runner)
-          test_finished(test, test_runner) do |exception_msg, backtrace|
+          with_result(test, test_runner) do |exception_msg, backtrace|
             log(@message_factory.create_test_ignored(test, exception_msg, backtrace))
           end
         end
 
         def failure(suite, test, test_runner)
-          test_finished(test, test_runner) do |exception_msg, backtrace|
+          with_result(test, test_runner) do |exception_msg, backtrace|
             log(@message_factory.create_test_failed(test, exception_msg, backtrace))
           end
         end
 
         def error(suite, test, test_runner)
-          test_finished(test, test_runner) do |exception_msg, backtrace|
+          with_result(test, test_runner) do |exception_msg, backtrace|
             log(@message_factory.create_test_error(test, exception_msg, backtrace))
           end
         end
@@ -132,23 +133,14 @@ else
           "ruby_minitest_qn://#{fqn}"
         end
 
-        def test_finished(test, test_runner)
-          duration_ms = get_current_time_in_ms() - get_time_in_ms(runner.test_start_time || Time.now)
-
-          begin
-            if block_given?
-              exception = test_runner.exception
-              msg = exception.nil? ? "" : "#{exception.class.name}: #{exception.message}"
-              backtrace = exception.nil? ? "" : filter_backtrace(exception.backtrace).join("\n")
+        def with_result(test, test_runner)
+          exception = test_runner.exception
+          msg = exception.nil? ? "" : "#{exception.class.name}: #{exception.message}"
+          backtrace = exception.nil? ? "" : filter_backtrace(exception.backtrace).join("\n")
 
-              yield(msg, backtrace)
-            end
-          ensure
-            log(@message_factory.create_test_finished(test, duration_ms.nil? ? 0 : duration_ms))
-          end
+          yield(msg, backtrace)
         end
       end
     end
   end
 end
-

data/lib/minitest/reporters/version.rb

@@ -1,5 +1,5 @@
 module MiniTest
   module Reporters
-    VERSION = "0.14.5"
+    VERSION = "0.14.6"
   end
 end

data/test/unit/minitest/reporter_test.rb

@@ -12,7 +12,7 @@ module MiniTestReportersTest
 
     def test_callbacks
       [
-        :before_suites, :after_suite, :before_suite, :after_suite, :before_test,
+        :before_suites, :after_suite, :before_suite, :after_suite, :before_test, :after_test,
         :pass, :skip, :failure, :error
       ].each { |method| assert_respond_to @reporter, method }
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minitest-reporters
 version: !ruby/object:Gem::Version
-  version: 0.14.5
+  version: 0.14.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-23 00:00:00.000000000 Z
+date: 2013-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -164,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2644503825152626631
+      hash: -1921564833427206097
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -173,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2644503825152626631
+      hash: -1921564833427206097
 requirements: []
 rubyforge_project: minitest-reporters
 rubygems_version: 1.8.24