fastlane-plugin-test_center 3.5.5 → 3.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e706b6b12ba93541b7cb73278793770a163ee9c1
-  data.tar.gz: fec2bed86cbb28a637c2e1caf5b8c42f31086ee2
+  metadata.gz: 0f76f945d6bb3660e884098459a7b1bf6beb1d86
+  data.tar.gz: 8e4616cd30aec471e775c69368c17ea1e3a0133a
 SHA512:
-  metadata.gz: 9815ecca815c12cc0d31492b41a5d971f9f2c99191e0f5810af72d6f6987680f0abecfff4b15f4c106ef85e4c286bf4a8b4c7f84efaadc24452e5c2654de513d
-  data.tar.gz: 6bb11fdae062d365b835987746b644a1e03e2ed0efcb6ccced29bc9426778a93b2c94dff321c978984ff002e62da4acbb11c91dd7837e5d3c635da5f329edaeb
+  metadata.gz: 772cc233c07b2795e667af33f9b52ebf6c6f23fef0ba59aec7cc5efad2f030119bde8ce96791fa14071a347eee4363b980fb2a237d119036e844b94ee18b2709
+  data.tar.gz: 57117ac89d6505f6ae55dc19e31248589adb113a7fceaa88ac62188e557ee9ec05a8d98055fa9711c1f1a425aecaed4ac1c501253f7a96137f1fa2f59d4f5a01

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

@@ -10,24 +10,17 @@ module Fastlane
 
           # copy any missing testsuites
           target_report = reports.shift
+          flatten_duplicate_testsuites(target_report)
+
           reports.each do |report|
+            flatten_duplicate_testsuites(report)
+
             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
-                testsuite.elements.each('testcase') do |testcase|
-                  classname = testcase.attributes['classname']
-                  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)
-                  else
-                    target_testsuite << testcase
-                  end
-                end
+                collate_testsuite(target_testsuite, testsuite)
               else
                 testable = REXML::XPath.first(target_report, "//testsuites")
                 testable << testsuite
@@ -47,6 +40,36 @@ module Fastlane
         end
       end
 
+      def self.flatten_duplicate_testsuites(report)
+        report.elements.each('//testsuite') do |testsuite|
+          testsuite_name = testsuite.attributes['name']
+
+          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
+          end
+          update_testsuite_counts(testsuite)
+        end
+      end
+
+      def self.collate_testsuite(target_testsuite, other_testsuite)
+        other_testsuite.elements.each('testcase') do |testcase|
+          classname = testcase.attributes['classname']
+          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)
+          else
+            target_testsuite << testcase
+          end
+        end
+      end
+
       def self.update_testable_counts(testable)
         testsuites = REXML::XPath.match(testable, 'testsuite')
         test_count = 0

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

@@ -1,5 +1,5 @@
 module Fastlane
   module TestCenter
-    VERSION = "3.5.5"
+    VERSION = "3.5.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-test_center
 version: !ruby/object:Gem::Version
-  version: 3.5.5
+  version: 3.5.6
 platform: ruby
 authors:
 - Lyndsey Ferguson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-16 00:00:00.000000000 Z
+date: 2018-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json