fastlane-plugin-test_center 3.11.3 → 3.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8ca5a9222720b8b5159174407b28d8675636e19c3cd9ee1e4950f37069acb50
-  data.tar.gz: 290ebef85ce82943353cbf4ca7593b431a2ab903c8dc552932705c61c3b11771
+  metadata.gz: 79e2765eea8d10df4efd2039d298d2e7b3e9481844686eb5dc5c3e5223f96171
+  data.tar.gz: a5856750d9519fe3db99c10aebe9b320a91aa6285a15919ea0547069fdc6627b
 SHA512:
-  metadata.gz: 162eab51a51e48d16a0dc84c72de87c310fbecfd75e61ddb6a531dc3d3ee8047f17950a826e60f6cfc25d81f2b586132716d5d470c31f8308a72d4efaae3c145
-  data.tar.gz: 5070579e0c6b38115908238c3a5b6335edf3791c7cc44e62587138304199b439c875ebf2a3fb97cb798e81eb3cfaffd3a990215d8cf2b48d3fbfdb5c55bafc37
+  metadata.gz: 7d40544a3352ddd61af2c9ff77d842d006a0400df54bb9e2492ccd0f01f7ab514a008d6a82c4f1f2fc979e840a599cd1e0e4d514afd9d053e5ad6473347d2f5d
+  data.tar.gz: cbd5f866464960e4a35b3b3f59baceafc6621eb7d0917f72d795cb53973f62f342dd717587431f8f72da958164b9f3b2ed8c709f3661dd759584b0c4574c65ce

data/README.md

@@ -7,6 +7,8 @@
 
 Have you ever spent too much time trying to fix fragile tests only to give up with nothing real to show? Use the `fastlane` actions from `test_center` to remove the pain around your tests, so that you can focus on what makes 💰: features that customers love 😍.
 
+> For those of you new to fastlane, I recommend that you read my article [Rescue Your Mobile Builds from Madness Using Fastlane](https://medium.com/appian-engineering/rescue-your-mobile-builds-from-madness-using-fastlane-cf123622f2d3).
+
 <p align="center">
   <a href="#features">Features</a> |
   <a href="#installation">Installation</a> |
@@ -38,6 +40,7 @@ _read the documentation on each action by clicking on the action name_
 | [`test_options_from_testplan`](docs/feature_details/test_options_from_testplan.md) | returns the tests and test code coverage configuration for a given testplan | ios, mac |
 | [`testplans_from_scheme`](docs/feature_details/testplans_from_scheme.md) | returns the testplans that an Xcode Scheme references | ios, mac |
 | [`tests_from_junit`](docs/feature_details/tests_from_junit.md) | returns the passing and failing tests in a Junit test report | ios, mac |
+| [`tests_from_xcresult`](docs/feature_details/tests_from_xcresult.md) | returns the passing and failing tests in a xcresult bundle | ios, mac |
 | [`tests_from_xctestrun`](docs/feature_details/tests_from_xctestrun.md) | returns a list of tests for each test target in a `xctestrun` file  | ios, mac |
 | [`collate_junit_reports`](docs/feature_details/collate_junit_reports.md) | combines multiple Junit test reports into one report | ios, mac |
 | [`collate_html_reports`](docs/feature_details/collate_html_reports.md) | combines multiple HTML test reports into one report | ios, mac |

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

@@ -170,8 +170,10 @@ module Fastlane
         reset_scan_config_to_defaults
         use_scanfile_to_override_settings(scan_options)
         turn_off_concurrent_workers(scan_options)
+        UI.important("Turning off :skip_build as it doesn't do anything with multi_scan") if scan_options[:skip_build]
+        scan_options.reject! { |k,v| k == :skip_build }
         ScanHelper.remove_preexisting_simulator_logs(scan_options)
-        if scan_options[:test_without_building] || scan_options[:skip_build]
+        if scan_options[:test_without_building]
           UI.verbose("Preparing Scan config options for multi_scan testing")
           prepare_scan_config(scan_options)
         else
@@ -231,11 +233,31 @@ module Fastlane
         scan_options[:derived_data_path] = Scan.config[:derived_data_path]
       end
 
+      def self.remove_xcresult_from_build_options(build_options)
+        # convert the :output_types comma separated string of types into an array with no whitespace
+        output_types = build_options[:output_types].to_s.split(',').map(&:strip)
+        xcresult_index = output_types.index('xcresult')
+
+        unless xcresult_index.nil?
+          output_types.delete_at(xcresult_index)
+          # set :output_types value to comma separated string of remaining output types
+          build_options[:output_types] = output_types.join(',')
+
+          if build_options[:output_files] # not always set
+            output_files = build_options[:output_files].split(',').map(&:strip)
+            output_files.delete_at(xcresult_index)
+
+            build_options[:output_files] = output_files.join(',')
+          end
+        end
+      end
+
       def self.prepare_scan_options_for_build_for_testing(scan_options)
-        build_options = scan_options.merge(build_for_testing: true).reject { |k| %i[test_without_building, testplan].include?(k) }
+        build_options = scan_options.merge(build_for_testing: true).reject { |k| %i[test_without_building testplan include_simulator_logs].include?(k) }
+        remove_xcresult_from_build_options(build_options)
         Scan.config = FastlaneCore::Configuration.create(
           Fastlane::Actions::ScanAction.available_options,
-          ScanHelper.scan_options_from_multi_scan_options(build_options)
+          ScanHelper.scan_options_from_multi_scan_options(build_options).merge(include_simulator_logs: false)
         )
         values = Scan.config.values(ask: false)
         values[:xcode_path] = File.expand_path("../..", FastlaneCore::Helper.xcode_path)
@@ -357,6 +379,15 @@ module Fastlane
                 "because the number of tests is unknown")
             end
           ),
+          FastlaneCore::ConfigItem.new(
+            key: :swift_test_prefix,
+            description: "The prefix used to find test methods. In standard XCTests, this is `test`. If you are using Quick with Swift, set this to `spec`",
+            default_value: "test",
+            optional: true,
+            verify_block: proc do |swift_test_prefix|
+              UI.user_error!("Error: swift_test_prefix must be non-nil and non-empty") if swift_test_prefix.nil? || swift_test_prefix.empty?
+            end
+          ),
           FastlaneCore::ConfigItem.new(
             key: :quit_simulators,
             env_name: "FL_MULTI_SCAN_QUIT_SIMULATORS",

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

@@ -14,6 +14,7 @@ module Fastlane
           if test_target.key?('selectedTests')
             UI.verbose("  Found selectedTests")
             test_identifiers = test_target['selectedTests'].each do |selected_test|
+              selected_test.delete!('()')
               UI.verbose("    Found test: '#{selected_test}'")
               only_testing << "#{testable}/#{selected_test.sub('\/', '/')}"
             end

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

@@ -2,25 +2,15 @@ module Fastlane
   module Actions
     class TestplansFromSchemeAction < Action
       def self.run(params)
-        scheme = params[:scheme]
-        scheme_filepaths = schemes_from_project(params[:xcodeproj], scheme) || schemes_from_workspace(params[:workspace], scheme)
-        if scheme_filepaths.length.zero?
-          UI.user_error!("Error: cannot find any schemes in the Xcode project") if params[:xcodeproj]
-          UI.user_error!("Error: cannot find any schemes in the Xcode workspace") if params[:workspace]
-        end
+        scheme_filepaths = schemes(params)
         testplan_paths = []
         scheme_filepaths.each do |scheme_filepath|
           UI.verbose("Looking in Scheme '#{scheme_filepath}' for any testplans")
           xcscheme = Xcodeproj::XCScheme.new(scheme_filepath)
-          next if xcscheme.test_action.nil?
-          next if xcscheme.test_action.testables.to_a.empty?
-          next if xcscheme.test_action.testables[0].buildable_references.to_a.empty?
-          next if xcscheme.test_action.test_plans.to_a.empty?
-
-          xcodeproj = xcscheme.test_action.testables[0].buildable_references[0].target_referenced_container.sub('container:', '')
-          container_dir = scheme_filepath.sub(/#{xcodeproj}.*/, '')
+          next unless scheme_has_testplans?(xcscheme)
+          scheme_container_dir = File.absolute_path(scheme_filepath).sub(%r{/[^/]*\.(xcworkspace|xcodeproj)/.*}, '')
           xcscheme.test_action.test_plans.each do |testplan|
-            testplan_path = File.absolute_path(File.join(container_dir, testplan.target_referenced_container.sub('container:', '')))
+            testplan_path = File.absolute_path(File.join(scheme_container_dir, testplan.target_referenced_container.sub('container:', '')))
             UI.verbose("  found testplan '#{testplan_path}'")
             testplan_paths << testplan_path
           end
@@ -28,6 +18,29 @@ module Fastlane
         testplan_paths
       end
 
+      def self.scheme_has_testplans?(xcscheme)
+          return !(
+            xcscheme.test_action.nil? ||
+            xcscheme.test_action.testables.to_a.empty? ||
+            xcscheme.test_action.testables[0].buildable_references.to_a.empty? ||
+            xcscheme.test_action.test_plans.to_a.empty?
+          )
+      end
+
+      def self.schemes(params)
+        scheme = params[:scheme]
+        scheme_filepaths = schemes_from_project(params[:xcodeproj], scheme) || schemes_from_workspace(params[:workspace], scheme)
+        if scheme_filepaths.length.zero?
+          scheme_detail_message = ''
+          if scheme
+            scheme_detail_message = "named '#{scheme}' "
+          end
+          UI.user_error!("Error: cannot find any schemes #{scheme_detail_message}in the Xcode project") if params[:xcodeproj]
+          UI.user_error!("Error: cannot find any schemes #{scheme_detail_message}in the Xcode workspace") if params[:workspace]
+        end
+        scheme_filepaths
+      end
+
       def self.schemes_from_project(project_path, scheme)
         return nil unless project_path
 
@@ -37,9 +50,16 @@ module Fastlane
       def self.schemes_from_workspace(workspace_path, scheme)
         return nil unless workspace_path
 
-        xcworkspace = Xcodeproj::Workspace.new_from_xcworkspace(workspace_path)
         scheme_filepaths = []
-        xcworkspace.file_references.each do |file_reference|
+        scheme_filepaths.concat(schemes_from_project(workspace_path, scheme))
+        return scheme_filepaths unless scheme_filepaths.empty?
+
+        xcworkspace = Xcodeproj::Workspace.new_from_xcworkspace(workspace_path)
+        xcodeprojects = xcworkspace.file_references.select do |file_reference|
+          file_reference.path.end_with?('xcodeproj')
+        end
+
+        xcodeprojects.each do |file_reference|
           next if file_reference.path.include?('Pods/Pods.xcodeproj')
 
           project_path = file_reference.absolute_path(File.dirname(workspace_path))

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

@@ -5,10 +5,10 @@ module Fastlane
     class TestsFromXctestrunAction < Action
       def self.run(params)
         UI.verbose("Getting tests from xctestrun file at '#{params[:xctestrun]}'")
-        return xctestrun_tests(params[:xctestrun], params[:invocation_based_tests])
+        return xctestrun_tests(params[:xctestrun], params[:invocation_based_tests], swift_test_prefix: params[:swift_test_prefix])
       end
 
-      def self.xctestrun_tests(xctestrun_path, invocation_based_tests)
+      def self.xctestrun_tests(xctestrun_path, invocation_based_tests, swift_test_prefix: "test")
         xctestrun = Plist.parse_xml(xctestrun_path)
         xctestrun_rootpath = File.dirname(xctestrun_path)
         xctestrun_version = xctestrun.fetch('__xctestrun_metadata__', Hash.new).fetch('FormatVersion', 1)
@@ -17,12 +17,14 @@ module Fastlane
         if xctestrun_version == 1
           xctestrun.each do |testable_name, test_target_config|
             next if ignoredTestables.include? testable_name
+            test_target_config['TestableName'] = testable_name
             test_targets << test_target_config
           end
         else
           test_configurations = xctestrun['TestConfigurations']
           test_configurations.each do |configuration|
             configuration['TestTargets'].each do |test_target|
+              test_target['TestableName'] = test_target['BlueprintName']
               test_targets << test_target
             end
           end
@@ -30,14 +32,14 @@ module Fastlane
 
         tests = Hash.new([])
         test_targets.each do |xctestrun_config|
-          testable_name = xctestrun_config['ProductModuleName']
+          testable_name = xctestrun_config['TestableName']
           xctest_path = xctest_bundle_path(xctestrun_rootpath, xctestrun_config)
           test_identifiers = []
           if xctestrun_config.key?('OnlyTestIdentifiers')
             test_identifiers = xctestrun_config['OnlyTestIdentifiers']
             UI.verbose("Identifiers after adding onlytest tests: #{test_identifiers.join("\n\t")}")
           else
-            test_identifiers = XCTestList.tests(xctest_path)
+            test_identifiers = XCTestList.tests(xctest_path, swift_test_prefix: swift_test_prefix)
             UI.verbose("Found the following tests: #{test_identifiers.join("\n\t")}")
           end
           if xctestrun_config.key?('SkipTestIdentifiers')
@@ -50,6 +52,7 @@ module Fastlane
           if test_identifiers.empty? && !invocation_based_tests
             UI.error("No tests found in '#{xctest_path}'!")
             UI.important("Is the Build Setting, `ENABLE_TESTABILITY` enabled for the test target #{testable_name}?")
+            UI.message("If your Swift test method names use a prefix other than `test`, consider setting `:swift_test_prefix`.")
           end
           tests[testable_name] = test_identifiers.map do |test_identifier|
             "#{testable_name}/#{test_identifier}"
@@ -114,6 +117,15 @@ module Fastlane
             is_string: false,
             default_value: false,
             optional: true
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :swift_test_prefix,
+            description: "The prefix used to find test methods. In standard XCTests, this is `test`. If you are using Quick with Swift, set this to `spec`",
+            default_value: "test",
+            optional: true,
+            verify_block: proc do |swift_test_prefix|
+              UI.user_error!("Error: swift_test_prefix must be non-nil and non-empty") if swift_test_prefix.nil? || swift_test_prefix.empty?
+            end
           )
         ]
       end

data/lib/fastlane/plugin/test_center/helper/fastlane_core/device_manager/simulator_extensions.rb

@@ -0,0 +1,16 @@
+
+module FixedCopyLogarchiveFastlaneSimulator
+  def self.included(base)
+    base.instance_eval do
+      def copy_logarchive(device, log_identity, logs_destination_dir)
+        require 'shellwords'
+        FastlaneCore::UI.verbose("> FixedCopyLogarchiveFastlaneSimulator.copy_logarchive")
+        logarchive_dst = File.join(logs_destination_dir, "system_logs-#{log_identity}.logarchive")
+        FileUtils.rm_rf(logarchive_dst)
+        FileUtils.mkdir_p(File.expand_path("..", logarchive_dst))
+        command = "xcrun simctl spawn #{device.udid} log collect --output #{logarchive_dst.shellescape} 2>/dev/null"
+        FastlaneCore::CommandExecutor.execute(command: command, print_all: false, print_command: true)
+      end
+    end
+  end
+end

data/lib/fastlane/plugin/test_center/helper/html_test_report.rb

@@ -181,11 +181,26 @@ module TestCenter
         end
 
         def remove_duplicate_testcases
-          nonuniq_testcases = testcases
+          # Get a list of all the testcases in the report's testsuite
+          # and reverse the order so that we'll get the tests that
+          # passed _after_ they failed first. That way, when
+          # uniq is called, it will grab the first non-repeated test
+          # it finds; for duplicated tests (tests that were re-run), it will
+          # actually grab the last test that was run of that set.
+          #
+          # For example, if `testcases` is
+          # `['a(passing)', 'b(passing)', 'c(passing)', 'dup1(failing)', 'dup2(failing)', 'dup1(passing)', 'dup2(passing)' ]`
+          # then, testcases.reverse will be
+          # `['dup2(passing)', 'dup1(passing)', 'dup2(failing)', 'dup1(failing)', 'c(passing)', 'b(passing)', 'a(passing)']`
+          # then `uniq_testcases` will be
+          # `['dup2(passing)', 'dup1(passing)', 'c(passing)', 'b(passing)', 'a(passing)']`
+          nonuniq_testcases = testcases.reverse
           uniq_testcases = nonuniq_testcases.uniq { |tc| tc.title }
           (nonuniq_testcases - uniq_testcases).each do |tc|
+            # here, we would be deleting ['dup2(failing)', 'dup1(failing)']
             failure_details = tc.failure_details
-            tc.root.parent.delete_element(failure_details)
+            # failure_details can be nil if this is a passing testcase
+            tc.root.parent.delete_element(failure_details) unless failure_details.nil?
             tc.root.parent.delete_element(tc.root)
           end
         end

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

@@ -19,11 +19,24 @@ module FastlaneCore
       end
 
       def boot
-        `xcrun simctl boot #{self.udid}`
+        return unless is_simulator
+        return unless os_type == "iOS"
+        return if self.state == 'Booted'
+
+        UI.message("Booting #{self}")
+
+        `xcrun simctl boot #{self.udid} 2>/dev/null`
+        self.state = 'Booted'
       end
 
       def shutdown
-        `xcrun simctl shutdown #{self.udid}` unless self.state == "Shutdown"
+        return unless is_simulator
+        return unless os_type == "iOS"
+        return if self.state == 'Shutdown'
+
+        UI.message("Shutting down #{self.udid}")
+        `xcrun simctl shutdown #{self.udid} 2>/dev/null`
+        self.state = 'Shutdown'
       end
     end
   end

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

@@ -47,6 +47,11 @@ module TestCenter
             scan_config.set(k,v) unless v.nil?
             FastlaneCore::UI.verbose("\tSetting #{k.to_s} to #{v}")
           end
+          if @options[:scan_devices_override]
+            scan_device_names = @options[:scan_devices_override].map { |device| device.name }
+            FastlaneCore::UI.verbose("\tSetting Scan.devices to #{scan_device_names}")
+            Scan.devices.replace(@options[:scan_devices_override])
+          end
         end
 
         # :nocov:

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

@@ -29,7 +29,7 @@ module TestCenter
           return unless @options[:quit_simulators]
 
           @options.fetch(:destination).each do |destination|
-            if /id=(?<udid>\w+),?/ =~ destination
+            if /id=(?<udid>[^,$]+)/ =~ destination
               FastlaneCore::UI.verbose("Restarting Simulator #{udid}")
               `xcrun simctl shutdown #{udid} 2>/dev/null`
               `xcrun simctl boot #{udid} 2>/dev/null`
@@ -337,11 +337,15 @@ module TestCenter
 
           glob_pattern = "#{output_directory}/system_logs-*.{log,logarchive}"
           logs = Dir.glob(glob_pattern)
+          batch_prefix = ''
+          if @options[:batch]
+            batch_prefix = "batch-#{@options[:batch]}-"
+          end
           logs.each do |log_filepath|
-            new_logname = "try-#{testrun_count}-#{File.basename(log_filepath)}"
+            new_logname = "#{batch_prefix}try-#{testrun_count}-#{File.basename(log_filepath)}"
             new_log_filepath = "#{File.dirname(log_filepath)}/#{new_logname}"
             FastlaneCore::UI.verbose("Moving simulator log '#{log_filepath}' to '#{new_log_filepath}'")
-            File.rename(log_filepath, new_log_filepath)
+            FileUtils.mv(log_filepath, new_log_filepath, force: true)
           end
         end
 

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

@@ -6,6 +6,7 @@ module TestCenter
       require 'json'
       require 'shellwords'
       require 'snapshot/reset_simulators'
+      require_relative '../fastlane_core/device_manager/simulator_extensions'
 
       class Runner
         attr_reader :retry_total_count
@@ -21,6 +22,8 @@ module TestCenter
           end
           @batch_count = 1 # default count. Will be updated by setup_testcollector
           setup_testcollector
+          setup_logcollection
+          FastlaneCore::UI.verbose("< done in TestCenter::Helper::MultiScanManager.initialize")
         end
 
         def update_options_to_use_xcresult_output
@@ -35,6 +38,27 @@ module TestCenter
           @options.reject! { |k,_| k == :result_bundle }
         end
 
+        def setup_logcollection
+          FastlaneCore::UI.verbose("> setup_logcollection")
+          return unless @options[:include_simulator_logs]
+          return if Scan::Runner.method_defined?(:prelaunch_simulators)
+
+          # We need to prelaunch the simulators so xcodebuild
+          # doesn't shut it down before we have a chance to get
+          # the logs.
+          FastlaneCore::UI.verbose("\t collecting devices to boot for log collection")
+          devices_to_shutdown = []
+          Scan.devices.each do |device|
+            devices_to_shutdown << device if device.state == "Shutdown"
+            device.boot
+          end
+          at_exit do
+            devices_to_shutdown.each(&:shutdown)
+          end
+          FastlaneCore::UI.verbose("\t fixing FastlaneCore::Simulator.copy_logarchive")
+          FastlaneCore::Simulator.send(:include, FixedCopyLogarchiveFastlaneSimulator)
+        end
+
         def setup_testcollector
           return if @options[:invocation_based_tests] && @options[:only_testing].nil?
           return if @test_collector
@@ -42,6 +66,10 @@ module TestCenter
           @test_collector = TestCollector.new(@options)
           @options.reject! { |key| %i[testplan].include?(key) }
           @batch_count = @test_collector.test_batches.size
+          if @test_collector.test_batches.flatten.size < @options[:parallel_testrun_count].to_i
+            FastlaneCore::UI.important(":parallel_testrun_count greater than the number of tests (#{@test_collector.test_batches.flatten.size}). Reducing to that number.")
+            @options[:parallel_testrun_count] = @test_collector.test_batches.flatten.size
+          end
         end
 
         def output_directory(batch_index = 0, test_batch = [])
@@ -73,9 +101,7 @@ module TestCenter
         end
 
         def should_run_tests_through_single_try?
-          should_run_for_invocation_tests = @options[:invocation_based_tests] && @options[:only_testing].nil?
-          should_run_for_skip_build = @options[:skip_build]
-          (should_run_for_invocation_tests || should_run_for_skip_build)
+          @options[:invocation_based_tests] && @options[:only_testing].nil?
         end
 
 
@@ -182,11 +208,21 @@ module TestCenter
         end
 
         def scan_options_for_worker(test_batch, batch_index)
+          if @test_collector.test_batches.size > 1
+            # If there are more than 1 batch, then we want each batch result
+            # sent to a "batch index" output folder to be collated later
+            # into the requested output_folder.
+            # Otherwise, send the results from the one and only one batch
+            # to the requested output_folder
+            batch_index += 1
+            batch = batch_index
+          end
+
           {
             only_testing: test_batch.map(&:shellsafe_testidentifier),
-            output_directory: output_directory(batch_index + 1, test_batch),
+            output_directory: output_directory(batch_index, test_batch),
             try_count: @options[:try_count],
-            batch: batch_index + 1
+            batch: batch
           }
         end
 
@@ -284,6 +320,9 @@ module TestCenter
             scheme: @options[:scheme],
             result_bundle: @options[:result_bundle]
           ).collate
+          logs_glog_pattern = "#{source_reports_directory_glob}/*system_logs-*.{log,logarchive}"
+          logs = Dir.glob(logs_glog_pattern)
+          FileUtils.mv(logs, absolute_output_directory, force: true)
           FileUtils.rm_rf(Dir.glob(source_reports_directory_glob))
           symlink_result_bundle_to_xcresult(absolute_output_directory, report_name_helper)
           true

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

@@ -12,34 +12,43 @@ module TestCenter
           end
         end
 
+        def simulator_matches_destination(simulator, destination)
+          match = destination.match(/id=(?<udid>[^,]+)/)
+          if match
+            found_match = (match[:udid] == simulator.udid)
+          else
+            match = destination.match(/name=(?<name>[^,]+)/)
+            name = match[:name] || ''
+            match = destination.match(/OS=(?<os_version>[^,]+)/)
+            os_version = match[:os_version] || ''
+
+            found_match = (name == simulator.name && os_version == simulator.os_version)
+          end
+          found_match
+        end
+
         def clone_destination_simulators
           cloned_simulators = []
 
           run_count = @options[:parallel_testrun_count] || 0
+          destinations = Scan.config[:destination].clone
           original_simulators = FastlaneCore::DeviceManager.simulators('iOS').find_all do |simulator|
-            found_match = false
-            Scan.config[:destination].each do |destination|
-              match = destination.match(/id=(?<udid>[^,]+)/)
-              if match
-                found_match = (match[:udid] == simulator.udid)
-              else
-                match = destination.match(/name=(?<name>[^,]+)/)
-                name = match[:name] || ''
-                match = destination.match(/OS=(?<os_version>[^,]+)/)
-                os_version = match[:os_version] || ''
-
-                found_match = (name == simulator.name && os_version == simulator.os_version)
-              end
+            found_simulator = destinations.find do |destination|
+              simulator_matches_destination(simulator, destination)
+            end
+            if found_simulator
+              destinations.delete(found_simulator)
             end
-            found_match
+
+            !found_simulator.nil?
           end
           original_simulators.each(&:shutdown)
           (0...run_count).each do |batch_index|
             cloned_simulators << []
             original_simulators.each do |simulator|
-              FastlaneCore::UI.verbose("Cloning simulator")
               cloned_simulator = simulator.clone
               new_first_name = simulator.name.sub(/( ?\(.*| ?$)/, " Clone #{batch_index + 1}")
+              FastlaneCore::UI.verbose("Cloned simulator #{simulator.name} to (name=#{new_first_name}, udid=#{cloned_simulator.udid}, OS=#{cloned_simulator.ios_version})")
               new_last_name = "#{self.class.name}<#{self.object_id}>"
               cloned_simulator.rename("#{new_first_name} #{new_last_name}")
 

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

@@ -46,6 +46,11 @@ module TestCenter
           end
         end
 
+        def simulator_devices_for_worker(worker_index)
+          return nil unless @options[:platform] == :ios_simulator
+          @clones[worker_index]
+        end
+
         def setup_parallel_workers
           setup_cloned_simulators
           desired_worker_count = @options[:parallel_testrun_count]
@@ -58,6 +63,7 @@ module TestCenter
         def parallel_scan_options(worker_index)
           options = @options.reject { |key| %i[device devices].include?(key) }
           options[:destination] = destination_for_worker(worker_index)
+          options[:scan_devices_override] = simulator_devices_for_worker(worker_index)
           options[:buildlog_path] = buildlog_path_for_worker(worker_index) if @options[:buildlog_path]
           options[:derived_data_path] = derived_data_path_for_worker(worker_index)
           options[:batch_index] = worker_index

data/lib/fastlane/plugin/test_center/helper/scan_helper.rb

@@ -13,7 +13,7 @@ module TestCenter
         )
         # :nocov:
       end
-    
+
       def self.remove_preexisting_simulator_logs(params)
         return unless params[:include_simulator_logs]
     

data/lib/fastlane/plugin/test_center/helper/test_collector.rb

@@ -6,6 +6,7 @@ module TestCenter
 
     class TestCollector
       attr_reader :xctestrun_path
+      attr_reader :only_testing
 
       def initialize(options)
         unless options[:xctestrun] || options[:derived_data_path]
@@ -25,6 +26,8 @@ module TestCenter
         if @batch_count == 1 && options[:parallel_testrun_count] > 1
           @batch_count = options[:parallel_testrun_count]
         end
+
+        @swift_test_prefix = options[:swift_test_prefix]
       end
 
       def only_testing_from_testplan(options)
@@ -92,7 +95,8 @@ module TestCenter
           ::Fastlane::Actions::TestsFromXctestrunAction.available_options,
           {
             xctestrun: @xctestrun_path,
-            invocation_based_tests: @invocation_based_tests
+            invocation_based_tests: @invocation_based_tests,
+            swift_test_prefix: @swift_test_prefix
           }
         )
         ::Fastlane::Actions::TestsFromXctestrunAction.run(config)

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

@@ -1,5 +1,5 @@
 module Fastlane
   module TestCenter
-    VERSION = "3.11.3"
+    VERSION = "3.13.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-test_center
 version: !ruby/object:Gem::Version
-  version: 3.11.3
+  version: 3.13.1
 platform: ruby
 authors:
 - Lyndsey Ferguson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-22 00:00:00.000000000 Z
+date: 2020-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.8
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.8
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -271,6 +271,7 @@ files:
 - lib/fastlane/plugin/test_center/actions/testplans_from_scheme.rb
 - lib/fastlane/plugin/test_center/actions/tests_from_junit.rb
 - lib/fastlane/plugin/test_center/actions/tests_from_xctestrun.rb
+- lib/fastlane/plugin/test_center/helper/fastlane_core/device_manager/simulator_extensions.rb
 - lib/fastlane/plugin/test_center/helper/html_test_report.rb
 - lib/fastlane/plugin/test_center/helper/junit_helper.rb
 - lib/fastlane/plugin/test_center/helper/multi_scan_manager.rb
@@ -309,7 +310,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Makes testing your iOS app easier