minitest-junit 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb01cc706e87563df21ee3ac59414bea9dc4a72b321daa289daf264e4b69625f
-  data.tar.gz: 79494de211ef61d553f06fd802708b6364514b7143f7f010ba604283c5a751a9
+  metadata.gz: 518beb2f7cb77d8e953d77f9b4342c5ec1d20603b8807782f71305b58a0f985d
+  data.tar.gz: d3dec1da3aa864c7e92a80628353e24c75a465df90d7e60fddb134a1dc725d89
 SHA512:
-  metadata.gz: 917d4fb7ce3de650069496ed1b599e30661040cac256f543263cc0104d73d82823f291c336040a0dc8f588c7a4b46a1ce1f61b9a06382d880c729c5034a5a7b1
-  data.tar.gz: 5ed9083720ab9b4f9b0caa185cfe8d1577b216f2c82b808c70d9a08df3bc6daab61472d2ed97e4479803cce8d84fa93dae56e3c070c4a9542b55493afd0d2852
+  metadata.gz: 1c2bc15ede221fc4128d62be93abd9dc6eb6137dd409faf763507c938b9d4bfdb4dd79af78d7de3f195ce1758dc72d5b6d1096c9b28893062c54db90c1a179bc
+  data.tar.gz: 32a0b2014027182f2c357b76defd7402fbc4996d994c5e8f3189844c66d634c16cfd26b9e0c524af3328bf347c5bbf608a480d85f927a021de81ce037543b760

data/.github/workflows/main.yml

@@ -0,0 +1,32 @@
+name: Main
+on:
+  push:
+  workflow_dispatch:
+
+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.0.0'
+    VERSION = '2.0.0'
   end
 end

data/lib/minitest/junit.rb

@@ -1,6 +1,8 @@
 require 'minitest/junit/version'
 require 'minitest'
-require 'builder'
+require 'ox'
+require 'socket'
+require 'time'
 
 # :nodoc:
 module Minitest
@@ -11,6 +13,8 @@ module Minitest
         @io = io
         @results = []
         @options = options
+        @options[:timestamp] = options.fetch(:timestamp, Time.now.iso8601)
+        @options[:hostname] = options.fetch(:hostname, Socket.gethostname)
       end
 
       def passed?
@@ -24,25 +28,51 @@ module Minitest
       end
 
       def report
-        @io.puts '<testsuite>'
-        @results.each { |result| @io.puts format(result) }
-        @io.puts '</testsuite>'
+        doc = Ox::Document.new(:version => '1.0')
+        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
+
+        doc << testsuite
+        @io << Ox.dump(doc)
       end
 
-      def format(result)
-        xml = Builder::XmlMarkup.new
-        xml.testcase classname: format_class(result), name: format_name(result),
-                     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
+      def format(result, parent = nil)
+        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.target!
+
+        testcase
       end
 
       private
@@ -55,8 +85,22 @@ module Minitest
         end
       end
 
+      def working_directory
+        @working_directory ||= Dir.getwd
+      end
+
+      def failure_message(result)
+        "#{result.klass}##{result.name}: #{result.failure}"
+      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)
@@ -70,6 +114,10 @@ module Minitest
       def format_name(result)
         result.name
       end
+
+      def format_time(time)
+        Kernel::format('%.6f', time)
+      end
     end
   end
 end

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,43 +1,95 @@
 require 'minitest/autorun'
 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_equal "<testsuite>\n</testsuite>\n", reporter.output
+    assert_match(
+      %r{<?xml version="1.0" encoding="UTF-8"\?>\n<testsuite name="minitest" timestamp="[^"]+" hostname="[^"]+" tests="0" skipped="0" failures="0" errors="0" time="0.000000"\/>},
+      reporter.output
+    )
   end
 
-  def test_formats_each_result_with_a_formatter
+  def test_formats_each_successful_result_with_a_formatter
     reporter = create_reporter
-    results = rand(100).times.map do |i|
-      result = "test_name#{i}"
+
+    results = do_formatting_test(reporter, count: rand(100), cause_failures: 0)
+
+    results.each do |result|
+      assert_match("<testcase classname=\"FakeTestName\" name=\"#{result.name}\"", reporter.output)
+    end
+  end
+
+  def test_formats_each_failed_result_with_a_formatter
+    reporter = create_reporter
+
+    results = do_formatting_test(reporter, count: rand(100), cause_failures: 1)
+    parsed_report = Nokogiri::XML(reporter.output)
+    results.each do |result|
+      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
+
+  def do_formatting_test(reporter, count: 1, cause_failures: 0)
+    results = count.times.map do |i|
+      result = create_test_result(methodname: "test_name#{i}", failures: cause_failures)
       reporter.record result
       result
     end
 
     reporter.report
 
-    expected = "<testsuite>\n#{results.join "\n"}\n</testsuite>\n"
-    assert_equal expected, reporter.output
+    results
   end
 
-  private
+  def create_test_result(name: FakeTestName, methodname: 'test_method_name', successes: 1, failures: 0)
+    test = Class.new Minitest::Test do
+      define_method 'class' do
+        name
+      end
+    end.new methodname
+    test.time = rand(100)
+    test.assertions = successes + failures
+    test.failures = failures.times.map do |i|
+      Class.new Minitest::Assertion do
+        define_method 'backtrace' do
+          ["Model failure \##{i}", 'This is a test backtrace', "#{__FILE__}:#{__LINE__}"]
+        end
+      end.new
+    end
+    Minitest::Result.from test
+  end
 
-  def create_reporter
-    io = StringIO.new
-    reporter = Minitest::Junit::Reporter.new io, {}
+  def create_reporter(options = {})
+    io = StringIO.new ''
+    reporter = Minitest::Junit::Reporter.new io, options
     def reporter.output
       @io.string
     end
-    def reporter.format(result)
-      result
-    end
     reporter.start
     reporter
   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)
+    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="[^<>]+"\/><\/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.0.0
+  version: 2.0.0
 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
@@ -119,7 +154,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