minitest-reporters 1.2.0.beta1 → 1.2.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adfc5700b67227ab5180b5a2001001bd975c7232
-  data.tar.gz: 9eee008600469f3a738a908ee9c1993e71a86716
+  metadata.gz: 62f787588456a19e8d7f3c259964eb08bb800cb6
+  data.tar.gz: 57f0b830502a46809f639a0000ac6b465c94163f
 SHA512:
-  metadata.gz: 42c148e215d8260219c66068b84c6d72652e9077ba46a9e84ad1f49e108212a835ab99d85820ffb660d68a9b76e88d6e00efa9f03366ba60607fcfcce0f4eae1
-  data.tar.gz: b08134e33921394f6affc2c5e60de1339bc607ea31dbd8c06f5e42f20c1fa9df586b345897e4eeb928226163da162d1b63037d926adb182a0e0caa5f6f10110e
+  metadata.gz: 850a2e0aa57a50ff1603f4d4aab3904aa57a93eef0d126080879ce8fdac468d1c2dc95df58d1844387af3d79d10398c93653212390b2c5731587a7d8a175ebc3
+  data.tar.gz: 7ee01ec3c6f529936d5d762c833980b45758d70b0b34321cb3f8a9a10dd2f48479c2ff674128d7c3cfc81faac330097e5c2eef494d6215b922712a65fd143097

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### [v1.2.0.beta2](https://github.com/kern/minitest-reporters/compare/v1.2.0.beta1...v1.2.0.beta2)
+
+* fixed uninitialized time in junit reporter [#251](https://github.com/kern/minitest-reporters/issues/251)
+* format option added to progress reporter [#240](https://github.com/kern/minitest-reporters/pull/240) (contributed by [jorgesmu](https://github.com/jorgesmu))
+* improved output of junit reporter [#245](https://github.com/kern/minitest-reporters/pull/245) (contributed by [jules2689](https://github.com/jules2689))
+
 ### [1.2.0.beta1](https://github.com/kern/minitest-reporters/compare/v1.1.19...v1.2.0.beta1)
 
 * SpecReporter regression for Minitest 5.11.1 fixed [#250](https://github.com/kern/minitest-reporters/pull/250) (contrinuted by [mbround18](https://github.com/mbround18))

data/lib/minitest/reporters/junit_reporter.rb

@@ -13,6 +13,7 @@ module Minitest
         super({})
         @reports_path = File.absolute_path(reports_dir)
         @single_file = options[:single_file]
+        @base_path = options[:base_path] || Dir.pwd
 
         if empty
           puts "Emptying #{@reports_path}"
@@ -28,33 +29,46 @@ module Minitest
         suites = tests.group_by(&:class)
 
         if @single_file
-          write_xml_file_for("minitest", tests.group_by(&:class).values.flatten)
+          xml = Builder::XmlMarkup.new(:indent => 2)
+          xml.instruct!
+          xml.test_suites do
+            suites.each do |suite, tests|
+              parse_xml_for(xml, suite, tests)
+            end
+          end
+          File.open(filename_for('minitest'), "w") { |file| file << xml.target! }
         else
           suites.each do |suite, tests|
-            write_xml_file_for(suite, tests)
+            xml = Builder::XmlMarkup.new(:indent => 2)
+            xml.instruct!
+            xml.test_suites do
+              parse_xml_for(xml, suite, tests)
+            end
+            File.open(filename_for(suite), "w") { |file| file << @xml.target! }
           end
         end
-
       end
 
       private
 
-      def write_xml_file_for(suite, tests)
+      def parse_xml_for(xml, suite, tests)
         suite_result = analyze_suite(tests)
+        file_path = Pathname.new(tests.first.method(tests.first.name).source_location.first)
+        base_path = Pathname.new(@base_path)
+        relative_path = file_path.relative_path_from(base_path)
 
-        xml = Builder::XmlMarkup.new(:indent => 2)
-        xml.instruct!
-        xml.testsuite(:name => suite, :skipped => suite_result[:skip_count], :failures => suite_result[:fail_count],
+        xml.testsuite(:name => suite, :filepath => relative_path,
+                      :skipped => suite_result[:skip_count], :failures => suite_result[:fail_count],
                       :errors => suite_result[:error_count], :tests => suite_result[:test_count],
                       :assertions => suite_result[:assertion_count], :time => suite_result[:time]) do
           tests.each do |test|
-            xml.testcase(:name => test.name, :classname => suite, :assertions => test.assertions,
+            lineno = test.method(test.name).source_location.last
+            xml.testcase(:name => test.name, :lineno => lineno, :classname => suite, :assertions => test.assertions,
                          :time => test.time) do
               xml << xml_message_for(test) unless test.passed?
             end
           end
         end
-        File.open(filename_for(suite), "w") { |file| file << xml.target! }
       end
 
       def xml_message_for(test)
@@ -107,6 +121,7 @@ module Minitest
 
       def analyze_suite(tests)
         result = Hash.new(0)
+        result[:time] = 0
         tests.each do |test|
           result[:"#{result(test)}_count"] += 1
           result[:assertion_count] += test.assertions

data/lib/minitest/reporters/progress_reporter.rb

@@ -24,7 +24,7 @@ module Minitest
           starting_at:    count,
           progress_mark:  green(PROGRESS_MARK),
           remainder_mark: ' ',
-          format:         '  %C/%c: [%B] %p%% %a, %e',
+          format:         options.fetch(:format, '  %C/%c: [%B] %p%% %a, %e'),
           autostart:      false
         })
       end

data/lib/minitest/reporters/version.rb

@@ -1,5 +1,5 @@
 module Minitest
   module Reporters
-    VERSION = '1.2.0.beta1'
+    VERSION = '1.2.0.beta2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minitest-reporters
 version: !ruby/object:Gem::Version
-  version: 1.2.0.beta1
+  version: 1.2.0.beta2
 platform: ruby
 authors:
 - Alexander Kern