fastlane-plugin-test_center 3.5.9 → 3.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61bc8728dd74fdf047e74386d9cb5cb4b0f0d753
-  data.tar.gz: 77b98ba834e8fcb18fc3c0189aa757fa6fb1a14f
+  metadata.gz: e2f64dd90cd40d23bc5af62990c5a3cec86d729c
+  data.tar.gz: 9972b63261d62a37533ab8448ec97853faeca89f
 SHA512:
-  metadata.gz: 8b7fdf2acb1a244af23db7584c043e20179c7cf6f9d164c08d94d63055eebcfd5cc467c57b5ae80043408e6e12988f7384e1f21179db27eaf168e71a1b684b48
-  data.tar.gz: 5f2366303671ed2de76837dd440a496bae487d11a7769171a070850c46c82fae6497b6f24e414d434cbd07c5422658e032d59c06b87db84118c8a8cccca2924a
+  metadata.gz: c585ac7539733cecf79d16bc09abbc31169e08a31464ddc3d00c663654d261f4dde76c24fd15ec273e65b2874f027fe6d073683299fa9260d04f5855087d10da
+  data.tar.gz: e291cd3e9d74dccdec5f9eb6f01074b3bee7b015cbffcec5b25eabcba3e99fda5f344c4bb44bbf18b4a21900a048e193cb4217ac6bfc9843a1f95313c667e6a4

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

@@ -6,26 +6,29 @@ module Fastlane
         if report_filepaths.size == 1
           FileUtils.cp(report_filepaths[0], params[:collated_report])
         else
+          UI.verbose("collate_junit_reports with #{report_filepaths}")
           reports = report_filepaths.map { |report_filepath| REXML::Document.new(File.new(report_filepath)) }
 
           # copy any missing testsuites
           target_report = reports.shift
-          flatten_duplicate_testsuites(target_report)
+          preprocess_testsuites(target_report)
 
           reports.each do |report|
-            flatten_duplicate_testsuites(report)
-
+            preprocess_testsuites(report)
+            UI.verbose("> collating last report file #{report_filepaths.last}")
             report.elements.each('//testsuite') do |testsuite|
               testsuite_name = testsuite.attributes['name']
-
               target_testsuite = REXML::XPath.first(target_report, "//testsuite[@name='#{testsuite_name}']")
               if target_testsuite
+                UI.verbose("  > collating testsuite #{testsuite_name}")
                 collate_testsuite(target_testsuite, testsuite)
+                UI.verbose("  < collating testsuite #{testsuite_name}")
               else
                 testable = REXML::XPath.first(target_report, "//testsuites")
                 testable << testsuite
               end
             end
+            UI.verbose("< collating last report file #{report_filepaths.last}")
           end
           target_report.elements.each('//testsuite') do |testsuite|
             update_testsuite_counts(testsuite)
@@ -40,18 +43,47 @@ module Fastlane
         end
       end
 
-      def self.flatten_duplicate_testsuites(report)
-        report.elements.each('//testsuite') do |testsuite|
-          testsuite_name = testsuite.attributes['name']
+      def self.collapse_testcase_multiple_failures_in_testsuite(testsuite)
+        testcases_with_failures = REXML::XPath.match(testsuite, 'testcase[failure]')
 
-          duplicate_testsuites = REXML::XPath.match(report, "//testsuite[@name='#{testsuite_name}']")
-          if duplicate_testsuites.size > 1
-            duplicate_testsuites.drop(1).each do |duplicate_testsuite|
-              collate_testsuite(testsuite, duplicate_testsuite)
-              duplicate_testsuite.parent.delete_element(duplicate_testsuite)
-            end
+        while testcases_with_failures.size > 1
+          target_testcase = testcases_with_failures.shift
+
+          name = target_testcase.attributes['name']
+          classname = target_testcase.attributes['classname']
+
+          failures = REXML::XPath.match(testsuite, "testcase[@name='#{name}'][@classname='#{classname}']/failure")
+          next unless failures.size > 1
+
+          failures[1..-1].each do |failure|
+            failure_clone = failure.clone
+            failure_clone.text = failure.text
+            target_testcase << failure_clone
+
+            testsuite.delete_element(failure.parent)
+            testcases_with_failures.delete(failure.parent)
           end
-          update_testsuite_counts(testsuite)
+        end
+      end
+
+      def self.flatten_duplicate_testsuites(report, testsuite)
+        testsuite_name = testsuite.attributes['name']
+        duplicate_testsuites = REXML::XPath.match(report, "//testsuite[@name='#{testsuite_name}']")
+        if duplicate_testsuites.size > 1
+          UI.verbose("    > flattening_duplicate_testsuites")
+          duplicate_testsuites.drop(1).each do |duplicate_testsuite|
+            collate_testsuite(testsuite, duplicate_testsuite)
+            duplicate_testsuite.parent.delete_element(duplicate_testsuite)
+          end
+          UI.verbose("    < flattening_duplicate_testsuites")
+        end
+        update_testsuite_counts(testsuite)
+      end
+
+      def self.preprocess_testsuites(report)
+        report.elements.each('//testsuite') do |testsuite|
+          flatten_duplicate_testsuites(report, testsuite)
+          collapse_testcase_multiple_failures_in_testsuite(testsuite)
         end
       end
 
@@ -61,9 +93,14 @@ module Fastlane
           name = testcase.attributes['name']
           target_testcase = REXML::XPath.first(target_testsuite, "testcase[@name='#{name}' and @classname='#{classname}']")
           # Replace target_testcase with testcase
-          if target_testcase      
-            target_testcase.parent.insert_after(target_testcase, testcase)
-            target_testcase.parent.delete_element(target_testcase)
+          if target_testcase
+            UI.verbose("      collate_testsuite with testcase #{name}")
+            UI.verbose("      replacing \"#{target_testcase}\" with \"#{testcase}\"")
+            parent = target_testcase.parent
+            parent.insert_after(target_testcase, testcase)
+            parent.delete_element(target_testcase)
+            UI.verbose("")
+            UI.verbose("      target_testcase after replacement \"#{parent}\"")
           else
             target_testsuite << testcase
           end

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

@@ -21,9 +21,6 @@ module Fastlane
         end
         smart_scanner = ::TestCenter::Helper::CorrectingScanHelper.new(params.values)
         tests_passed = smart_scanner.scan
-        if params[:fail_build] && !tests_passed
-          raise UI.test_failure!('Tests have failed')
-        end
         summary = run_summary(params, tests_passed, smart_scanner.retry_total_count)
         unless Helper.test?
           FastlaneCore::PrintTable.print_values(
@@ -31,6 +28,9 @@ module Fastlane
             title: "multi_scan results"
           )
         end
+        if params[:fail_build] && !tests_passed
+          raise UI.test_failure!('Tests have failed')
+        end
         summary
       end
 

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

@@ -1,5 +1,5 @@
 module Fastlane
   module TestCenter
-    VERSION = "3.5.9"
+    VERSION = "3.5.10"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-test_center
 version: !ruby/object:Gem::Version
-  version: 3.5.9
+  version: 3.5.10
 platform: ruby
 authors:
 - Lyndsey Ferguson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-01 00:00:00.000000000 Z
+date: 2018-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json