fastlane-plugin-test_center 3.8.6 → 3.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88bf82b019ae47ea885712887f7e36b824e69bf3956f36d4a9d561b46c73d77b
-  data.tar.gz: cb59d58624a9262fc0ad76afdd309ee1eef355646b2add4f086cf7a7af075f9e
+  metadata.gz: e79e02f37cfc5ea26854f135fad277dc194d225927b3a6f03ce8a43ea603ae20
+  data.tar.gz: 598759f0e60635a798a08d1c238f699a068e0fd6ab34ef286990a4bfe8565711
 SHA512:
-  metadata.gz: 4d343c8d43b24e634cdea321f407656011ec874d6a26b2f17a7b002cbcab1e5c2cfef36b3ee278d71453c23b94983d69f2062df29c728e44be9ef24978a63b51
-  data.tar.gz: 77b1bcc10f4066abdc5602448d8a6e714dd0b2f80a9c629e9a4b39509eec34bfec5d1f907dda68b4cba19239fe740067e16939c39969be6e3cbf85f84dd4fbea
+  metadata.gz: ef2ea4f6585fa7b363a9c5b3c7d543052ecb5dcfde31e7dd9676de84e1d23d2f11541acebdaf26ca1cc01effadcdc0489cc20935dc0a3f16e769a059ea0f1717
+  data.tar.gz: c8ceb6f97190d96588dc995a201aa1ff87a334968cbfb0a7237a28ba5fe32ccebb789348d2f5f3bf26bef6a7246ea7fea10d7b8bd38dfcdb47fba137b9ac48a7

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

@@ -6,6 +6,9 @@ module Fastlane
       def self.run(params)
         test_result_bundlepaths = params[:bundles]
         base_bundle_path = test_result_bundlepaths[0]
+
+        return if collate_version3_formatted_bundles(params)
+
         if test_result_bundlepaths.size > 1
           base_bundle_path = Dir.mktmpdir(['base', '.test_result'])
           FileUtils.cp_r(File.join(test_result_bundlepaths[0], '.'), base_bundle_path)
@@ -19,6 +22,63 @@ module Fastlane
         UI.message("Finished collating test_result bundle to '#{params[:collated_bundle]}'")
       end
 
+      def self.collate_version3_formatted_bundles(params)
+        test_result_bundlepaths = params[:bundles]
+        found_version3_format_bundle = test_result_bundlepaths.any? do |test_result_bundlepath|
+          is_bundle_format_3?(test_result_bundlepath)
+        end
+        
+        if found_version3_format_bundle
+          FastlaneCore::UI.verbose("result bundles are of format version 3")
+          `xcrun xcresulttool version 2> /dev/null`
+          unless $?.exitstatus.zero?
+            UI.user_error!("""
+              Unable to collate version 3 format test_result bundle without the xcrun xcresulttool.
+              Please install and select Xcode 11, and then run the command again.""")
+          end
+          xcresulttool_merge(params)
+        end
+        FastlaneCore::UI.verbose("result bundles are NOT of format version 3")
+        return false
+      end
+
+      def self.xcresulttool_merge(params)
+        collated_bundlepath = File.expand_path(params[:collated_bundle])
+        Dir.mktmpdir do |dir|
+          tmp_xcresult_bundlepaths = []
+          test_result_bundlepaths.each do |test_result_bundlepath|
+            bundlename = File.basename(test_result_bundlepath)
+            # Note: the `xcresulttool` requires that the bundle names end in `.xcresult`.
+            tmp_xcresult_bundlepath = Dir.mktmpdir([bundlename, '.xcresult'])
+            FileUtils.rmdir([tmp_xcresult_bundlepath])
+            FileUtils.symlink(test_result_bundlepath, "#{tmp_xcresult_bundlepath}", force: true)
+            tmp_xcresult_bundlepaths << tmp_xcresult_bundlepath
+          end
+          tmp_collated_bundlepath = File.join(dir, File.basename(collated_bundlepath))
+          xcresulttool_cmd = 'xcrun xcresulttool merge '
+          xcresulttool_cmd += tmp_xcresult_bundlepaths.map(&:shellescape).join(' ')
+          xcresulttool_cmd += " --output-path #{tmp_collated_bundlepath}"
+          UI.message(xcresulttool_cmd)
+          sh(xcresulttool_cmd)
+          FileUtils.safe_unlink(tmp_xcresult_bundlepaths)
+          FileUtils.rm_rf(collated_bundlepath)
+          FileUtils.cp_r(tmp_collated_bundlepath, collated_bundlepath)
+          UI.message("Finished collating test_result bundle to '#{collated_bundlepath}'")
+          return true
+        end
+      end
+
+      def self.is_bundle_format_3?(bundle_path)
+        infoplist_filepath = File.join(bundle_path, 'Info.plist')
+        if File.exist?(infoplist_filepath)
+          base_infoplist = Plist.parse_xml(infoplist_filepath)
+          if base_infoplist.key?('version')
+            return true if base_infoplist.dig('version', 'major') > 2
+          end
+        end
+        false
+      end
+
       def self.collate_bundles(base_bundle_path, other_bundle_path)
         Dir.foreach(other_bundle_path) do |child_item|
           if child_item == 'Info.plist'

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

@@ -48,14 +48,14 @@ module TestCenter
         def test_count
           REXML::XPath.first(@root, ".//*[@id = 'counters']//*[@id='test-count']/*[@class = 'number']/text()").to_s.to_i
         end
-      
+        
         def set_test_count(test_count)
           test_count_element = REXML::XPath.first(@root, ".//*[@id = 'counters']//*[@id='test-count']/*[@class = 'number']/text()")
           test_count_element.value = test_count.to_s
         end
-
+        
         def update_test_count
-          testcase_elements = REXML::XPath.match(@root, ".//*[contains(@class, 'tests')]//*[contains(concat(' ', @class, ' '), ' test ')]")
+          testcase_elements = REXML::XPath.match(@root, "//*[contains(@class, 'tests')]//*[contains(concat(' ', @class, ' '), ' test ')]").uniq
           set_test_count(testcase_elements.size)
         end
 
@@ -89,7 +89,7 @@ module TestCenter
             "contains(concat(' ', @class, ' '), ' failing ')"
           ].join(' and ')
 
-          failing_testcase_elements = REXML::XPath.match(@root, ".//[#{xpath_class_attributes}]")
+          failing_testcase_elements = REXML::XPath.match(@root, ".//*[#{xpath_class_attributes}]")
           set_fail_count(failing_testcase_elements.size)
         end
 
@@ -143,8 +143,11 @@ module TestCenter
         end
 
         def testcase_with_title(title)
-          testcase_element = REXML::XPath.first(@root, ".//*[contains(@class, 'tests')]//*[contains(concat(' ', @class, ' '), ' test ')]//*[@class='title']/[normalize-space()='#{title}']/../../..")
-          TestCase.new(testcase_element) unless testcase_element.nil?
+          found_title_element = REXML::XPath.match(@root, ".//*[contains(@class, 'tests')]//*[contains(concat(' ', @class, ' '), ' test ')]//*[@class='title']").find { |n| n.text.to_s.strip == title  }
+          if found_title_element
+            testcase_element = found_title_element.parent.parent
+            TestCase.new(testcase_element) unless testcase_element.nil?
+          end
         end
 
         def passing?
@@ -243,8 +246,7 @@ module TestCenter
             "contains(concat(' ', @class, ' '), ' failing ')",
             "contains(concat(' ', @class, ' '), ' #{title} ')"
           ].join(' and ')
-          
-          REXML::XPath.first(@root.parent, ".//[#{xpath_class_attributes}]")
+          REXML::XPath.first(@root.parent, ".//*[#{xpath_class_attributes}]")
         end
 
         def remove_failure_details

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

@@ -114,7 +114,10 @@ module TestCenter
           return unless @result_bundle
 
           test_result_bundlepaths = sort_globbed_files("#{@source_reports_directory_glob}/#{@scheme}*.test_result")
-          collated_test_result_bundlepath = File.absolute_path("#{File.join(@output_directory, @scheme)}.test_result")
+          result_bundlename_suffix = ''
+          result_bundlename_suffix = "-#{@reportnamer.report_count + 1}" if @reportnamer.report_count > 0
+
+          collated_test_result_bundlepath = File.absolute_path("#{File.join(@output_directory, @scheme)}#{result_bundlename_suffix}.test_result")
           if test_result_bundlepaths.size > 1
             FastlaneCore::UI.verbose("Collating test_result bundles #{test_result_bundlepaths}")
             config = create_config(

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

@@ -40,6 +40,9 @@ module TestCenter
         def delete_xcresults
           derived_data_path = File.expand_path(@options[:derived_data_path] || Scan.config[:derived_data_path])
           xcresults = Dir.glob("#{derived_data_path}/Logs/Test/*.xcresult")
+          if FastlaneCore::Helper.xcode_at_least?('11.0.0')
+            xcresults += Dir.glob("#{output_directory}/*.xcresult")
+          end
           FastlaneCore::UI.verbose("Deleting xcresults:")
           xcresults.each do |xcresult|
             FastlaneCore::UI.verbose("  #{xcresult}")

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

@@ -1,5 +1,5 @@
 module Fastlane
   module TestCenter
-    VERSION = "3.8.6"
+    VERSION = "3.8.7"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-test_center
 version: !ruby/object:Gem::Version
-  version: 3.8.6
+  version: 3.8.7
 platform: ruby
 authors:
 - Lyndsey Ferguson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-09 00:00:00.000000000 Z
+date: 2019-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json