minitest-reporters 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6df7029f8bdc85161a699f171c63188294697f30c9f30d2cc5e1c037327f89b6
-  data.tar.gz: 33152f2bb9e62f0fc82b75ecfbf5b8828841520bee19c07472c87cb42ed5d013
+  metadata.gz: fd189c42b4c7adcec48a0ce3db5a5abe59dd6d766ef6b9d69b7bca10a305a8ba
+  data.tar.gz: 63c9745d9d6a1de4492434dea58ecf37b78ce3f5df2bdc0dc159915914dc2235
 SHA512:
-  metadata.gz: e60635e176c44f1504139d257ea3e64f902e7af7776d5ff0d9f7609c3f615af69e3e8656ff90152dc5867efa78697e2360328b3d0933a40af3df5b14a55beb8a
-  data.tar.gz: 877e5258ea73baaf4c1f9016bdc5f8d2b3aecc124ec6f69d760b6707d7e6e98da52e02a01b8989101511dd1d81235dd5d86e33e0b0acd65a7a1a92810c9940a2
+  metadata.gz: 676d1065ac7070eb24a1824f8fc914e243281538ad0c8c7c6db24cb5529e395e1992f685562f061628e50ee394d0ce47f09e1f54d9350034be2f3130765288a1
+  data.tar.gz: e6c1ecb07353173d26b3546af1591ec63d1684d3bb66c4740b3b52172ee8ec701e42a831cae19cd2d7263401d61b5e7d96bbbcbe5087b21dbbfb7fccb4410c0a

data/.rubocop.yml

@@ -13,7 +13,7 @@ Lint:
 
 Metrics:
   Severity: refactor
-  Enabled: true
+  Enabled: false
 
 Metrics/LineLength:
   Severity: convention
@@ -36,15 +36,37 @@ Security:
 
 #todo: enable
 Style:
-  Enabled: false
+  Enabled: true
 
 Style/FormatStringToken:
   Enabled: false
 
+Style/IfUnlessModifier:
+  Enabled: false
+
 #todo: enable
 Style/StringLiterals:
   Enabled: false
 
+Style/TrailingCommaInHashLiteral:
+  EnforcedStyleForMultiline: comma
+
+#todo: enable
+Style/HashSyntax:
+  Enabled: false
+
+#todo: enable
+Style/FormatString:
+  Enabled: false
+
+#todo: enable
+Style/ClassVars:
+  Enabled: false
+
+#todo: enable
+Style/Alias:
+  Enabled: false
+
 Style/Documentation:
   Enabled: false
 

data/CHANGELOG.md

@@ -1,4 +1,9 @@
-### [dev](https://github.com/kern/minitest-reporters/compare/v1.3.2...master)
+### [dev](https://github.com/kern/minitest-reporters/compare/v1.3.3...master)
+
+### [1.3.3](https://github.com/kern/minitest-reporters/compare/v1.3.2...v1.3.3)
+
+* fixed problem with default report paths for MeanTimeReporter [#269](https://github.com/kern/minitest-reporters/pull/269)
+  contributed by [duonoid](https://github.com/duonoid)
 
 ### [1.3.2](https://github.com/kern/minitest-reporters/compare/v1.3.2.beta2...v1.3.2)
 

data/lib/minitest/reporters/base_reporter.rb

@@ -28,10 +28,10 @@ module Minitest
 
         suite_changed = last_test.nil? || last_test.name != test.class.name
 
-        if suite_changed
-          after_suite(last_test) if last_test
-          before_suite(test.class)
-        end
+        return unless suite_changed
+
+        after_suite(last_test) if last_test
+        before_suite(test.class)
       end
 
       def record(test)
@@ -40,8 +40,7 @@ module Minitest
       end
 
       # called by our own after hooks
-      def after_test(_test)
-      end
+      def after_test(_test); end
 
       def report
         super
@@ -50,11 +49,9 @@ module Minitest
 
       protected
 
-      def after_suite(test)
-      end
+      def after_suite(test); end
 
-      def before_suite(test)
-      end
+      def before_suite(test); end
 
       def result(test)
         if test.error?
@@ -115,10 +112,10 @@ module Minitest
 
         # 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.
-        unless e.is_a?(MiniTest::UnexpectedError)
-          trace = filter_backtrace(e.backtrace)
-          trace.each { |line| print_with_info_padding(line) }
-        end
+        return if e.is_a?(MiniTest::UnexpectedError)
+
+        trace = filter_backtrace(e.backtrace)
+        trace.each { |line| print_with_info_padding(line) }
       end
     end
   end

data/lib/minitest/reporters/html_reporter.rb

@@ -62,7 +62,7 @@ module Minitest
           :erb_template    => "#{File.dirname(__FILE__)}/../templates/index.html.erb",
           :reports_dir     => 'test/html_reports',
           :mode            => :safe,
-          :output_filename => 'index.html'
+          :output_filename => 'index.html',
         }
 
         settings = defaults.merge(args)

data/lib/minitest/reporters/mean_time_reporter.rb

@@ -124,8 +124,8 @@ module Minitest
           show_progress:          true,
           show_all_runs:          true,
           sort_column:            :avg,
-          previous_runs_filename: Dir.tmpdir + '/minitest_reporters_previous_run',
-          report_filename:        Dir.tmpdir + 'minitest_reporters_report'
+          previous_runs_filename: File.join(Dir.tmpdir, 'minitest_reporters_previous_run'),
+          report_filename:        File.join(Dir.tmpdir, 'minitest_reporters_report'),
         }
       end
 

data/lib/minitest/reporters/progress_reporter.rb

@@ -13,20 +13,20 @@ module Minitest
       include RelativePosition
       include ANSI::Code
 
-      PROGRESS_MARK = '='
+      PROGRESS_MARK = '='.freeze
 
       def initialize(options = {})
         super
         @detailed_skip = options.fetch(:detailed_skip, true)
 
-        @progress = ProgressBar.create({
+        @progress = ProgressBar.create(
           total:          total_count,
           starting_at:    count,
           progress_mark:  green(PROGRESS_MARK),
           remainder_mark: ' ',
           format:         options.fetch(:format, '  %C/%c: [%B] %p%% %a, %e'),
           autostart:      false
-        })
+        )
       end
 
       def start

data/lib/minitest/reporters/version.rb

@@ -1,5 +1,5 @@
 module Minitest
   module Reporters
-    VERSION = '1.3.2'.freeze
+    VERSION = '1.3.3'.freeze
   end
 end

data/test/integration/reporters/progress_reporter_test.rb

@@ -5,7 +5,7 @@ module MinitestReportersTest
     def test_all_failures_are_displayed
       fixtures_directory = File.expand_path('../../../fixtures', __FILE__)
       test_filename = File.join(fixtures_directory, 'progress_test.rb')
-      output = `ruby #{test_filename} 2>&1`
+      output = `#{ruby_executable} #{test_filename} 2>&1`
       assert_match 'ERROR["test_error"', output, 'Errors should be displayed'
       assert_match 'FAIL["test_failure"', output, 'Failures should be displayed'
       assert_match 'SKIP["test_skip', output, 'Skipped tests should be displayed'
@@ -13,7 +13,7 @@ module MinitestReportersTest
     def test_skipped_tests_are_not_displayed
       fixtures_directory = File.expand_path('../../../fixtures', __FILE__)
       test_filename = File.join(fixtures_directory, 'progress_detailed_skip_test.rb')
-      output = `ruby #{test_filename} 2>&1`
+      output = `#{ruby_executable} #{test_filename} 2>&1`
       assert_match 'ERROR["test_error"', output, 'Errors should be displayed'
       assert_match 'FAIL["test_failure"', output, 'Failures should be displayed'
       refute_match 'SKIP["test_skip', output, 'Skipped tests should not be displayed'
@@ -21,14 +21,20 @@ module MinitestReportersTest
     def test_progress_works_with_filter_and_specs
       fixtures_directory = File.expand_path('../../../fixtures', __FILE__)
       test_filename = File.join(fixtures_directory, 'spec_test.rb')
-      output = `ruby #{test_filename} -n /length/ 2>&1`
+      output = `#{ruby_executable} #{test_filename} -n /length/ 2>&1`
       refute_match '0 out of 0', output, 'Progress should not puts a warning'
     end
     def test_progress_works_with_strict_filter
       fixtures_directory = File.expand_path('../../../fixtures', __FILE__)
       test_filename = File.join(fixtures_directory, 'spec_test.rb')
-      output = `ruby #{test_filename} -n /^test_0001_works$/ 2>&1`
+      output = `#{ruby_executable} #{test_filename} -n /^test_0001_works$/ 2>&1`
       refute_match '0 out of 0', output, 'Progress should not puts a warning'
     end
+
+    private
+
+    def ruby_executable
+      defined?(JRUBY_VERSION) ? 'jruby' : 'ruby'
+    end
   end
 end

data/test/unit/minitest/mean_time_reporter_unit_test.rb

@@ -1,10 +1,18 @@
 require_relative '../../test_helper'
+require "ostruct"
 
 module MinitestReportersTest
   class MeanTimeReporterUnitTest < Minitest::Test
     def setup
+      @test_data = []
+      @test_data << { name: 'MIDDLE',  prev_time: 5.0,  cur_time: 5.0 }
+      @test_data << { name: 'MIN_FAST', prev_time: 0.5,  cur_time: 3.5 }
+      @test_data << { name: 'MIN_SLOW', prev_time: 10.5, cur_time: 10.5 }
+      @test_data << { name: 'MAX_FAST', prev_time: 1.2,  cur_time: 0.9 }
+      @test_data << { name: 'MAX_SLOW', prev_time: 16.3, cur_time: 6.3 }
+      @test_data << { name: 'AVG_FAST', prev_time: 1.3,  cur_time: 0.65 }
+      @test_data << { name: 'AVG_SLOW', prev_time: 10.2, cur_time: 14.2 }
       configure_report_paths
-      previous_test_run
     end
 
     def teardown
@@ -12,8 +20,17 @@ module MinitestReportersTest
       File.delete(@report_file_path) if File.exist?(@report_file_path)
     end
 
+    def test_defaults
+      subject = Minitest::Reporters::MeanTimeReporter.new.send(:defaults)
+
+      expected_prefix = "#{Dir.tmpdir}#{File::Separator}"
+      assert_match expected_prefix, subject[:previous_runs_filename]
+      assert_match expected_prefix, subject[:report_filename]
+    end
+
     def test_sorts_avg_numerically
-      report_output = generate_report(:avg)
+      prev_output = generate_report(:avg, :prev_time)
+      report_output = generate_report(:avg, :cur_time)
 
       expected_order = [
         'AVG_SLOW',
@@ -24,11 +41,12 @@ module MinitestReportersTest
         'MAX_FAST',
         'AVG_FAST'
       ]
-      verify_result_order(report_output, expected_order)
+      verify_result_order(report_output, expected_order, prev_output)
     end
 
     def test_sorts_min_numerically
-      report_output = generate_report(:min)
+      prev_output = generate_report(:min, :prev_time)
+      report_output = generate_report(:min, :cur_time)
 
       expected_order = [
         'MIN_SLOW',
@@ -39,11 +57,12 @@ module MinitestReportersTest
         'AVG_FAST',
         'MIN_FAST'
       ]
-      verify_result_order(report_output, expected_order)
+      verify_result_order(report_output, expected_order, prev_output)
     end
 
     def test_sorts_max_numerically
-      report_output = generate_report(:max)
+      prev_output = generate_report(:max, :prev_time)
+      report_output = generate_report(:max, :cur_time)
 
       expected_order = [
         'MAX_SLOW',
@@ -54,11 +73,12 @@ module MinitestReportersTest
         'AVG_FAST',
         'MAX_FAST'
       ]
-      verify_result_order(report_output, expected_order)
+      verify_result_order(report_output, expected_order, prev_output)
     end
 
     def test_sorts_last_numerically
-      report_output = generate_report(:last)
+      prev_output = generate_report(:last, :prev_time)
+      report_output = generate_report(:last, :cur_time)
 
       expected_order = [
         'AVG_SLOW',
@@ -69,7 +89,7 @@ module MinitestReportersTest
         'MAX_FAST',
         'AVG_FAST'
       ]
-      verify_result_order(report_output, expected_order)
+      verify_result_order(report_output, expected_order, prev_output)
     end
 
     private
@@ -80,27 +100,9 @@ module MinitestReportersTest
       Minitest::Reporters.stub(:clock_time, base_clock_time - run_time) do
         @reporter.before_suite(test_suite)
       end
-      @reporter.after_suite(test_suite)
-    end
-
-    def previous_test_run
-      @reporter = Minitest::Reporters::MeanTimeReporter.new(
-        previous_runs_filename: @previous_run_path,
-        report_filename: @report_file_path
-      )
-
-      simulate_suite_runtime('MIDDLE', 5.0)
-      simulate_suite_runtime('MIN_FAST', 0.5)
-      simulate_suite_runtime('MIN_SLOW', 10.5)
-      simulate_suite_runtime('MAX_FAST', 1.2)
-      simulate_suite_runtime('MAX_SLOW', 16.3)
-      simulate_suite_runtime('AVG_FAST', 1.3)
-      simulate_suite_runtime('AVG_SLOW', 10.2)
-      @reporter.tests << Minitest::Test.new('Final')
-      # Generate a "previous" run
-      @reporter.io = StringIO.new
-      @reporter.start
-      @reporter.report
+      Minitest::Reporters.stub(:clock_time, base_clock_time) do
+        @reporter.after_suite(test_suite)
+      end
     end
 
     def configure_report_paths
@@ -114,20 +116,14 @@ module MinitestReportersTest
       report_file.delete
     end
 
-    def generate_report(sort_column)
+    def generate_report(sort_column, time_name)
       # Reset the reporter for the test run
       @reporter = Minitest::Reporters::MeanTimeReporter.new(
         previous_runs_filename: @previous_run_path,
         report_filename: @report_file_path,
         sort_column: sort_column
       )
-      simulate_suite_runtime('MIDDLE', 5.0)
-      simulate_suite_runtime('MIN_FAST', 3.5)
-      simulate_suite_runtime('MIN_SLOW', 10.5)
-      simulate_suite_runtime('MAX_FAST', 0.9)
-      simulate_suite_runtime('MAX_SLOW', 6.3)
-      simulate_suite_runtime('AVG_FAST', 0.65)
-      simulate_suite_runtime('AVG_SLOW', 14.2)
+      @test_data.each { |hash| simulate_suite_runtime(hash[:name], hash[time_name])}
       @reporter.tests << Minitest::Test.new('Final')
 
       report_output = StringIO.new
@@ -137,16 +133,22 @@ module MinitestReportersTest
       report_output
     end
 
-    def verify_result_order(report_output, expected_order)
-      report_output.rewind
-      test_lines = report_output.read.split("\n")
-      test_lines.select! { |line| line.start_with?('Avg:') }
+    def verify_result_order(report_output, expected_order, prev_output)
+      prev_lines = extract_test_lines(prev_output)
+      test_lines = extract_test_lines(report_output)
 
-      # Exclude the final placeholder 0 second test from assertions
-      test_lines.reject! { |line| line.end_with?('Minitest::Test') }
       actual_order = test_lines.map { |line| line.gsub(/.*Description: /, '') }
 
-      assert_equal(expected_order, actual_order, "\n#{test_lines.join("\n")}")
+      assert_equal(expected_order, actual_order, "\nCurrent report:\n#{test_lines.join("\n")}\n\nPrevious report:\n#{prev_lines.join("\n")}")
+    end
+
+    def extract_test_lines(report_output)
+      report_output.rewind
+      test_lines = report_output.read.split("\n")
+      test_lines.select! {|line| line.start_with?('Avg:')}
+      # Exclude the final placeholder 0 second test from assertions
+      test_lines.reject! {|line| line.end_with?('Minitest::Test')}
+      test_lines
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minitest-reporters
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Alexander Kern
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-17 00:00:00.000000000 Z
+date: 2018-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest