minitest-reporters 1.3.6 → 1.3.7

data/lib/minitest/reporters/ansi.rb

@@ -1,30 +1,30 @@
-module Minitest
-  module Reporters
-    module ANSI
-      module Code
-        def self.color?
-          return false if ENV['MINITEST_REPORTERS_MONO']
-          color_terminal = ENV['TERM'].to_s.downcase.include?("color")
-          $stdout.tty? || color_terminal
-        end
-
-        if color?
-          require 'ansi/code'
-
-          include ::ANSI::Code
-          extend ::ANSI::Code
-        else
-          def black(s = nil)
-            block_given? ? yield : s
-          end
-
-          %w[red green yellow blue magenta cyan white].each do |color|
-            alias_method color, :black
-          end
-
-          extend self
-        end
-      end
-    end
-  end
-end
+module Minitest
+  module Reporters
+    module ANSI
+      module Code
+        def self.color?
+          return false if ENV['MINITEST_REPORTERS_MONO']
+          color_terminal = ENV['TERM'].to_s.downcase.include?("color")
+          $stdout.tty? || color_terminal
+        end
+
+        if color?
+          require 'ansi/code'
+
+          include ::ANSI::Code
+          extend ::ANSI::Code
+        else
+          def black(s = nil)
+            block_given? ? yield : s
+          end
+
+          %w[red green yellow blue magenta cyan white].each do |color|
+            alias_method color, :black
+          end
+
+          extend self
+        end
+      end
+    end
+  end
+end

data/lib/minitest/reporters/base_reporter.rb

@@ -1,136 +1,136 @@
-module Minitest
-  module Reporters
-    class Suite
-      attr_reader :name
-      def initialize(name)
-        @name = name
-      end
-
-      def ==(other)
-        name == other.name
-      end
-
-      def eql?(other)
-        self == other
-      end
-
-      def hash
-        name.hash
-      end
-
-      def to_s
-        name.to_s
-      end
-    end
-    class BaseReporter < Minitest::StatisticsReporter
-      attr_accessor :tests
-
-      def initialize(options = {})
-        super($stdout, options)
-        self.tests = []
-      end
-
-      def add_defaults(defaults)
-        self.options = defaults.merge(options)
-      end
-
-      # called by our own before hooks
-      def before_test(test)
-        last_test = test_class(tests.last)
-
-        suite_changed = last_test.nil? || last_test.name != test.class.name
-
-        return unless suite_changed
-
-        after_suite(last_test) if last_test
-        before_suite(test_class(test))
-      end
-
-      def record(test)
-        super
-        tests << test
-      end
-
-      # called by our own after hooks
-      def after_test(_test); end
-
-      def report
-        super
-        if last_suite = test_class(tests.last)
-          after_suite(last_suite)
-        end
-      end
-
-      protected
-
-      def after_suite(test); end
-
-      def before_suite(test); end
-
-      def result(test)
-        if test.error?
-          :error
-        elsif test.skipped?
-          :skip
-        elsif test.failure
-          :fail
-        else
-          :pass
-        end
-      end
-
-      def test_class(result)
-        # Minitest broke API between 5.10 and 5.11 this gets around Result object
-        if result.nil?
-          nil
-        elsif result.respond_to? :klass
-          Suite.new(result.klass)
-        else
-          Suite.new(result.class.name)
-        end
-      end
-
-      def print_colored_status(test)
-        if test.passed?
-          print(green { pad_mark(result(test).to_s.upcase) })
-        elsif test.skipped?
-          print(yellow { pad_mark(result(test).to_s.upcase) })
-        else
-          print(red { pad_mark(result(test).to_s.upcase) })
-        end
-      end
-
-      def total_time
-        super || Minitest::Reporters.clock_time - start_time
-      end
-
-      def total_count
-        options[:total_count]
-      end
-
-      def filter_backtrace(backtrace)
-        Minitest.filter_backtrace(backtrace)
-      end
-
-      def puts(*args)
-        io.puts(*args)
-      end
-
-      def print(*args)
-        io.print(*args)
-      end
-
-      def print_info(e, name = true)
-        print "#{e.exception.class}: " if name
-        e.message.each_line { |line| print_with_info_padding(line) }
-
-        # When e is a Minitest::UnexpectedError, the filtered backtrace is already part of the message printed out
-        # by the previous line. In that case, and that case only, skip the backtrace output.
-        return if e.is_a?(MiniTest::UnexpectedError)
-
-        trace = filter_backtrace(e.backtrace)
-        trace.each { |line| print_with_info_padding(line) }
-      end
-    end
-  end
-end
+module Minitest
+  module Reporters
+    class Suite
+      attr_reader :name
+      def initialize(name)
+        @name = name
+      end
+
+      def ==(other)
+        name == other.name
+      end
+
+      def eql?(other)
+        self == other
+      end
+
+      def hash
+        name.hash
+      end
+
+      def to_s
+        name.to_s
+      end
+    end
+    class BaseReporter < Minitest::StatisticsReporter
+      attr_accessor :tests
+
+      def initialize(options = {})
+        super($stdout, options)
+        self.tests = []
+      end
+
+      def add_defaults(defaults)
+        self.options = defaults.merge(options)
+      end
+
+      # called by our own before hooks
+      def before_test(test)
+        last_test = test_class(tests.last)
+
+        suite_changed = last_test.nil? || last_test.name != test.class.name
+
+        return unless suite_changed
+
+        after_suite(last_test) if last_test
+        before_suite(test_class(test))
+      end
+
+      def record(test)
+        super
+        tests << test
+      end
+
+      # called by our own after hooks
+      def after_test(_test); end
+
+      def report
+        super
+        if last_suite = test_class(tests.last)
+          after_suite(last_suite)
+        end
+      end
+
+      protected
+
+      def after_suite(test); end
+
+      def before_suite(test); end
+
+      def result(test)
+        if test.error?
+          :error
+        elsif test.skipped?
+          :skip
+        elsif test.failure
+          :fail
+        else
+          :pass
+        end
+      end
+
+      def test_class(result)
+        # Minitest broke API between 5.10 and 5.11 this gets around Result object
+        if result.nil?
+          nil
+        elsif result.respond_to? :klass
+          Suite.new(result.klass)
+        else
+          Suite.new(result.class.name)
+        end
+      end
+
+      def print_colored_status(test)
+        if test.passed?
+          print(green { pad_mark(result(test).to_s.upcase) })
+        elsif test.skipped?
+          print(yellow { pad_mark(result(test).to_s.upcase) })
+        else
+          print(red { pad_mark(result(test).to_s.upcase) })
+        end
+      end
+
+      def total_time
+        super || Minitest::Reporters.clock_time - start_time
+      end
+
+      def total_count
+        options[:total_count]
+      end
+
+      def filter_backtrace(backtrace)
+        Minitest.filter_backtrace(backtrace)
+      end
+
+      def puts(*args)
+        io.puts(*args)
+      end
+
+      def print(*args)
+        io.print(*args)
+      end
+
+      def print_info(e, name = true)
+        print "#{e.exception.class}: " if name
+        e.message.each_line { |line| print_with_info_padding(line) }
+
+        # When e is a Minitest::UnexpectedError, the filtered backtrace is already part of the message printed out
+        # by the previous line. In that case, and that case only, skip the backtrace output.
+        return if e.is_a?(MiniTest::UnexpectedError)
+
+        trace = filter_backtrace(e.backtrace)
+        trace.each { |line| print_with_info_padding(line) }
+      end
+    end
+  end
+end

data/lib/minitest/reporters/default_reporter.rb

@@ -1,228 +1,228 @@
-module Minitest
-  module Reporters
-    # A reporter identical to the standard Minitest reporter except with more
-    # colors.
-    #
-    # Based upon Ryan Davis of Seattle.rb's Minitest (MIT License).
-    #
-    # @see https://github.com/seattlerb/minitest Minitest
-
-    class DefaultReporter < BaseReporter
-      include ANSI::Code
-      include RelativePosition
-
-      def initialize(options = {})
-        super
-        @detailed_skip = options.fetch(:detailed_skip, true)
-        @slow_count = options.fetch(:slow_count, 0)
-        @slow_suite_count = options.fetch(:slow_suite_count, 0)
-        @suite_times = []
-        @suite_start_times = {}
-        @fast_fail = options.fetch(:fast_fail, false)
-        @options = options
-      end
-
-      def start
-        super
-        on_start
-      end
-
-      def on_start
-        puts
-        puts("# Running tests with run options %s:" % options[:args])
-        puts
-      end
-
-      def before_test(test)
-        super
-        print "\n#{test.class}##{test.name} " if options[:verbose]
-      end
-
-      def before_suite(suite)
-        @suite_start_times[suite] = Minitest::Reporters.clock_time
-        super
-      end
-
-      def after_suite(suite)
-        super
-        duration = suite_duration(suite)
-        @suite_times << [suite.name, duration]
-      end
-
-      def record(test)
-        super
-
-        on_record(test)
-      end
-
-      def on_record(test)
-        print "#{"%.2f" % test.time} = " if options[:verbose]
-
-        # Print the pass/skip/fail mark
-        print(if test.passed?
-          record_pass(test)
-        elsif test.skipped?
-          record_skip(test)
-        elsif test.failure
-          record_failure(test)
-        end)
-
-        # Print fast_fail information
-        if @fast_fail && (test.skipped? || test.failure)
-          print_failure(test)
-        end
-      end
-
-      def record_pass(record)
-        green(record.result_code)
-      end
-
-      def record_skip(record)
-        yellow(record.result_code)
-      end
-
-      def record_failure(record)
-        red(record.result_code)
-      end
-
-      def report
-        super
-        on_report
-      end
-
-      def on_report
-        status_line = "Finished tests in %.6fs, %.4f tests/s, %.4f assertions/s." %
-          [total_time, count / total_time, assertions / total_time]
-
-        puts
-        puts
-        puts colored_for(suite_result, status_line)
-        puts
-
-        unless @fast_fail
-          tests.reject(&:passed?).each do |test|
-            print_failure(test)
-          end
-        end
-
-        if @slow_count > 0
-          slow_tests = tests.sort_by(&:time).reverse.take(@slow_count)
-
-          puts
-          puts "Slowest tests:"
-          puts
-
-          slow_tests.each do |test|
-            puts "%.6fs %s#%s" % [test.time, test.name, test_class(test)]
-          end
-        end
-
-        if @slow_suite_count > 0
-          slow_suites = @suite_times.sort_by { |x| x[1] }.reverse.take(@slow_suite_count)
-
-          puts
-          puts "Slowest test classes:"
-          puts
-
-          slow_suites.each do |slow_suite|
-            puts "%.6fs %s" % [slow_suite[1], slow_suite[0]]
-          end
-        end
-
-        puts
-        print colored_for(suite_result, result_line)
-        puts
-      end
-
-      alias to_s report
-
-      def print_failure(test)
-        message = message_for(test)
-        unless message.nil? || message.strip == ''
-          puts
-          puts colored_for(result(test), message)
-        end
-      end
-
-      private
-
-      def color?
-        return @color if defined?(@color)
-        @color = @options.fetch(:color) do
-          io.tty? && (
-            ENV["TERM"] =~ /^screen|color/ ||
-            ENV["EMACS"] == "t"
-          )
-        end
-      end
-
-      def green(string)
-        color? ? ANSI::Code.green(string) : string
-      end
-
-      def yellow(string)
-        color? ? ANSI::Code.yellow(string) : string
-      end
-
-      def red(string)
-        color? ? ANSI::Code.red(string) : string
-      end
-
-      def colored_for(result, string)
-        case result
-        when :fail, :error; red(string)
-        when :skip; yellow(string)
-        else green(string)
-        end
-      end
-
-      def suite_result
-        case
-        when failures > 0; :fail
-        when errors > 0; :error
-        when skips > 0; :skip
-        else :pass
-        end
-      end
-
-      def location(exception)
-        last_before_assertion = ''
-
-        exception.backtrace.reverse_each do |s|
-          break if s =~ /in .(assert|refute|flunk|pass|fail|raise|must|wont)/
-          last_before_assertion = s
-        end
-
-        last_before_assertion.sub(/:in .*$/, '')
-      end
-
-      def message_for(test)
-        e = test.failure
-
-        if test.skipped?
-          if @detailed_skip
-            "Skipped:\n#{test_class(test)}##{test.name} [#{location(e)}]:\n#{e.message}"
-          end
-        elsif test.error?
-          "Error:\n#{test_class(test)}##{test.name}:\n#{e.message}"
-        else
-          "Failure:\n#{test_class(test)}##{test.name} [#{test.failure.location}]\n#{e.class}: #{e.message}"
-        end
-      end
-
-      def result_line
-        '%d tests, %d assertions, %d failures, %d errors, %d skips' %
-          [count, assertions, failures, errors, skips]
-      end
-
-      def suite_duration(suite)
-        start_time = @suite_start_times.delete(suite)
-        if start_time.nil?
-          0
-        else
-          Minitest::Reporters.clock_time - start_time
-        end
-      end
-    end
-  end
-end
+module Minitest
+  module Reporters
+    # A reporter identical to the standard Minitest reporter except with more
+    # colors.
+    #
+    # Based upon Ryan Davis of Seattle.rb's Minitest (MIT License).
+    #
+    # @see https://github.com/seattlerb/minitest Minitest
+
+    class DefaultReporter < BaseReporter
+      include ANSI::Code
+      include RelativePosition
+
+      def initialize(options = {})
+        super
+        @detailed_skip = options.fetch(:detailed_skip, true)
+        @slow_count = options.fetch(:slow_count, 0)
+        @slow_suite_count = options.fetch(:slow_suite_count, 0)
+        @suite_times = []
+        @suite_start_times = {}
+        @fast_fail = options.fetch(:fast_fail, false)
+        @options = options
+      end
+
+      def start
+        super
+        on_start
+      end
+
+      def on_start
+        puts
+        puts("# Running tests with run options %s:" % options[:args])
+        puts
+      end
+
+      def before_test(test)
+        super
+        print "\n#{test.class}##{test.name} " if options[:verbose]
+      end
+
+      def before_suite(suite)
+        @suite_start_times[suite] = Minitest::Reporters.clock_time
+        super
+      end
+
+      def after_suite(suite)
+        super
+        duration = suite_duration(suite)
+        @suite_times << [suite.name, duration]
+      end
+
+      def record(test)
+        super
+
+        on_record(test)
+      end
+
+      def on_record(test)
+        print "#{"%.2f" % test.time} = " if options[:verbose]
+
+        # Print the pass/skip/fail mark
+        print(if test.passed?
+          record_pass(test)
+        elsif test.skipped?
+          record_skip(test)
+        elsif test.failure
+          record_failure(test)
+        end)
+
+        # Print fast_fail information
+        if @fast_fail && (test.skipped? || test.failure)
+          print_failure(test)
+        end
+      end
+
+      def record_pass(record)
+        green(record.result_code)
+      end
+
+      def record_skip(record)
+        yellow(record.result_code)
+      end
+
+      def record_failure(record)
+        red(record.result_code)
+      end
+
+      def report
+        super
+        on_report
+      end
+
+      def on_report
+        status_line = "Finished tests in %.6fs, %.4f tests/s, %.4f assertions/s." %
+          [total_time, count / total_time, assertions / total_time]
+
+        puts
+        puts
+        puts colored_for(suite_result, status_line)
+        puts
+
+        unless @fast_fail
+          tests.reject(&:passed?).each do |test|
+            print_failure(test)
+          end
+        end
+
+        if @slow_count > 0
+          slow_tests = tests.sort_by(&:time).reverse.take(@slow_count)
+
+          puts
+          puts "Slowest tests:"
+          puts
+
+          slow_tests.each do |test|
+            puts "%.6fs %s#%s" % [test.time, test.name, test_class(test)]
+          end
+        end
+
+        if @slow_suite_count > 0
+          slow_suites = @suite_times.sort_by { |x| x[1] }.reverse.take(@slow_suite_count)
+
+          puts
+          puts "Slowest test classes:"
+          puts
+
+          slow_suites.each do |slow_suite|
+            puts "%.6fs %s" % [slow_suite[1], slow_suite[0]]
+          end
+        end
+
+        puts
+        print colored_for(suite_result, result_line)
+        puts
+      end
+
+      alias to_s report
+
+      def print_failure(test)
+        message = message_for(test)
+        unless message.nil? || message.strip == ''
+          puts
+          puts colored_for(result(test), message)
+        end
+      end
+
+      private
+
+      def color?
+        return @color if defined?(@color)
+        @color = @options.fetch(:color) do
+          io.tty? && (
+            ENV["TERM"] =~ /^screen|color/ ||
+            ENV["EMACS"] == "t"
+          )
+        end
+      end
+
+      def green(string)
+        color? ? ANSI::Code.green(string) : string
+      end
+
+      def yellow(string)
+        color? ? ANSI::Code.yellow(string) : string
+      end
+
+      def red(string)
+        color? ? ANSI::Code.red(string) : string
+      end
+
+      def colored_for(result, string)
+        case result
+        when :fail, :error; red(string)
+        when :skip; yellow(string)
+        else green(string)
+        end
+      end
+
+      def suite_result
+        case
+        when failures > 0; :fail
+        when errors > 0; :error
+        when skips > 0; :skip
+        else :pass
+        end
+      end
+
+      def location(exception)
+        last_before_assertion = ''
+
+        exception.backtrace.reverse_each do |s|
+          break if s =~ /in .(assert|refute|flunk|pass|fail|raise|must|wont)/
+          last_before_assertion = s
+        end
+
+        last_before_assertion.sub(/:in .*$/, '')
+      end
+
+      def message_for(test)
+        e = test.failure
+
+        if test.skipped?
+          if @detailed_skip
+            "Skipped:\n#{test_class(test)}##{test.name} [#{location(e)}]:\n#{e.message}"
+          end
+        elsif test.error?
+          "Error:\n#{test_class(test)}##{test.name}:\n#{e.message}"
+        else
+          "Failure:\n#{test_class(test)}##{test.name} [#{test.failure.location}]\n#{e.class}: #{e.message}"
+        end
+      end
+
+      def result_line
+        '%d tests, %d assertions, %d failures, %d errors, %d skips' %
+          [count, assertions, failures, errors, skips]
+      end
+
+      def suite_duration(suite)
+        start_time = @suite_start_times.delete(suite)
+        if start_time.nil?
+          0
+        else
+          Minitest::Reporters.clock_time - start_time
+        end
+      end
+    end
+  end
+end