ci-queue 0.19.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 436b1f0bca2725e6f532cbd4a4df9a880e6b1dd2e11a80b9587178d213fe6137
-  data.tar.gz: 93fe3b4055e7c99e6c61af1f106e63157e79dd2fe3717d5b1cfc74e096195e9a
+  metadata.gz: 020e4e1012b0be90bc94deac97a2fb6e00a11aeed0c35e1cffba506145f0b2aa
+  data.tar.gz: 86a96759c23bacf51457b1a24c0284e40dba6904e16ac6a8bc52fdf83fd4243e
 SHA512:
-  metadata.gz: 2bc328cd567173a875bc8273a812d2ad48ea32bad0eb0f7b0a586b279a80c4eaf08eede41a15e98d71929776dc1a5d59e7fee94b844b55a1924b3f1aa0be4272
-  data.tar.gz: fab60979f729dd77fbf8661d8e1b644deb7e9c126a5ea27a97537e0fb960416b71c69b2b01b4123e6f19216b6a764a136079412875686c93f949a6323ebf0a63
+  metadata.gz: a77b0ee4af5f570ef8a398377049afdd88ce611ac9c16319decb9b627c265ef7f2efa773317e9ae04a5472d88d595471e2384fc7bfd4778c291c59d8fa79a08b
+  data.tar.gz: ba72651f0072f98167131617a2635b05260d343108ac4d073a5dba56bcb9e5f7980b14abe66ac10d88662967a86b8cd682d549cf8a22f37dad3b5ea94aa82018

data/lib/ci/queue/version.rb

@@ -2,7 +2,7 @@
 
 module CI
   module Queue
-    VERSION = '0.19.0'
+    VERSION = '0.20.0'
     DEV_SCRIPTS_ROOT = ::File.expand_path('../../../../../redis', __FILE__)
     RELEASE_SCRIPTS_ROOT = ::File.expand_path('../redis', __FILE__)
   end

data/lib/minitest/queue/junit_reporter.rb

@@ -1,78 +1,106 @@
 # frozen_string_literal: true
+
 require 'minitest/reporters'
-require 'builder'
+require 'rexml/document'
 require 'fileutils'
 
 module Minitest
   module Queue
     class JUnitReporter < Minitest::Reporters::BaseReporter
-      class XmlMarkup < ::Builder::XmlMarkup
-        def trunc!(txt)
-          txt.sub(/\n.*/m, '...')
-        end
-      end
-
       def initialize(report_path = 'log/junit.xml', options = {})
         super({})
         @report_path = File.absolute_path(report_path)
         @base_path = options[:base_path] || Dir.pwd
       end
 
-      def report
-        super
-
+      def generate_document
         suites = tests.group_by { |test| test.klass }
 
-        xml = Builder::XmlMarkup.new(indent: 2)
-        xml.instruct!
-        xml.testsuites do
-          suites.each do |suite, tests|
-            add_tests_to(xml, suite, tests)
-          end
+        doc = REXML::Document.new
+        testsuites = doc.add_element('testsuites')
+        suites.each do |suite, tests|
+          add_tests_to(testsuites, suite, tests)
         end
+        doc
+      end
+
+      def format_document(doc, io)
+        io << "<?xml version='1.0' encoding='UTF-8'?>\n"
+        formatter = REXML::Formatters::Pretty.new
+        formatter.write(doc, io)
+        io << "\n"
+      end
+
+      def report
+        super
+
         FileUtils.mkdir_p(File.dirname(@report_path))
-        File.open(@report_path, 'w+') { |file| file << xml.target! }
+        File.open(@report_path, 'w+') do |file|
+          format_document(generate_document, file)
+        end
       end
 
       private
 
-      def add_tests_to(xml, suite, tests)
+      def add_tests_to(testsuites, suite, tests)
         suite_result = analyze_suite(tests)
-        file_path = Pathname.new(tests.first.source_location.first)
-        base_path = Pathname.new(@base_path)
-        relative_path = file_path.relative_path_from(base_path)
-
-        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|
-            lineno = test.source_location.last
-            xml.testcase(name: test.name, lineno: lineno, classname: suite, assertions: test.assertions,
-                         time: test.time, flaky_test: test.flaked?) do
-              xml << xml_message_for(test) unless test.passed?
-            end
+        relative_path = if tests.first.source_location.first == 'unknown'
+          Pathname.new('')
+        else
+          file_path = Pathname.new(tests.first.source_location.first)
+          if file_path.relative?
+            file_path
+          else
+            base_path = Pathname.new(@base_path)
+            file_path.relative_path_from(base_path)
           end
         end
+
+        testsuite = testsuites.add_element(
+          '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],
+        )
+
+        tests.each do |test|
+          lineno = tests.first.source_location.last
+          attributes = {
+            'name' => test.name,
+            'classname' => suite,
+            'assertions' => test.assertions,
+            'time' => test.time,
+            'flaky_test' => test.flaked?
+          }
+          attributes['lineno'] = lineno if lineno != -1
+
+          testcase = testsuite.add_element('testcase', attributes)
+          add_xml_message_for(testcase, test) unless test.passed?
+        end
       end
 
-      def xml_message_for(test)
-        xml = XmlMarkup.new(indent: 2, margin: 2)
+      def add_xml_message_for(testcase, test)
         failure = test.failure
-
         if test.skipped? && !test.flaked?
-          xml.skipped(type: failure.error.class.name)
+          testcase.add_element('skipped', 'type' => failure.error.class.name)
         elsif test.error?
-          xml.error(type: failure.error.class.name, message: xml.trunc!(failure.message)) do
-            xml.text!(message_for(test))
-          end
+          error = testcase.add_element('error', 'type' => failure.error.class.name, 'message' => truncate_message(failure.message))
+          error.add_text(REXML::CData.new(message_for(test)))
         elsif failure
-          xml.failure(type: failure.error.class.name, message: xml.trunc!(failure.message)) do
-            xml.text!(message_for(test))
-          end
+          failure = testcase.add_element('failure', 'type' => failure.error.class.name, 'message' => truncate_message(failure.message))
+          failure.add_text(REXML::CData.new(message_for(test)))
         end
       end
 
+      def truncate_message(message)
+        message.lines.first.chomp.gsub(/\e\[[^m]+m/, '')
+      end
+
       def message_for(test)
         suite = test.klass
         name = test.name
@@ -81,17 +109,17 @@ module Minitest
         if test.passed?
           nil
         elsif test.skipped?
-          "Skipped:\n#{name}(#{suite}) [#{location(error)}]:\n#{error.message}\n"
+          "\nSkipped:\n#{name}(#{suite}) [#{location(error)}]:\n#{error.message}\n"
         elsif test.failure
-          "Failure:\n#{name}(#{suite}) [#{location(error)}]:\n#{error.message}\n"
+          "\nFailure:\n#{name}(#{suite}) [#{location(error)}]:\n#{error.message}\n"
         elsif test.error?
-          "Error:\n#{name}(#{suite}):\n#{error.message}"
+          "\nError:\n#{name}(#{suite}) [#{location(error)}]:\n#{error.message}\n"
         end
       end
 
       def location(exception)
         last_before_assertion = ''
-        exception.backtrace.reverse_each do |s|
+        (exception.backtrace || []).reverse_each do |s|
           break if s =~ /in .(assert|refute|flunk|pass|fail|raise|must|wont)/
           last_before_assertion = s
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ci-queue
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-27 00:00:00.000000000 Z
+date: 2020-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler