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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1046d5102edf4921dec9466f721da07edffa749f3f24fe597873f8542a37d52b
-  data.tar.gz: f269d6a491a84575b7442c9a7642ee69dc3005b596c682a5aa30d19eb76a67d9
+  metadata.gz: e5adcd23e02c79f85550d8bb05a638eeffa1db8461d07c3a17901e12f0a7e7f3
+  data.tar.gz: '059db5183c79f5775d97cb6f38c534b1cb0b916315479ec68311fe953f624062'
 SHA512:
-  metadata.gz: e1cf6be83ddcff5317cd8681aa44e36c3d24e061abdff7fad5c47ec883a91ec09d15ff24eb8727141dacdd04c88327f057bcbdb9ac3504a29b85b26608a6689b
-  data.tar.gz: d8c2523c66da3b53c937720ac16d46d1c4b97953b3940db29a418eeab7a8f9342a72c4d0a1a4882928ac3a7c925806eed9c22c3f78baab49c0416360be96276b
+  metadata.gz: 17582ea3a4f1dbc6ed043fa54bc9949e167cd884b9bd24335b91164cc365b15c9bdaaa697c6c727a921b9ea15ea10f4a2b6d0bc02448e2b7064d05097e36bbdc
+  data.tar.gz: 73ae34df7f25fe36dae15fbf8c9ce8bccc1368194a4e03e086a2463440e9815f495a5f4073b30daac52ca0bb64da75d1403a3a4c7fe614fe486a01ef5a977724

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

@@ -20,8 +20,13 @@ module TestCenter
         def prepare_scan_config_for_destination
           # 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')
+          if ReportNameHelper.includes_xcresult?(@options[:output_types])
+            scan_config._values.delete(:result_bundle)
+            ENV.delete('SCAN_RESULT_BUNDLE')
+          end
           scan_cache.clear
         end
 
@@ -35,7 +40,7 @@ module TestCenter
           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 +57,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

@@ -288,25 +288,6 @@ module TestCenter
         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]

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

@@ -80,7 +80,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 +106,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.1.b.1"
+    VERSION = "3.10.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.10.0
 platform: ruby
 authors:
 - Lyndsey Ferguson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-24 00:00:00.000000000 Z
+date: 2020-03-26 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
@@ -302,9 +303,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: