fastlane-plugin-test_center 3.9.0 → 3.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7dd99b394133508622e5daab51025772002b0b0369e6b7cfd04055dbb51cc0aa
-  data.tar.gz: 30abd18975a3259a86ded79a1e466b386f86ef5f56cab4fefa04397bc80fa25a
+  metadata.gz: '098e845a533aae1482f49c2265234f95e6b6415a6f389fca3956851f009841da'
+  data.tar.gz: 612fa05cd1d3c550ed344ecc34f9f7a54a4d50a701711e33c7154f496d05104e
 SHA512:
-  metadata.gz: 225ffa3158f7bf9b8bea8c6d47c897d4926e003a90f4eae9cd4f6cb1074e5de3943bcaf4111d2d819b611260503f9c2fb537cb334fd8d0ee07c0f501dc75b136
-  data.tar.gz: 449cb428920924775c5aa28c236d367c34453e0ef68d534981c03f8292eb0e8a582043c4992b28e3dff4d21dee6fd96957d2280d39322f34c19a26845aa0e3df
+  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,25 +14,21 @@ 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[:output_types]
-          params[:output_types] = params[:output_types].split(',').map(&:strip).join(',')
-        end
-        if params[:output_files]
-          params[:output_files] = params[:output_files].split(',').map(&:strip).join(',')
+        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
 
-        if FastlaneCore::Helper.xcode_at_least?('11.0.0')
-          if params[:result_bundle]
-            UI.important('As of Xcode 11, test_result bundles created in the output directory are actually symbolic links to an xcresult bundle')
-          end
-        elsif params[:output_types]&.include?('xcresult')
-          UI.important("The 'xcresult' :output_type is only supported for Xcode 11 and greater. You are using #{FastlaneCore::Helper.xcode_version}.")
-        end
+        strip_leading_and_trailing_whitespace_from_output_types(params)
+
+        warn_of_xcode11_result_bundle_incompatability(params)
+        warn_of_parallelism_with_circle_ci(params)
+
         print_multi_scan_parameters(params)
         force_quit_simulator_processes if params[:quit_simulators]
 
         prepare_for_testing(params.values)
-        
+
         coerce_destination_to_array(params)
         platform = :mac
         platform = :ios_simulator if Scan.config[:destination].any? { |d| d.include?('platform=iOS Simulator') }
@@ -43,17 +39,43 @@ module Fastlane
 
         summary = run_summary(params, tests_passed)
         print_run_summary(summary)
-        
+
         if params[:fail_build] && !tests_passed
           raise UI.test_failure!('Tests have failed')
         end
         summary
       end
 
+      def self.warn_of_parallelism_with_circle_ci(params)
+        if params[:parallel_testrun_count] > 1 && Helper.is_circle_ci?
+          UI.important("Warning: problems have occurreed when running parallel simulators on Circle CI.")
+          UI.message("  See https://github.com/lyndsey-ferguson/fastlane-plugin-test_center/issues/179")
+        end
+      end
+
+      def self.strip_leading_and_trailing_whitespace_from_output_types(params)
+        if params[:output_types]
+          params[:output_types] = params[:output_types].split(',').map(&:strip).join(',')
+        end
+        if params[:output_files]
+          params[:output_files] = params[:output_files].split(',').map(&:strip).join(',')
+        end
+      end
+
+      def self.warn_of_xcode11_result_bundle_incompatability(params)
+        if FastlaneCore::Helper.xcode_at_least?('11.0.0')
+          if params[:result_bundle]
+            UI.important('As of Xcode 11, test_result bundles created in the output directory are actually symbolic links to an xcresult bundle')
+          end
+        elsif params[:output_types]&.include?('xcresult')
+          UI.important("The 'xcresult' :output_type is only supported for Xcode 11 and greater. You are using #{FastlaneCore::Helper.xcode_version}.")
+        end
+      end
+
       def self.coerce_destination_to_array(params)
         destination = params[:destination] || Scan.config[:destination] || []
         unless destination.kind_of?(Array)
-          params[:destination] = Scan.config[:destination] = [destination] 
+          params[:destination] = Scan.config[:destination] = [destination]
         end
       end
 
@@ -68,7 +90,7 @@ module Fastlane
         # :nocov:
       end
 
-      def self.print_run_summary(summary)        
+      def self.print_run_summary(summary)
         return if Helper.test?
 
         # :nocov:
@@ -147,6 +169,7 @@ module Fastlane
       def self.prepare_for_testing(scan_options)
         reset_scan_config_to_defaults
         use_scanfile_to_override_settings(scan_options)
+        turn_off_concurrent_workers(scan_options)
         ScanHelper.remove_preexisting_simulator_logs(scan_options)
         if scan_options[:test_without_building] || scan_options[:skip_build]
           UI.verbose("Preparing Scan config options for multi_scan testing")
@@ -157,6 +180,12 @@ module Fastlane
         end
       end
 
+      def self.turn_off_concurrent_workers(scan_options)
+        if Gem::Version.new(Fastlane::VERSION) >= Gem::Version.new('2.142.0')
+          scan_options.delete(:concurrent_workers) if scan_options[:concurrent_workers].to_i > 0
+        end
+      end
+
       def self.reset_scan_config_to_defaults
         return unless Scan.config
 
@@ -173,7 +202,7 @@ module Fastlane
         overridden_options = ScanHelper.options_from_configuration_file(
           ScanHelper.scan_options_from_multi_scan_options(scan_options)
         )
-        
+
         unless overridden_options.empty?
           FastlaneCore::UI.important("Scanfile found: overriding multi_scan options with it's values.")
           overridden_options.each do |k,v|
@@ -303,6 +332,13 @@ module Fastlane
               UI.user_error!("Error: Batch counts must be greater than zero") unless count > 0
             end
           ),
+          FastlaneCore::ConfigItem.new(
+            key: :retry_test_runner_failures,
+            description: "Set to true If you want to treat build failures during testing, like 'Test runner exited before starting test execution', as 'all tests failed'",
+            type: Boolean,
+            default_value: false,
+            optional: true
+          ),
           FastlaneCore::ConfigItem.new(
             key: :invocation_based_tests,
             description: "Set to true If your test suit have invocation based tests like Kiwi",
@@ -374,7 +410,7 @@ module Fastlane
           UI.important(
             'example: ' \\
             'split the tests into 4 batches and run each batch of tests in ' \\
-            'parallel up to 3 times if tests fail. Abort the testing early ' \\ 
+            'parallel up to 3 times if tests fail. Abort the testing early ' \\
             'if there are too many failing tests by passing in a ' \\
             ':testrun_completed_block that is called by :multi_scan ' \\
             'after each run of tests.'

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

@@ -17,17 +17,23 @@ module Fastlane
         scheme_filepaths.each do |scheme_filepath|
           is_dirty = false
           xcscheme = Xcodeproj::XCScheme.new(scheme_filepath)
-          xcscheme.test_action.testables.each do |testable|
-            buildable_name = File.basename(testable.buildable_references[0].buildable_name, '.xctest')
-
-            tests_to_skip = all_tests_to_skip.select { |test| test.start_with?(buildable_name) }
-                                             .map { |test| test.sub("#{buildable_name}/", '') }
-
-            tests_to_skip.each do |test_to_skip|
-              skipped_test = Xcodeproj::XCScheme::TestAction::TestableReference::SkippedTest.new
-              skipped_test.identifier = test_to_skip
-              testable.add_skipped_test(skipped_test)
-              is_dirty = true
+          testplans = xcscheme.test_action.test_plans
+          unless testplans.nil?
+            container_directory = File.absolute_path(File.dirname(params[:xcodeproj] || params[:workspace]))
+            update_testplans(container_directory, testplans, all_tests_to_skip)
+          else
+            xcscheme.test_action.testables.each do |testable|
+              buildable_name = File.basename(testable.buildable_references[0].buildable_name, '.xctest')
+
+              tests_to_skip = all_tests_to_skip.select { |test| test.start_with?(buildable_name) }
+                                               .map { |test| test.sub("#{buildable_name}/", '') }
+
+              tests_to_skip.each do |test_to_skip|
+                skipped_test = Xcodeproj::XCScheme::TestAction::TestableReference::SkippedTest.new
+                skipped_test.identifier = test_to_skip
+                testable.add_skipped_test(skipped_test)
+                is_dirty = true
+              end
             end
           end
           xcscheme.save! if is_dirty
@@ -35,6 +41,24 @@ module Fastlane
         nil
       end
 
+      def self.update_testplans(container_directory, testplans, all_tests_to_skip)
+        testplans.each do |testplan_reference|
+          testplan_filename = testplan_reference.target_referenced_container.sub('container:', '')
+          testplan_filepath = File.join(container_directory, testplan_filename)
+          file = File.read(testplan_filepath)
+          testplan = JSON.parse(file)
+          testplan['testTargets'].each do |test_target|
+            buildable_name = test_target.dig('target', 'name')
+            tests_to_skip = all_tests_to_skip.select { |test| test.start_with?(buildable_name) }
+              .map { |test| test.sub("#{buildable_name}/", '') }
+            test_target['selectedTests'].reject! { |t| tests_to_skip.include?(t) }
+          end
+          File.open(testplan_filepath, 'w') do |f|
+            f.write(JSON.pretty_generate(testplan).gsub('/', '\/'))
+          end
+        end
+      end
+
       def self.schemes_from_project(project_path, scheme)
         return nil unless project_path
 

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

@@ -2,6 +2,7 @@ module Fastlane
   module Actions
     class SuppressedTestsAction < Action
       require 'set'
+      require 'json'
 
       def self.run(params)
         scheme = params[:scheme]
@@ -15,13 +16,19 @@ module Fastlane
         skipped_tests = Set.new
         scheme_filepaths.each do |scheme_filepath|
           xcscheme = Xcodeproj::XCScheme.new(scheme_filepath)
-          xcscheme.test_action.testables.each do |testable|
-            buildable_name = testable.buildable_references[0]
-                                     .buildable_name
+          testplans = xcscheme.test_action.test_plans
+          unless testplans.nil?
+            UI.important("Error: unable to read suppressed tests from Xcode Scheme #{File.basename(scheme_filepath)}.")
+            UI.message("The scheme is using a testplan which does not list skipped tests.")
+          else
+            xcscheme.test_action.testables.each do |testable|
+              buildable_name = testable.buildable_references[0]
+                                       .buildable_name
 
-            buildable_name = File.basename(buildable_name, '.xctest')
-            testable.skipped_tests.map do |skipped_test|
-              skipped_tests.add("#{buildable_name}/#{skipped_test.identifier}")
+              buildable_name = File.basename(buildable_name, '.xctest')
+              testable.skipped_tests.map do |skipped_test|
+                skipped_tests.add("#{buildable_name}/#{skipped_test.identifier}")
+              end
             end
           end
         end

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

@@ -11,10 +11,26 @@ module Fastlane
       def self.xctestrun_tests(xctestrun_path, invocation_based_tests)
         xctestrun = Plist.parse_xml(xctestrun_path)
         xctestrun_rootpath = File.dirname(xctestrun_path)
-        tests = Hash.new([])
-        xctestrun.each do |testable_name, xctestrun_config|
-          next if ignoredTestables.include? testable_name
+        xctestrun_version = xctestrun.fetch('__xctestrun_metadata__', Hash.new).fetch('FormatVersion', 1)
 
+        test_targets = []
+        if xctestrun_version == 1
+          xctestrun.each do |testable_name, test_target_config|
+            next if ignoredTestables.include? 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_targets << test_target
+            end
+          end
+        end
+
+        tests = Hash.new([])
+        test_targets.each do |xctestrun_config|
+          testable_name = xctestrun_config['ProductModuleName']
           xctest_path = xctest_bundle_path(xctestrun_rootpath, xctestrun_config)
           test_identifiers = []
           if xctestrun_config.key?('OnlyTestIdentifiers')

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

@@ -17,11 +17,18 @@ module TestCenter
         end
         # :nocov:
 
-        def prepare_scan_config_for_destination
+        def prepare_scan_config
           # this allows multi_scan's `destination` option to be picked up by `scan`
           scan_config._values.delete(:device)
+          ENV.delete('SCAN_DEVICE')
           scan_config._values.delete(:devices)
-          scan_config._values.delete(:result_bundle) if ReportNameHelper.includes_xcresult?(@options[:output_types])
+          ENV.delete('SCAN_DEVICES')
+          # this prevents double -resultBundlePath args to xcodebuild
+          if ReportNameHelper.includes_xcresult?(@options[:output_types])
+            scan_config._values.delete(:result_bundle)
+            ENV.delete('SCAN_RESULT_BUNDLE')
+          end
+          scan_config._values.delete(:skip_testing)
           scan_cache.clear
         end
 
@@ -30,12 +37,13 @@ module TestCenter
           scan_options = @options.select { |k,v| valid_scan_keys.include?(k) }
                                   .merge(@retrying_scan_helper.scan_options)
 
-          prepare_scan_config_for_destination
+          prepare_scan_config
           scan_options[:build_for_testing] = false
+          scan_options.delete(:skip_testing)
           FastlaneCore::UI.verbose("retrying_scan #update_scan_options")
           scan_options.each do |k,v|
             next if v.nil?
- 
+
             scan_config.set(k,v) unless v.nil?
             FastlaneCore::UI.verbose("\tSetting #{k.to_s} to #{v}")
           end
@@ -52,7 +60,7 @@ module TestCenter
           begin
             @retrying_scan_helper.before_testrun
             update_scan_options
-            
+
             values = scan_config.values(ask: false)
             values[:xcode_path] = File.expand_path("../..", FastlaneCore::Helper.xcode_path)
             ScanHelper.print_scan_parameters(values)

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

@@ -88,11 +88,16 @@ module TestCenter
 
         def scan_options
           valid_scan_keys = Fastlane::Actions::ScanAction.available_options.map(&:key)
-          xcargs = @options[:xcargs]
+          xcargs = @options[:xcargs] || ''
           if xcargs&.include?('build-for-testing')
             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(
             {
               output_directory: output_directory,
@@ -125,7 +130,11 @@ module TestCenter
             after_testrun_message << " for batch ##{@options[:batch]}" unless @options[:batch].nil?
             FastlaneCore::UI.verbose(after_testrun_message)
 
-            handle_build_failure(exception)
+            if @options[:retry_test_runner_failures]
+              continue_with_build_failure(exception)
+            else
+              handle_build_failure(exception)
+            end
           else
             after_testrun_message = "Scan passed the tests"
             after_testrun_message << " for batch ##{@options[:batch]}" unless @options[:batch].nil?
@@ -240,12 +249,27 @@ module TestCenter
               junit: File.absolute_path(report_filepath)
             }
           )
-          @options[:only_testing] = Fastlane::Actions::TestsFromJunitAction.run(config)[:failed].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
         end
 
+        def continue_with_build_failure(exception)
+          test_session_last_messages = last_lines_of_test_session_log
+          failure = retrieve_test_operation_failure(test_session_last_messages)
+          case failure
+          when /Lost connection to testmanagerd/
+            FastlaneCore::UI.important("com.apple.CoreSimulator.CoreSimulatorService may have become corrupt, consider quitting it")
+            if @options[:quit_core_simulator_service]
+              Fastlane::Actions::RestartCoreSimulatorServiceAction.run
+            end
+          else
+            FastlaneCore::UI.important(test_session_last_messages)
+          end
+          send_callback_testrun_info(test_operation_failure: failure)
+        end
+
         def handle_build_failure(exception)
           test_session_last_messages = last_lines_of_test_session_log
           failure = retrieve_test_operation_failure(test_session_last_messages)
@@ -262,11 +286,31 @@ module TestCenter
             FastlaneCore::UI.error(test_session_last_messages)
             send_callback_testrun_info(test_operation_failure: failure)
             raise exception
+            FastlaneCore::UI.important(test_session_last_messages)
           end
           send_callback_testrun_info(test_operation_failure: failure)
         end
 
         def retrieve_test_operation_failure(test_session_last_messages)
+          if FastlaneCore::Helper.xcode_at_least?(11)
+            retrieve_test_operation_failure_post_xcode11(test_session_last_messages)
+          else
+            retrieve_test_operation_failure_pre_xcode11(test_session_last_messages)
+          end
+        end
+
+        def retrieve_test_operation_failure_post_xcode11(test_session_last_messages)
+          if /Connection peer refused channel request/ =~ test_session_last_messages
+            test_operation_failure = 'Lost connection to testmanagerd'
+          elsif /Please unlock your device and reattach/ =~ test_session_last_messages
+            test_operation_failure = 'Test device locked'
+          elsif /Test runner exited before starting test execution/ =~ test_session_last_messages
+            test_operation_failure = 'Test runner exited before starting test execution'
+          end
+          test_operation_failure
+        end
+
+        def retrieve_test_operation_failure_pre_xcode11(test_session_last_messages)
           test_operation_failure_match = /Test operation failure: (?<test_operation_failure>.*)$/ =~ test_session_last_messages
           if test_operation_failure_match.nil?
             test_operation_failure = 'Unknown test operation failure'

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

@@ -7,7 +7,7 @@ module TestCenter
       require 'json'
       require 'shellwords'
       require 'snapshot/reset_simulators'
-      
+
       class Runner
         attr_reader :retry_total_count
 
@@ -66,12 +66,12 @@ module TestCenter
           end
 
           unless tests_passed || @options[:try_count] < 1
-            setup_testcollector  
+            setup_testcollector
             tests_passed = run_test_batches
           end
           tests_passed
         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]
@@ -114,16 +114,16 @@ module TestCenter
           end
           @options[:output_directory] = output_directory
           @options[:destination] = Scan.config[:destination]
-          
+
           # We do not want Scan.config to _not_ have :device :devices, we want to
           # use :destination. We remove :force_quit_simulator as we do not want
           # Scan to handle it as multi_scan takes care of it in its own way
           options = @options.reject { |key| %i[device devices force_quit_simulator].include?(key) }
           options[:try_count] = 1
-  
+
           tests_passed = RetryingScan.run(options)
           @options[:try_count] -= 1
-          
+
           reportnamer = ReportNameHelper.new(
             @options[:output_types],
             @options[:output_files],
@@ -138,12 +138,12 @@ module TestCenter
           )
           @options[:only_testing] = retrieve_failed_single_try_tests
           @options[:only_testing] = @options[:only_testing].map(&:strip_testcase).uniq
-          
+
           symlink_result_bundle_to_xcresult(output_directory, reportnamer)
 
           tests_passed
         end
-        
+
         def retrieve_failed_single_try_tests
           reportnamer = ReportNameHelper.new(
             @options[:output_types],
@@ -168,10 +168,10 @@ module TestCenter
 
           pool = TestBatchWorkerPool.new(pool_options)
           pool.setup_workers
-          
+
           remaining_test_batches = @test_collector.test_batches.clone
           remaining_test_batches.each_with_index do |test_batch, current_batch_index|
-            worker = pool.wait_for_worker              
+            worker = pool.wait_for_worker
             FastlaneCore::UI.message("Starting test run #{current_batch_index + 1}")
             worker.run(scan_options_for_worker(test_batch, current_batch_index))
           end
@@ -189,7 +189,7 @@ module TestCenter
             batch: batch_index + 1
           }
         end
-  
+
         def collate_batched_reports
           return unless @batch_count > 1
           return unless @options[:collate_reports]
@@ -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/helper/multi_scan_manager/simulator_helper.rb

@@ -16,11 +16,22 @@ module TestCenter
           cloned_simulators = []
 
           run_count = @options[:parallel_testrun_count] || 0
-          destination_simulator_ids = Scan.config[:destination].map do |destination|
-            destination.split(',id=').last
-          end
           original_simulators = FastlaneCore::DeviceManager.simulators('iOS').find_all do |simulator|
-            destination_simulator_ids.include?(simulator.udid)
+            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
+            end
+            found_match
           end
           original_simulators.each(&:shutdown)
           (0...run_count).each do |batch_index|

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

@@ -42,9 +42,7 @@ module TestCenter
           if @only_testing
             @testables ||= only_testing_to_testables_tests.keys
           else
-            @testables ||= Plist.parse_xml(@xctestrun_path).keys.reject do |key|
-              key == '__xctestrun_metadata__'
-            end
+            @testables = xctestrun_known_tests.keys
           end
         end
         @testables
@@ -80,7 +78,7 @@ module TestCenter
               known_tests += xctestrun_known_tests[testable]
               test_components = test.split('/')
               testsuite = test_components.size == 1 ? test_components[0] : test_components[1]
-              @testables_tests[testable][index] = known_tests.select { |known_test| known_test.include?(testsuite) } 
+              @testables_tests[testable][index] = known_tests.select { |known_test| known_test.include?(testsuite) }
             end
           end
           @testables_tests[testable].flatten!
@@ -106,7 +104,7 @@ module TestCenter
             end
           end
         end
-        
+
         @testables_tests
       end
 

data/lib/fastlane/plugin/test_center/helper/xcodeproj/scheme/test_action.rb

@@ -0,0 +1,25 @@
+module Xcodeproj
+    class XCScheme
+      class TestAction < AbstractSchemeAction
+        def test_plans
+          return [] unless @xml_element.elements['TestPlans']
+
+          @xml_element.elements['TestPlans'].get_elements('TestPlanReference').map do |node|
+            TestPlanReference.new(node)
+          end
+        end
+      end
+
+      class TestPlanReference < XMLElementWrapper
+        def initialize(node)
+          create_xml_element_with_fallback(node, 'TestPlanReference') do
+          end
+        end
+
+        def target_referenced_container
+          @xml_element.attributes['reference']
+        end
+      end
+    end
+end
+

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

@@ -1,5 +1,5 @@
 module Fastlane
   module TestCenter
-    VERSION = "3.9.0"
+    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.9.0
+  version: 3.10.3
 platform: ruby
 authors:
 - Lyndsey Ferguson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-20 00:00:00.000000000 Z
+date: 2020-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -285,6 +285,7 @@ files:
 - lib/fastlane/plugin/test_center/helper/scan_helper.rb
 - lib/fastlane/plugin/test_center/helper/test_collector.rb
 - lib/fastlane/plugin/test_center/helper/xcodebuild_string.rb
+- lib/fastlane/plugin/test_center/helper/xcodeproj/scheme/test_action.rb
 - lib/fastlane/plugin/test_center/helper/xctestrun_info.rb
 - lib/fastlane/plugin/test_center/version.rb
 homepage: https://github.com/lyndsey-ferguson/fastlane-plugin-test_center