ci-queue 0.20.0 → 0.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 020e4e1012b0be90bc94deac97a2fb6e00a11aeed0c35e1cffba506145f0b2aa
-  data.tar.gz: 86a96759c23bacf51457b1a24c0284e40dba6904e16ac6a8bc52fdf83fd4243e
+  metadata.gz: c5d3525c5eac10718326a27026a9760509bca1a0d23b15f6ad2b8f5521321c29
+  data.tar.gz: 05a459ded4b16d60c5dd5e58ed3e175b97467193894d6f64acbdb3d071e971a9
 SHA512:
-  metadata.gz: a77b0ee4af5f570ef8a398377049afdd88ce611ac9c16319decb9b627c265ef7f2efa773317e9ae04a5472d88d595471e2384fc7bfd4778c291c59d8fa79a08b
-  data.tar.gz: ba72651f0072f98167131617a2635b05260d343108ac4d073a5dba56bcb9e5f7980b14abe66ac10d88662967a86b8cd682d549cf8a22f37dad3b5ea94aa82018
+  metadata.gz: e1589714a963162803a93e134b671026c90910d7a645057d58dafa785f97408f94562d43d4545c7123b63feb93a0966710b43acf63cc1d7aa727684db7a952e7
+  data.tar.gz: da902c68164c997ebbda25d6305742059c101d08a23d084b3b0bedeb3e2f4bace623e1241c4298dff24b0061a846be201b9ae4edda4d3df3537ae40642bab276

data/lib/ci/queue/version.rb

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

data/lib/minitest/queue.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require 'shellwords'
 require 'minitest'
 require 'minitest/reporters'
 
@@ -102,6 +103,47 @@ module Minitest
   end
 
   module Queue
+    attr_writer :run_command_formatter, :project_root
+
+    def run_command_formatter
+      @run_command_formatter ||= if defined?(Railties)
+        RAILS_RUN_COMMAND_FORMATTER
+      else
+        DEFAULT_RUN_COMMAND_FORMATTER
+      end
+    end
+
+    DEFAULT_RUN_COMMAND_FORMATTER = lambda do |runnable|
+      filename = Minitest::Queue.relative_path(runnable.source_location[0])
+      identifier = "#{runnable.klass}##{runnable.name}"
+      ['bundle', 'exec', 'ruby', '-Ilib:test', filename, '-n', identifier]
+    end
+
+    RAILS_RUN_COMMAND_FORMATTER = lambda do |runnable|
+      filename = Minitest::Queue.relative_path(runnable.source_location[0])
+      lineno = runnable.source_location[1]
+      ['bin/rails', 'test', "#{filename}:#{lineno}"]
+    end
+
+    def run_command_for_runnable(runnable)
+      command = run_command_formatter.call(runnable)
+      if command.is_a?(Array)
+        Shellwords.join(command)
+      else
+        command
+      end
+    end
+
+    def self.project_root
+      @project_root ||= Dir.pwd
+    end
+
+    def self.relative_path(path, root: project_root)
+      Pathname(path).relative_path_from(Pathname(root)).to_s
+    rescue ArgumentError
+      path
+    end
+
     class SingleExample
 
       def initialize(runnable, method_name)

data/lib/minitest/queue/junit_reporter.rb

@@ -16,7 +16,12 @@ module Minitest
       def generate_document
         suites = tests.group_by { |test| test.klass }
 
-        doc = REXML::Document.new
+        doc = REXML::Document.new(nil, {
+          :prologue_quote => :quote,
+          :attribute_quote => :quote,
+        })
+        doc << REXML::XMLDecl.new('1.1', 'utf-8')
+
         testsuites = doc.add_element('testsuites')
         suites.each do |suite, tests|
           add_tests_to(testsuites, suite, tests)
@@ -25,7 +30,6 @@ module Minitest
       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"
@@ -44,17 +48,7 @@ module Minitest
 
       def add_tests_to(testsuites, suite, tests)
         suite_result = analyze_suite(tests)
-        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
+        relative_path = location_for_runnable(tests.first) || '<unknown>'
 
         testsuite = testsuites.add_element(
           'testsuite',
@@ -75,7 +69,8 @@ module Minitest
             'classname' => suite,
             'assertions' => test.assertions,
             'time' => test.time,
-            'flaky_test' => test.flaked?
+            'flaky_test' => test.flaked?,
+            'run-command' => Minitest.run_command_for_runnable(test),
           }
           attributes['lineno'] = lineno if lineno != -1
 
@@ -106,24 +101,25 @@ module Minitest
         name = test.name
         error = test.failure
 
+        message_with_relative_paths = error.message.gsub("#{Minitest::Queue.project_root}/", '')
+
         if test.passed?
           nil
         elsif test.skipped?
-          "\nSkipped:\n#{name}(#{suite}) [#{location(error)}]:\n#{error.message}\n"
+          "\nSkipped:\n#{name}(#{suite}) [#{location_for_runnable(test)}]:\n#{message_with_relative_paths}\n"
         elsif test.failure
-          "\nFailure:\n#{name}(#{suite}) [#{location(error)}]:\n#{error.message}\n"
+          "\nFailure:\n#{name}(#{suite}) [#{location_for_runnable(test)}]:\n#{message_with_relative_paths}\n"
         elsif test.error?
-          "\nError:\n#{name}(#{suite}) [#{location(error)}]:\n#{error.message}\n"
+          "\nError:\n#{name}(#{suite}) [#{location_for_runnable(test)}]:\n#{message_with_relative_paths}\n"
         end
       end
 
-      def location(exception)
-        last_before_assertion = ''
-        (exception.backtrace || []).reverse_each do |s|
-          break if s =~ /in .(assert|refute|flunk|pass|fail|raise|must|wont)/
-          last_before_assertion = s
+      def location_for_runnable(runnable)
+        if runnable.source_location.first == 'unknown'
+          nil
+        else
+          Minitest::Queue.relative_path(runnable.source_location.first)
         end
-        last_before_assertion.sub(/:in .*$/, '')
       end
 
       def analyze_suite(tests)

metadata

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