fastlane-plugin-test_center 3.11.3 → 3.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8ca5a9222720b8b5159174407b28d8675636e19c3cd9ee1e4950f37069acb50
-  data.tar.gz: 290ebef85ce82943353cbf4ca7593b431a2ab903c8dc552932705c61c3b11771
+  metadata.gz: cad9b8dc9f0a32d294ac1d2a854ed5245992ef5b42ab354387c8b3dba6c5571a
+  data.tar.gz: 6112ba8a64cf378c96c5997be419f13b57a75c156f5781b9f1d755a09d8559c1
 SHA512:
-  metadata.gz: 162eab51a51e48d16a0dc84c72de87c310fbecfd75e61ddb6a531dc3d3ee8047f17950a826e60f6cfc25d81f2b586132716d5d470c31f8308a72d4efaae3c145
-  data.tar.gz: 5070579e0c6b38115908238c3a5b6335edf3791c7cc44e62587138304199b439c875ebf2a3fb97cb798e81eb3cfaffd3a990215d8cf2b48d3fbfdb5c55bafc37
+  metadata.gz: d158818861f01c4e1d59f2625dbc40cb73df7327566f5ad933eab199530217e5bd2f97a7684e21e9fd29e0df18ad9f8c6ac0648b5d8619d81c913d2eb8427dde
+  data.tar.gz: 8b70dfc5f9e97937177edccbc708c3ac13a1b74be9b5035dab31fbd76cb195ad86c8ddc62a1b3efcacb052dc0d4a7fe010514d4ed48c5e8b1217189ce5f1ba21

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

@@ -232,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| %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) }
         Scan.config = FastlaneCore::Configuration.create(
           Fastlane::Actions::ScanAction.available_options,
           ScanHelper.scan_options_from_multi_scan_options(build_options)

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

@@ -337,8 +337,12 @@ 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)

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

@@ -284,6 +284,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)
           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/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module TestCenter
-    VERSION = "3.11.3"
+    VERSION = "3.11.4"
   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.11.4
 platform: ruby
 authors:
 - Lyndsey Ferguson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-22 00:00:00.000000000 Z
+date: 2020-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -309,7 +309,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