fastlane-plugin-test_center 3.9.1.b.1 → 3.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1046d5102edf4921dec9466f721da07edffa749f3f24fe597873f8542a37d52b
-  data.tar.gz: f269d6a491a84575b7442c9a7642ee69dc3005b596c682a5aa30d19eb76a67d9
+  metadata.gz: 1fe7c4581f1be17faf807466f1b9b82cf6ee917fef0695c861ef718417dc4c0d
+  data.tar.gz: e0b966985549a444bfcafafa4926eb4f4927f6f43b12b39aa0b025c935e6b185
 SHA512:
-  metadata.gz: e1cf6be83ddcff5317cd8681aa44e36c3d24e061abdff7fad5c47ec883a91ec09d15ff24eb8727141dacdd04c88327f057bcbdb9ac3504a29b85b26608a6689b
-  data.tar.gz: d8c2523c66da3b53c937720ac16d46d1c4b97953b3940db29a418eeab7a8f9342a72c4d0a1a4882928ac3a7c925806eed9c22c3f78baab49c0416360be96276b
+  metadata.gz: f412ba3da2f63443923a94dec51b9f8bd7ed792ab98b4e0c1076fad2520e2a22eed74d3214cab40b36266c2fe35ca136194f4fdcd0e6d42c9730c80237fa0dff
+  data.tar.gz: fc7cb57702c648d99079d092b03abf44726a7fe6ac229da7202d73fe745de3e7d33be40675d0b8f0ce2827fbb7cc314d335a2019163b6a675b4cd5177e5e711b

data/README.md

@@ -91,6 +91,11 @@ 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).
 
+## Supporters
+
+![Владислав Давыдов](https://avatars1.githubusercontent.com/u/47553334?s=44&u=4691860dba898943b947180b3d28bb85851b0d7c&v=4)
+[vdavydovHH](https://github.com/vdavydovHH)
+
 ## 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)
 
@@ -228,7 +232,7 @@ module Fastlane
       end
 
       def self.prepare_scan_options_for_build_for_testing(scan_options)
-        build_options = scan_options.merge(build_for_testing: true).reject { |k| k == :test_without_building }
+        build_options = scan_options.merge(build_for_testing: true).reject { |k| %i[test_without_building, testplan].include?(k) }
         Scan.config = FastlaneCore::Configuration.create(
           Fastlane::Actions::ScanAction.available_options,
           ScanHelper.scan_options_from_multi_scan_options(build_options)
@@ -240,7 +244,11 @@ module Fastlane
       end
 
       def self.update_xctestrun_after_build(scan_options)
-        xctestrun_files = Dir.glob("#{Scan.config[:derived_data_path]}/Build/Products/*.xctestrun")
+        glob_pattern = "#{Scan.config[:derived_data_path]}/Build/Products/*.xctestrun"
+        if scan_options[:testplan]
+          glob_pattern = "#{Scan.config[:derived_data_path]}/Build/Products/*#{scan_options[:testplan]}*.xctestrun"
+        end
+        xctestrun_files = Dir.glob(glob_pattern)
         UI.verbose("After building, found xctestrun files #{xctestrun_files} (choosing 1st)")
         scan_options[:xctestrun] = xctestrun_files.first
       end

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/test_options_from_testplan.rb

@@ -0,0 +1,90 @@
+require 'json'
+
+module Fastlane
+  module Actions
+    class TestOptionsFromTestplanAction < Action
+      def self.run(params)
+        testplan_path = params[:testplan]
+
+        testplan = JSON.load(File.open(testplan_path))
+        only_testing = []
+        UI.verbose("Examining testplan JSON: #{testplan}")
+        testplan['testTargets'].each do |test_target|
+          testable = test_target.dig('target', 'name')
+          if test_target.key?('selectedTests')
+            UI.verbose("  Found selectedTests")
+            test_identifiers = test_target['selectedTests'].each do |selected_test|
+              UI.verbose("    Found test: '#{selected_test}'")
+              only_testing << "#{testable}/#{selected_test.sub('\/', '/')}"
+            end
+          else
+            UI.verbose("  No selected tests, using testable '#{testable}'")
+            only_testing << testable
+          end
+        end
+        {
+          code_coverage: testplan.dig('defaultOptions', 'codeCoverage'),
+          only_testing: only_testing
+        }
+      end
+
+      #####################################################
+      # @!group Documentation
+      #####################################################
+
+      def self.description
+        "☑️ Gets test info from a given test plan"
+      end
+
+      def self.details
+        "Gets tests info consisting of tests to run and whether or not code coverage is enabled"
+      end
+
+      def self.available_options
+        [
+          FastlaneCore::ConfigItem.new(
+            key: :testplan,
+            optional: true,
+            env_name: "FL_TEST_OPTIONS_FROM_TESTPLAN_TESTPLAN",
+            description: "The Xcode testplan to read the test info from",
+            verify_block: proc do |test_plan|
+              UI.user_error!("Error: Xcode Test Plan '#{test_plan}' is not valid!") if test_plan and test_plan.empty?
+              UI.user_error!("Error: Test Plan does not exist at path '#{test_plan}'") unless File.exist?(test_plan)
+            end
+          )
+        ]
+      end
+
+      def self.return_value
+        "Returns a Hash with keys :code_coverage and :only_testing for the given testplan"
+      end
+
+      def self.example_code
+        [
+          "
+          UI.important(
+            'example: ' \\
+            'get the tests and the test coverage configuration from a given testplan'
+          )
+          test_options = test_options_from_testplan(
+            testplan: 'AtomicBoy/AtomicBoy_2.xctestplan'
+          )
+          UI.message(\"The AtomicBoy_2 testplan has the following tests: \#{test_options[:only_testing]}\")
+          "
+        ]
+      end
+
+      def self.authors
+        ["lyndsey-ferguson/lyndseydf"]
+      end
+
+      def self.category
+        :testing
+      end
+
+      def self.is_supported?(platform)
+        %i[ios mac].include?(platform)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,120 @@
+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
+        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}.*/, '')
+          xcscheme.test_action.test_plans.each do |testplan|
+            testplan_path = File.absolute_path(File.join(container_dir, testplan.target_referenced_container.sub('container:', '')))
+            UI.verbose("  found testplan '#{testplan_path}'")
+            testplan_paths << testplan_path
+          end
+        end
+        testplan_paths
+      end
+
+      def self.schemes_from_project(project_path, scheme)
+        return nil unless project_path
+
+        Dir.glob("#{project_path}/{xcshareddata,xcuserdata}/**/xcschemes/#{scheme || '*'}.xcscheme")
+      end
+
+      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|
+          next if file_reference.path.include?('Pods/Pods.xcodeproj')
+
+          project_path = file_reference.absolute_path(File.dirname(workspace_path))
+          scheme_filepaths.concat(schemes_from_project(project_path, scheme))
+        end
+        scheme_filepaths
+      end
+
+      def self.description
+        "☑️Gets all the testplans that a Scheme references"
+      end
+
+      def self.authors
+        ["lyndsey-ferguson/lyndseydf"]
+      end
+
+      def self.available_options
+        [
+          FastlaneCore::ConfigItem.new(
+            key: :xcodeproj,
+            env_name: "FL_TESTPLANS_FROM_SCHEME_XCODE_PROJECT",
+            optional: true,
+            description: "The file path to the Xcode project file that references the Scheme",
+            verify_block: proc do |path|
+              path = File.expand_path(path.to_s)
+              UI.user_error!("Error: Xcode project file path not given!") unless path and !path.empty?
+              UI.user_error!("Error: Xcode project '#{path}' not found!") unless Dir.exist?(path)
+            end
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :workspace,
+            env_name: "FL_TESTPLANS_FROM_SCHEME_XCODE_WORKSPACE",
+            optional: true,
+            description: "The file path to the Xcode workspace file that references the Scheme",
+            verify_block: proc do |value|
+              v = File.expand_path(value.to_s)
+              UI.user_error!("Error: Workspace file not found at path '#{v}'") unless Dir.exist?(v)
+              UI.user_error!("Error: Workspace file is not a workspace, must end with .xcworkspace") unless v.include?(".xcworkspace")
+            end
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :scheme,
+            optional: true,
+            env_name: "FL_TESTPLANS_FROM_SCHEME_XCODE_SCHEME",
+            description: "The Xcode scheme referencing the testplan",
+            verify_block: proc do |scheme_name|
+              UI.user_error!("Error: Xcode Scheme '#{scheme_name}' is not valid!") if scheme_name and scheme_name.empty?
+            end
+          )
+        ]
+      end
+
+      def self.example_code
+        [
+          "
+          UI.important(
+            'example: ' \\
+            'get all the testplans that an Xcode Scheme references'
+          )
+          testplans = testplans_from_scheme(
+            xcodeproj: 'AtomicBoy/AtomicBoy.xcodeproj',
+            scheme: 'AtomicBoy'
+          )
+          UI.message(\"The AtomicBoy uses the following testplans: \#{testplans}\")
+          "
+        ]
+      end
+
+      def self.category
+        :testing
+      end
+
+      def self.is_supported?(platform)
+        %i[ios mac].include?(platform)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,82 @@
+module Fastlane
+  module Actions
+    module SharedValues
+      TESTS_FROM_XCRESULT_CUSTOM_VALUE = :TESTS_FROM_XCRESULT_CUSTOM_VALUE
+    end
+
+    class TestsFromXcresultAction < Action
+      def self.run(params)
+        # fastlane will take care of reading in the parameter and fetching the environment variable:
+        UI.message "Parameter API Token: #{params[:api_token]}"
+
+        # sh "shellcommand ./path"
+
+        # Actions.lane_context[SharedValues::TESTS_FROM_XCRESULT_CUSTOM_VALUE] = "my_val"
+      end
+
+      #####################################################
+      # @!group Documentation
+      #####################################################
+
+      def self.description
+        "A short description with <= 80 characters of what this action does"
+      end
+
+      def self.details
+        # Optional:
+        # this is your chance to provide a more detailed description of this action
+        "You can use this action to do cool things..."
+      end
+
+      def self.available_options
+        # Define all options your action supports. 
+        
+        # Below a few examples
+        [
+          FastlaneCore::ConfigItem.new(key: :api_token,
+                                       env_name: "FL_TESTS_FROM_XCRESULT_API_TOKEN", # The name of the environment variable
+                                       description: "API Token for TestsFromXcresultAction", # a short description of this parameter
+                                       verify_block: proc do |value|
+                                          UI.user_error!("No API token for TestsFromXcresultAction given, pass using `api_token: 'token'`") unless (value and not value.empty?)
+                                          # UI.user_error!("Couldn't find file at path '#{value}'") unless File.exist?(value)
+                                       end),
+          FastlaneCore::ConfigItem.new(key: :development,
+                                       env_name: "FL_TESTS_FROM_XCRESULT_DEVELOPMENT",
+                                       description: "Create a development certificate instead of a distribution one",
+                                       is_string: false, # true: verifies the input is a string, false: every kind of value
+                                       default_value: false) # the default value if the user didn't provide one
+        ]
+      end
+
+      def self.output
+        # Define the shared values you are going to provide
+        # Example
+        [
+          ['TESTS_FROM_XCRESULT_CUSTOM_VALUE', 'A description of what this value contains']
+        ]
+      end
+
+      def self.return_value
+        # If your method provides a return value, you can describe here what it does
+      end
+
+      def self.authors
+        # So no one will ever forget your contribution to fastlane :) You are awesome btw!
+        ["Your GitHub/Twitter Name"]
+      end
+
+      def self.is_supported?(platform)
+        # you can do things like
+        # 
+        #  true
+        # 
+        #  platform == :ios
+        # 
+        #  [:ios, :mac].include?(platform)
+        # 
+
+        platform == :ios
+      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.rb

@@ -1,3 +1,5 @@
+require_relative 'reportname_helper'
+require_relative 'test_collector'
 require_relative 'multi_scan_manager/device_manager'
 require_relative 'multi_scan_manager/report_collator'
 require_relative 'multi_scan_manager/retrying_scan_helper'

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

@@ -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

@@ -1,4 +1,3 @@
-
 module TestCenter
   module Helper
     module MultiScanManager
@@ -40,7 +39,8 @@ module TestCenter
           return if @options[:invocation_based_tests] && @options[:only_testing].nil?
           return if @test_collector
 
-          @test_collector = TestCenter::Helper::TestCollector.new(@options)
+          @test_collector = TestCollector.new(@options)
+          @options.reject! { |key| %i[testplan].include?(key) }
           @batch_count = @test_collector.test_batches.size
         end
 
@@ -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/test_collector.rb

@@ -15,7 +15,7 @@ module TestCenter
         unless @xctestrun_path && File.exist?(@xctestrun_path)
           FastlaneCore::UI.user_error!("Error: cannot find xctestrun file '#{@xctestrun_path}'")
         end
-        @only_testing = options[:only_testing]
+        @only_testing = options[:only_testing] || only_testing_from_testplan(options)
         if @only_testing.kind_of?(String)
           @only_testing = @only_testing.split(',')
         end
@@ -27,6 +27,36 @@ module TestCenter
         end
       end
 
+      def only_testing_from_testplan(options)
+        return unless options[:testplan] && options[:scheme]
+
+        config = FastlaneCore::Configuration.create(
+          Fastlane::Actions::TestplansFromSchemeAction.available_options,
+          {
+            workspace: options[:workspace],
+            xcodeproj: options[:project],
+            scheme: options[:scheme]
+          }
+        )
+        testplans = Fastlane::Actions::TestplansFromSchemeAction.run(config)
+        FastlaneCore::UI.verbose("TestCollector found testplans: #{testplans}")
+        testplan = testplans.find do |testplan_path|
+          %r{(.*/?#{ options[:testplan] })\.xctestplan}.match?(testplan_path)
+        end
+        FastlaneCore::UI.verbose("  using :testplan option, #{options[:testplan]}, using found one: #{testplan}")
+
+        return if testplan.nil?
+
+        config = FastlaneCore::Configuration.create(
+          Fastlane::Actions::TestOptionsFromTestplanAction.available_options,
+          {
+            testplan: testplan
+          }
+        )
+        test_options = Fastlane::Actions::TestOptionsFromTestplanAction.run(config)
+        return test_options[:only_testing]
+      end
+
       def default_derived_data_path(options)
         project_derived_data_path = Scan.project.build_settings(key: "BUILT_PRODUCTS_DIR")
         File.expand_path("../../..", project_derived_data_path)
@@ -42,9 +72,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

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.1.b.1"
+    VERSION = "3.11.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-test_center
 version: !ruby/object:Gem::Version
-  version: 3.9.1.b.1
+  version: 3.11.0
 platform: ruby
 authors:
 - Lyndsey Ferguson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-24 00:00:00.000000000 Z
+date: 2020-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -267,7 +267,10 @@ files:
 - lib/fastlane/plugin/test_center/actions/suppress_tests.rb
 - lib/fastlane/plugin/test_center/actions/suppress_tests_from_junit.rb
 - lib/fastlane/plugin/test_center/actions/suppressed_tests.rb
+- lib/fastlane/plugin/test_center/actions/test_options_from_testplan.rb
+- 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_xcresult.rb
 - lib/fastlane/plugin/test_center/actions/tests_from_xctestrun.rb
 - lib/fastlane/plugin/test_center/helper/html_test_report.rb
 - lib/fastlane/plugin/test_center/helper/junit_helper.rb
@@ -285,6 +288,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
@@ -302,9 +306,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.6
 signing_key: