fastlane-plugin-test_center 3.10.2 → 3.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c6d2198915a9633a3ab0d6f284a76f9cf03682524747b73e546786852bf2a86
-  data.tar.gz: 494391029f0689f83a34b7babba3772294b7ee112e1505e69ce09db300743d3b
+  metadata.gz: '098e845a533aae1482f49c2265234f95e6b6415a6f389fca3956851f009841da'
+  data.tar.gz: 612fa05cd1d3c550ed344ecc34f9f7a54a4d50a701711e33c7154f496d05104e
 SHA512:
-  metadata.gz: 77f8e4cbaa0235a71f34e849b95c0eb0321f0e666709fce63cd517af43c2d027cb5f0e8a32f3c10de692a97c5e496b83352e8aec294bb828098d85ff0bf4328c
-  data.tar.gz: 1cea423213b5ea48f5274a9efa1aa2765ad776ebfe414b699c5fa7411dbbdaf37ae00876f2175f81c2c95dd0d82892e5ab51599e692d2020d48b5ec945309b7a
+  metadata.gz: cd691d0fd30fc8a3a06d082f9a751a7101c1de6843819136d1fb18b66051435412bf8fe41606012ce65552096337a844ea1536896394b9ce6d679b3e80f00014
+  data.tar.gz: 25354716d6138969a45954a0f77429be98ea188e1a8fb9c4bda0b92300ea1d85df128526b65c4ef9e76575561f1aeddcb9c7fd9a9dd1133a6dbed3031af9dd21

data/README.md

@@ -91,6 +91,10 @@ For more information about how the `fastlane` plugin system works, check out the
 
 _fastlane_ is the easiest way to automate beta deployments and releases for your iOS and Android apps. To learn more, check out [fastlane.tools](https://fastlane.tools).
 
+## Supporter
+
+I'm grateful to all of the people who contributed back to `test_center`, all the people who helped test for new features or bug fixes, but most importantly I am grateful to my wife who supports my crazy passion for making software.
+
 ## License
 
 MIT

data/lib/fastlane/plugin/test_center/actions/multi_scan.rb

@@ -14,6 +14,10 @@ module Fastlane
     class MultiScanAction < Action
       def self.run(params)
         params[:quit_simulators] = params._values[:force_quit_simulator] if params._values[:force_quit_simulator]
+        if params[:try_count] < 1
+          UI.important('multi_scan will not test any if :try_count < 0, setting to 1')
+          params[:try_count] = 1
+        end
 
         strip_leading_and_trailing_whitespace_from_output_types(params)
 

data/lib/fastlane/plugin/test_center/helper/multi_scan_manager/retrying_scan_helper.rb

@@ -93,6 +93,10 @@ module TestCenter
             FastlaneCore::UI.important(":xcargs, #{xcargs}, contained 'build-for-testing', removing it")
             xcargs.slice!('build-for-testing')
           end
+          if xcargs.include?('-quiet')
+            FastlaneCore::UI.important('Disabling -quiet as failing tests cannot be found with it enabled.')
+            xcargs.gsub!('-quiet', '')
+          end
           xcargs.gsub!(/-parallel-testing-enabled(=|\s+)(YES|NO)/, '')
           retrying_scan_options = @reportnamer.scan_options.merge(
             {
@@ -245,7 +249,7 @@ module TestCenter
               junit: File.absolute_path(report_filepath)
             }
           )
-          @options[:only_testing] = @options[:only_testing] - Fastlane::Actions::TestsFromJunitAction.run(config).fetch(:passing, Hash.new).map(&:shellsafe_testidentifier)
+          @options[:only_testing] = (@options[:only_testing] || []) - Fastlane::Actions::TestsFromJunitAction.run(config).fetch(:passing, Hash.new).map(&:shellsafe_testidentifier)
           if @options[:invocation_based_tests]
             @options[:only_testing] = @options[:only_testing].map(&:strip_testcase).uniq
           end

data/lib/fastlane/plugin/test_center/helper/multi_scan_manager/runner.rb

@@ -207,10 +207,44 @@ module TestCenter
             File.absolute_path(output_directory),
             @test_collector.testables.first
           )
+          merge_single_testable_xcresult_with_final_xcresult(report_files_dir, File.absolute_path(output_directory))
           FileUtils.cp_r("#{report_files_dir}/.", File.absolute_path(output_directory))
           FileUtils.rm_rf(report_files_dir)
         end
 
+        def merge_single_testable_xcresult_with_final_xcresult(testable_output_dir, final_output_dir)
+          reportnamer = ReportNameHelper.new(
+            @options[:output_types],
+            @options[:output_files],
+            @options[:custom_report_file_name]
+          )
+          return unless reportnamer.includes_xcresult?
+
+          xcresult_bundlename = reportnamer.xcresult_bundlename
+          src_xcresult_bundlepath = File.join(testable_output_dir, xcresult_bundlename)
+          dst_xcresult_bundlepath = File.join(final_output_dir, xcresult_bundlename)
+
+          # We do not need to merge if one of these do not exist
+          return unless File.exist?(src_xcresult_bundlepath) || File.exist?(dst_xcresult_bundlepath)
+
+          config = FastlaneCore::Configuration.create(
+            Fastlane::Actions::CollateXcresultsAction.available_options,
+            {
+              xcresults: [src_xcresult_bundlepath, dst_xcresult_bundlepath],
+              collated_xcresult: dst_xcresult_bundlepath
+            }
+          )
+          FastlaneCore::UI.verbose("Merging xcresult '#{src_xcresult_bundlepath}' to '#{dst_xcresult_bundlepath}'")
+          Fastlane::Actions::CollateXcresultsAction.run(config)
+          FileUtils.rm_rf(src_xcresult_bundlepath)
+          if @result_bundle_desired
+            xcresult_bundlename = reportnamer.xcresult_bundlename
+            test_result_bundlename = File.basename(xcresult_bundlename, '.*') + '.test_result'
+            test_result_bundlename_path = File.join(testable_output_dir, test_result_bundlename)
+            FileUtils.rm_rf(test_result_bundlename_path)
+          end
+        end
+
         def symlink_result_bundle_to_xcresult(output_dir, reportname_helper)
           return unless @result_bundle_desired && reportname_helper.includes_xcresult?
 

data/lib/fastlane/plugin/test_center/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module TestCenter
-    VERSION = "3.10.2"
+    VERSION = "3.10.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-test_center
 version: !ruby/object:Gem::Version
-  version: 3.10.2
+  version: 3.10.3
 platform: ruby
 authors:
 - Lyndsey Ferguson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-10 00:00:00.000000000 Z
+date: 2020-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json