minitest 5.10.3 → 5.18.0

data/test/minitest/test_minitest_reporter.rb

@@ -1,35 +1,36 @@
 require "minitest/autorun"
 require "minitest/metametameta"
+require "forwardable"
+
+class Runnable
+  def woot
+    assert true
+  end
+end
 
 class TestMinitestReporter < MetaMetaMetaTestCase
 
   attr_accessor :r, :io
 
   def new_composite_reporter
+    # Ruby bug in older versions of 2.2 & 2.3 on all platforms
+    # Latest Windows builds were 2.2.6 and 2.3.3.  Latest Ruby releases were
+    # 2.2.10 and 2.3.8.
+    skip if windows? && RUBY_VERSION < '2.4'
     reporter = Minitest::CompositeReporter.new
     reporter << Minitest::SummaryReporter.new(self.io)
     reporter << Minitest::ProgressReporter.new(self.io)
 
-    def reporter.first
-      reporters.first
-    end
-
-    def reporter.results
-      first.results
-    end
-
-    def reporter.count
-      first.count
-    end
-
-    def reporter.assertions
-      first.assertions
-    end
+    # eg reporter.results -> reporters.first.results
+    reporter.extend Forwardable
+    reporter.delegate :first => :reporters
+    reporter.delegate %i[results count assertions options to_s] => :first
 
     reporter
   end
 
   def setup
+    super
     self.io = StringIO.new("")
     self.r  = new_composite_reporter
   end
@@ -42,6 +43,7 @@ class TestMinitestReporter < MetaMetaMetaTestCase
                                                     rescue => e
                                                       e
                                                     end)
+      @et = Minitest::Result.from @et
     end
     @et
   end
@@ -54,12 +56,13 @@ class TestMinitestReporter < MetaMetaMetaTestCase
                         rescue Minitest::Assertion => e
                           e
                         end
+      @ft = Minitest::Result.from @ft
     end
     @ft
   end
 
   def passing_test
-    @pt ||= Minitest::Test.new(:woot)
+    @pt ||= Minitest::Result.from Minitest::Test.new(:woot)
   end
 
   def skip_test
@@ -70,6 +73,7 @@ class TestMinitestReporter < MetaMetaMetaTestCase
                       rescue Minitest::Assertion => e
                         e
                       end
+      @st = Minitest::Result.from @st
     end
     @st
   end
@@ -77,17 +81,35 @@ class TestMinitestReporter < MetaMetaMetaTestCase
   def test_to_s
     r.record passing_test
     r.record fail_test
-    assert_match "woot", r.first.to_s
+    assert_match "woot", r.to_s
+  end
+
+  def test_options_skip_F
+    r.options[:skip] = "F"
+
+    r.record passing_test
+    r.record fail_test
+
+    refute_match "woot", r.to_s
+  end
+
+  def test_options_skip_E
+    r.options[:skip] = "E"
+
+    r.record passing_test
+    r.record error_test
+
+    refute_match "RuntimeError: no", r.to_s
   end
 
   def test_passed_eh_empty
-    assert r.passed?
+    assert_predicate r, :passed?
   end
 
   def test_passed_eh_failure
     r.results << fail_test
 
-    refute r.passed?
+    refute_predicate r, :passed?
   end
 
   SKIP_MSG = "\n\nYou have skipped tests. Run with --verbose for details."
@@ -97,7 +119,7 @@ class TestMinitestReporter < MetaMetaMetaTestCase
 
     r.results << error_test
 
-    refute r.passed?
+    refute_predicate r, :passed?
 
     r.report
 
@@ -117,7 +139,7 @@ class TestMinitestReporter < MetaMetaMetaTestCase
   end
 
   def test_passed_eh_skipped_verbose
-    r.first.options[:verbose] = true
+    r.options[:verbose] = true
 
     r.start
     r.results << skip_test
@@ -145,6 +167,7 @@ class TestMinitestReporter < MetaMetaMetaTestCase
   end
 
   def test_record_fail
+    fail_test = self.fail_test
     r.record fail_test
 
     assert_equal "F", io.string
@@ -154,6 +177,7 @@ class TestMinitestReporter < MetaMetaMetaTestCase
   end
 
   def test_record_error
+    error_test = self.error_test
     r.record error_test
 
     assert_equal "E", io.string
@@ -163,6 +187,7 @@ class TestMinitestReporter < MetaMetaMetaTestCase
   end
 
   def test_record_skip
+    skip_test = self.skip_test
     r.record skip_test
 
     assert_equal "S", io.string