minitest-junit 1.1.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e9e6fe53a55b11d36289c47953e13279e41afff916cb27a7161d64baa61d914
-  data.tar.gz: 9311c1d71be9be105f06c0f035bd8411e74f7c3a468d77e85a9cca34b11097f7
+  metadata.gz: 28a6272dfe9b52525afbcfc9a98fa0610bca6531d685f2e1c2bb5c838ac55480
+  data.tar.gz: 561f4eb58db6d84edd0c6da41aa463f736a14984870aa7b4f00e6bdefae09133
 SHA512:
-  metadata.gz: 5fd510f4009f0c504c3d7c75f8dc8c217c61a895c92fabb912908d20ccfdfb63454152cf56257e5deb16ae499244505bfbbae768a26b9894650f1a8fa0733d9c
-  data.tar.gz: d47bf2f92fb7a8814be1a4337826cbe4e0cb803ac8f6d0a55e285b2a77e3ae642f7f2c597127300f080f25305d887b5a433da6e1906ff81dcca64d4d9734d18a
+  metadata.gz: 57482ae234635c9a5f9f697d964361b614e8d47da5a5a60e9e49ae4a7f1aab7b7771af7f902f0cbb49272c2404bd9e612913d7926a7c8c437a116d9b01dc2f58
+  data.tar.gz: 33b11351e74c51bd4ba23549165b4138837574396d08a2da97c0e33e51ae0efcf9a84c5367d1d2f328005deb66763372462ef209968b96d0ae20111a71715dfc

data/.github/workflows/main.yml

@@ -0,0 +1,34 @@
+name: Main
+on:
+  push:
+    branches: [release]
+  pull_request:
+    types: [opened, synchronize]
+
+jobs:
+  tests:
+    name: Tests
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ["2.7", "3.0", "3.1", "3.2"]
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: Generate lockfile
+        run: bundle lock
+
+      - name: Bundle
+        run: bundle check || bundle install
+
+      - name: Run tests
+        run: bundle exec rake test

data/lib/minitest/junit/version.rb

@@ -1,6 +1,6 @@
 module Minitest
   # :nodoc:
   module Junit
-    VERSION = '1.1.0'
+    VERSION = '2.0.1'
   end
 end

data/lib/minitest/junit.rb

@@ -1,6 +1,6 @@
 require 'minitest/junit/version'
 require 'minitest'
-require 'builder'
+require 'ox'
 require 'socket'
 require 'time'
 
@@ -28,36 +28,55 @@ module Minitest
       end
 
       def report
-        xml = Builder::XmlMarkup.new(:indent => 2)
-        xml.testsuite(name: 'minitest',
-                      timestamp: @options[:timestamp],
-                      hostname: @options[:hostname],
-                      tests: @results.count,
-                      skipped: @results.count { |result| result.skipped? },
-                      failures: @results.count { |result| !result.error? && result.failure },
-                      errors: @results.count { |result| result.error? },
-                      time: format_time(@results.inject(0) { |a, e| a += e.time })) do
-                        @results.each { |result| format(result, xml) }
-                      end
-        @io.puts xml.target!
+        doc = Ox::Document.new(version: '1.0', encoding: 'UTF-8')
+        instruct = Ox::Instruct.new(:xml)
+        instruct[:version] = '1.0'
+        instruct[:encoding] = 'UTF-8'
+        doc << instruct
+
+        testsuite = Ox::Element.new('testsuite')
+        testsuite['name'] = @options[:name] || 'minitest'
+        testsuite['timestamp'] = @options[:timestamp]
+        testsuite['hostname'] = @options[:hostname]
+        testsuite['tests'] = @results.size
+        testsuite['skipped'] = @results.count(&:skipped?)
+        testsuite['failures'] = @results.count { |result| !result.error? && result.failure }
+        testsuite['errors'] = @results.count(&:error?)
+        testsuite['time'] = format_time(@results.map(&:time).inject(0, :+))
+        @results.each do |result|
+          testsuite << format(result)
+        end
+
+        testsuites = Ox::Element.new('testsuites')
+        testsuites << testsuite
+
+        doc << testsuites
+        @io << Ox.dump(doc)
       end
 
       def format(result, parent = nil)
-        xml = Builder::XmlMarkup.new(:target => parent, :indent => 2)
-        xml.testcase classname: format_class(result),
-                     name: format_name(result),
-                     time: format_time(result.time),
-                     assertions: result.assertions do |t|
-          if result.skipped?
-            t.skipped message: result
-          else
-            result.failures.each do |failure|
-              type = classify failure
-              xml.tag! type, format_backtrace(failure), message: result
-            end
+        testcase = Ox::Element.new('testcase')
+        testcase['classname'] = format_class(result)
+        testcase['name'] = format_name(result)
+        testcase['time'] = format_time(result.time)
+        testcase['file'] = relative_to_cwd(result.source_location.first)
+        testcase['line'] = result.source_location.last
+        testcase['assertions'] = result.assertions
+        if result.skipped?
+          skipped = Ox::Element.new('skipped')
+          skipped['message'] = result
+          skipped << ""
+          testcase << skipped
+        else
+          result.failures.each do |failure|
+            failure_tag = Ox::Element.new(classify(failure))
+            failure_tag['message'] = result
+            failure_tag << format_backtrace(failure)
+            testcase << failure_tag
           end
         end
-        xml
+
+        testcase
       end
 
       private
@@ -70,8 +89,18 @@ module Minitest
         end
       end
 
+      def working_directory
+        @working_directory ||= Dir.getwd
+      end
+
+      def relative_to_cwd(path)
+        path.sub(working_directory, '.')
+      end
+
       def format_backtrace(failure)
-        failure.backtrace.join("\n")
+        Minitest.filter_backtrace(failure.backtrace).map do |line|
+          relative_to_cwd(line)
+        end.join("\n")
       end
 
       def format_class(result)

data/minitest-junit.gemspec

@@ -19,9 +19,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'minitest', '~> 5.11'
-  spec.add_dependency 'builder', '~> 3.2'
+  spec.add_dependency 'ox', '~> 2', '>= 2.14.2'
 
   spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rake', '~> 10.3.2'
-  spec.add_development_dependency 'rubocop', '~> 0.24.1'
+  spec.add_development_dependency 'nokogiri'
+  spec.add_development_dependency 'pry-byebug'
+  spec.add_development_dependency 'rake', '~> 13'
+  spec.add_development_dependency 'rubocop', '~> 1'
 end

data/test/reporter_test.rb

@@ -1,17 +1,34 @@
 require 'minitest/autorun'
-require 'builder'
 require 'stringio'
 require 'time'
+require 'nokogiri'
 
 require 'minitest/junit'
 
+class FakeTestName; end
+
 class ReporterTest < Minitest::Test
   def test_no_tests_generates_an_empty_suite
     reporter = create_reporter
 
     reporter.report
 
-    assert_match(/^<testsuite name="minitest" timestamp="[^"]+" hostname="[^"]+" tests="0" skipped="0" failures="0" errors="0" time="0.000000">\n<\/testsuite>\n$/, reporter.output)
+    assert_match(
+      %r{<?xml version="1.0" encoding="UTF-8"\?>\n<testsuites>\n  <testsuite name="minitest" timestamp="[^"]+" hostname="[^"]+" tests="0" skipped="0" failures="0" errors="0" time="0.000000"\/>\n<\/testsuites>\n},
+      reporter.output
+    )
+  end
+
+  # NOTE: This test will generate a temp file: "test/tmp/report.xml"
+  def test_encoding
+    # Enforce File.external_encoding to UTF-8 to ensure that ASCII character will be correctly converted to UTF-8
+    file = File.new('test/tmp/report.xml', 'w:UTF-8')
+    reporter = Minitest::Junit::Reporter.new file, { hostname: '‹foo›' }
+    reporter.start
+    reporter.report
+    file.close
+
+    assert_match(/hostname="‹foo›"/, File.new('test/tmp/report.xml', 'r:UTF-8').read)
   end
 
   def test_formats_each_successful_result_with_a_formatter
@@ -28,11 +45,23 @@ class ReporterTest < Minitest::Test
     reporter = create_reporter
 
     results = do_formatting_test(reporter, count: rand(100), cause_failures: 1)
-
+    parsed_report = Nokogiri::XML(reporter.output)
     results.each do |result|
-      assert_match("<testcase classname=\"FakeTestName\" name=\"#{result.name}\"", reporter.output)
-      assert_match(/<failure/, reporter.output)
+      parsed_report.xpath("//testcase[@name='#{result.name}']").any?
     end
+    # Check if some testcase has a failure
+    assert parsed_report.xpath("//testcase//failure").any?
+  end
+
+  def test_xml_nodes_has_file_and_line_attributes
+    reporter = create_reporter
+    results = do_formatting_test(reporter, count: 2, cause_failures: 1)
+    parsed_report = Nokogiri::XML(reporter.output)
+    example_node = parsed_report.xpath("//testcase").first
+    assert example_node.has_attribute?('file')
+    assert example_node.has_attribute?('line')
+    assert_equal 'unknown', example_node.attribute('file').value
+    assert_equal '-1', example_node.attribute('line').value
   end
 
   private
@@ -60,7 +89,7 @@ class ReporterTest < Minitest::Test
     test.failures = failures.times.map do |i|
       Class.new Minitest::Assertion do
         define_method 'backtrace' do
-          ["Model failure \##{i}", 'This is a test backtrace']
+          ["Model failure \##{i}", 'This is a test backtrace', "#{__FILE__}:#{__LINE__}"]
         end
       end.new
     end

data/test/testcase_formatter_test.rb

@@ -17,7 +17,10 @@ class TestCaseFormatter < Minitest::Test
     test = create_test_result
     reporter = create_reporter
 
-    assert_match test.name, reporter.format(test).target!
+    assert_match(
+      test.name,
+      reporter.format(test).attributes['name']
+    )
   end
 
   def test_skipped_tests_generates_skipped_tag
@@ -28,7 +31,7 @@ class TestCaseFormatter < Minitest::Test
 
     reporter.report
 
-    assert_match(/<skipped message="[^<>]+"\/>\n<\/testcase>\n<\/testsuite>\n/, reporter.output)
+    assert_match(/<skipped message="[^<>]+"\><\/skipped>\n\s+<\/testcase>\n\s*<\/testsuite>\n/, reporter.output)
   end
 
   def test_failing_tests_creates_failure_tag

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minitest-junit
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Allan Espinosa
@@ -25,19 +25,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.11'
 - !ruby/object:Gem::Dependency
-  name: builder
+  name: ox
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.14.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.14.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -52,34 +58,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.3.2
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.3.2
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: '1'
 description: Junit reporter for Minitest ~> 5.0
 email:
 - allan.espinosa@outlook.com
@@ -87,6 +121,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/main.yml"
 - ".gitignore"
 - Gemfile
 - LICENSE.txt
@@ -100,6 +135,7 @@ files:
 - test/junit_plugin_test.rb
 - test/reporter_test.rb
 - test/testcase_formatter_test.rb
+- test/tmp/.keep
 homepage: http://github.com/aespinosa/minitest-junit
 licenses:
 - MIT
@@ -119,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.26
+rubygems_version: 3.4.13
 signing_key:
 specification_version: 4
 summary: Junit reporter for Minitest ~> 5.0
@@ -128,3 +164,4 @@ test_files:
 - test/junit_plugin_test.rb
 - test/reporter_test.rb
 - test/testcase_formatter_test.rb
+- test/tmp/.keep