fastlane 2.201.0.rc1 → 2.201.1

data/trainer/lib/trainer/test_parser.rb

@@ -50,29 +50,40 @@ module Trainer
 
       return_hash = {}
       files.each do |path|
-        if config[:output_directory]
-          FileUtils.mkdir_p(config[:output_directory])
-          # Remove .xcresult or .plist extension
-          if path.end_with?(".xcresult")
-            filename = File.basename(path).gsub(".xcresult", config[:extension])
-          else
-            filename = File.basename(path).gsub(".plist", config[:extension])
-          end
-          to_path = File.join(config[:output_directory], filename)
-        else
-          # Remove .xcresult or .plist extension
-          if path.end_with?(".xcresult")
-            to_path = path.gsub(".xcresult", config[:extension])
+        extension = config[:extension]
+        output_filename = config[:output_filename]
+
+        should_write_file = !extension.nil? || !output_filename.nil?
+
+        if should_write_file
+          if config[:output_directory]
+            FileUtils.mkdir_p(config[:output_directory])
+            # Remove .xcresult or .plist extension
+            # Use custom file name ONLY if one file otherwise issues
+            if files.size == 1 && output_filename
+              filename = output_filename
+            elsif path.end_with?(".xcresult")
+              filename ||= File.basename(path).gsub(".xcresult", extension)
+            else
+              filename ||= File.basename(path).gsub(".plist", extension)
+            end
+            to_path = File.join(config[:output_directory], filename)
           else
-            to_path = path.gsub(".plist", config[:extension])
+            # Remove .xcresult or .plist extension
+            if path.end_with?(".xcresult")
+              to_path = path.gsub(".xcresult", extension)
+            else
+              to_path = path.gsub(".plist", extension)
+            end
           end
         end
 
         tp = Trainer::TestParser.new(path, config)
-        File.write(to_path, tp.to_junit)
-        UI.success("Successfully generated '#{to_path}'") unless config[:silent]
+        File.write(to_path, tp.to_junit) if should_write_file
+        UI.success("Successfully generated '#{to_path}'") if should_write_file && !config[:silent]
 
-        return_hash[to_path] = {
+        return_hash[path] = {
+          to_path: to_path,
           successful: tp.tests_successful?,
           number_of_tests: tp.number_of_tests,
           number_of_failures: tp.number_of_failures,
@@ -89,7 +100,7 @@ module Trainer
       UI.user_error!("File not found at path '#{path}'") unless File.exist?(path)
 
       if File.directory?(path) && path.end_with?(".xcresult")
-        parse_xcresult(path)
+        parse_xcresult(path, output_remove_retry_attempts: config[:output_remove_retry_attempts])
       else
         self.file_content = File.read(path)
         self.raw_json = Plist.parse_xml(self.file_content)
@@ -182,7 +193,7 @@ module Trainer
       return output
     end
 
-    def parse_xcresult(path)
+    def parse_xcresult(path, output_remove_retry_attempts: false)
       require 'shellwords'
       path = Shellwords.escape(path)
 
@@ -207,10 +218,10 @@ module Trainer
 
       # Converts the ActionTestPlanRunSummaries to data for junit generator
       failures = actions_invocation_record.issues.test_failure_summaries || []
-      summaries_to_data(summaries, failures)
+      summaries_to_data(summaries, failures, output_remove_retry_attempts: output_remove_retry_attempts)
     end
 
-    def summaries_to_data(summaries, failures)
+    def summaries_to_data(summaries, failures, output_remove_retry_attempts: false)
       # Gets flat list of all ActionTestableSummary
       all_summaries = summaries.map(&:summaries).flatten
       testable_summaries = all_summaries.map(&:testable_summaries).flatten
@@ -270,6 +281,30 @@ module Trainer
           test_row
         end
 
+        # Remove retry attempts from the count and test rows
+        if output_remove_retry_attempts
+          test_rows = test_rows.reject do |test_row|
+            remove = false
+
+            identifier = test_row[:identifier]
+            info = tests_by_identifier[identifier]
+
+            # Remove if this row is a retry and is a failure
+            if info[:retry_count] > 0
+              remove = !(test_row[:failures] || []).empty?
+            end
+
+            # Remove all failure and retry count if test did eventually pass
+            if remove
+              info[:failure_count] -= 1
+              info[:retry_count] -= 1
+              tests_by_identifier[identifier] = info
+            end
+
+            remove
+          end
+        end
+
         row = {
           project_path: testable_summary.project_relative_path,
           target_name: testable_summary.target_name,
@@ -328,6 +363,12 @@ module Trainer
         }
         summary_row[:number_of_tests] = summary_row[:tests].count
         summary_row[:number_of_failures] = summary_row[:tests].find_all { |a| (a[:failures] || []).count > 0 }.count
+
+        # Makes sure that plist support matches data output of xcresult
+        summary_row[:number_of_tests_excluding_retries] = summary_row[:number_of_tests]
+        summary_row[:number_of_failures_excluding_retries] = summary_row[:number_of_failures]
+        summary_row[:number_of_retries] = 0
+
         summary_row
       end
     end

metadata

@@ -1,38 +1,39 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.201.0.rc1
+  version: 2.201.1
 platform: ruby
 authors:
-- Jimmy Dee
+- Jorge Revuelta H
 - Jérôme Lacoste
-- Danielle Tomlinson
-- Maksym Grebenets
-- Matthew Ellis
+- Andrew McBurney
+- Daniel Jankowski
+- Satoshi Namai
+- Helmut Januschka
 - Josh Holtz
-- Luka Mirosevic
-- Felix Krause
 - Iulian Onofrei
-- Satoshi Namai
-- Jan Piotrowski
-- Joshua Liebowitz
+- Roger Oba
+- Jimmy Dee
+- Łukasz Grabowski
+- Manu Wallner
+- Matthew Ellis
 - Manish Rathi
-- Helmut Januschka
+- Jan Piotrowski
+- Fumiya Nakamura
+- Luka Mirosevic
 - Olivier Halligon
+- Joshua Liebowitz
+- Felix Krause
+- Aaron Brager
+- Kohki Miki
 - Stefan Natchev
 - Max Ott
-- Roger Oba
-- Kohki Miki
-- Andrew McBurney
-- Jorge Revuelta H
-- Daniel Jankowski
-- Aaron Brager
-- Fumiya Nakamura
-- Manu Wallner
+- Danielle Tomlinson
+- Maksym Grebenets
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-13 00:00:00.000000000 Z
+date: 2022-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -1016,6 +1017,7 @@ files:
 - fastlane/lib/fastlane/action.rb
 - fastlane/lib/fastlane/action_collector.rb
 - fastlane/lib/fastlane/actions/.DS_Store
+- fastlane/lib/fastlane/actions/.run_tests.rb.swp
 - fastlane/lib/fastlane/actions/README.md
 - fastlane/lib/fastlane/actions/actions_helper.rb
 - fastlane/lib/fastlane/actions/adb.rb
@@ -1576,6 +1578,8 @@ files:
 - scan/lib/assets/ScanfileTemplate
 - scan/lib/assets/ScanfileTemplate.swift
 - scan/lib/scan.rb
+- scan/lib/scan/.error_handler.rb.swp
+- scan/lib/scan/.runner.rb.swp
 - scan/lib/scan/commands_generator.rb
 - scan/lib/scan/detect_values.rb
 - scan/lib/scan/error_handler.rb
@@ -1846,6 +1850,7 @@ files:
 - trainer/lib/.DS_Store
 - trainer/lib/assets/junit.xml.erb
 - trainer/lib/trainer.rb
+- trainer/lib/trainer/.options.rb.swp
 - trainer/lib/trainer/commands_generator.rb
 - trainer/lib/trainer/junit_generator.rb
 - trainer/lib/trainer/module.rb
@@ -1890,9 +1895,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.2.3
 signing_key: