fastlane-plugin-test_center 3.8.4 → 3.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39540c7e8c08868f26fe01d1c612a636da7ce8bfc5d73b2f208fd5e20109c46f
-  data.tar.gz: f86f81c817d44ffe631aad423a947e1746d07ac9aa4a3e461c0c92929c7767e1
+  metadata.gz: ea22b1e286af67f521152ef2ba5862103ff5f3c75602ff03ac7d9a2641008dc6
+  data.tar.gz: e74c7f19184c067e0640f7fd8c4cf05724e7419dd8814dab498931b5b42f8fa0
 SHA512:
-  metadata.gz: a7d0040074f94705bb076784dfbc175b41e1540daf2e203feae942d2652fbead5a557866e474aad4a2bacd2b7f3c6278e306987318af11fa31b31c2fd01b3d69
-  data.tar.gz: 50955867e5915082f0c818ef42137ce1cd30499359dbf34caa61aed1691c703de35945d4ab9e372e5a9cd0ddfee48390ef494a42579d2bccb04031f131e6d156
+  metadata.gz: 18c8938a1f216b4754f905c2402299d642855fb639b05d0e1c7dcfcea3bffb9452b7cd45c117daf639b079677dd51a82726d6cf2e016d4fe6ab119ccfaa298b6
+  data.tar.gz: ea8206538bf8c600ca725a1c2cceb3e1c697b16c2f895ea01c0b194422a9c4c835de47aa1240ada12f55aa2170b28c90684b638a233993548415f307bad08720

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

@@ -11,18 +11,11 @@ module Fastlane
           # copy any missing testsuites
           target_report = reports.shift
           reports.each do |report|
-            report.elements.each("//section[contains(@class, 'test-suite')]") do |testsuite|
-              collate_testsuite(testsuite_from_report(target_report, testsuite), testsuite)
-            end
+            target_report.collate_report(report)
           end
-          update_testsuites_status(target_report)
-          update_test_counts(target_report)
 
           FileUtils.mkdir_p(File.dirname(params[:collated_report]))
-
-          File.open(params[:collated_report], 'w') do |f|
-            target_report.write(f, 2)
-          end
+          target_report.save_report(params[:collated_report])
         end
       end
 
@@ -31,7 +24,7 @@ module Fastlane
           report = nil
           repair_attempted = false
           begin
-            report = REXML::Document.new(File.new(report_filepath))
+            report = ::TestCenter::Helper::HtmlTestReport::Report.new(REXML::Document.new(File.new(report_filepath)))
           rescue REXML::ParseException => e
             if repair_attempted
               UI.important("'#{report_filepath}' is malformed and :collate_html_reports cannot repair it")
@@ -63,98 +56,6 @@ module Fastlane
         end
       end
 
-      def self.testsuite_from_report(report, testsuite)
-        testsuite_name = testsuite.attribute('id').value
-        REXML::XPath.first(report, "//section[contains(@class, 'test-suite') and @id='#{testsuite_name}']")
-      end
-
-      def self.testcases_from_testsuite(testsuite)
-        REXML::XPath.match(testsuite, ".//*[contains(@class, 'tests')]//*[contains(@class, 'test')]//*[contains(@class, 'title')]")
-      end
-
-      def self.testcase_from_testsuite(testsuite, testcase_name)
-        REXML::XPath.first(testsuite, "*[contains(@class, 'test')]//*[text()='#{testcase_name}']/../..")
-      end
-
-      def self.collate_testsuite(target_testsuite, testsuite)
-        if target_testsuite
-          testcases = testcases_from_testsuite(testsuite)
-          testcases.each do |testcase|
-            testresult = testcase.parent.parent
-            target_testresult = testcase_from_testsuite(target_testsuite, testcase.text)
-            collate_testresults(target_testsuite, target_testresult, testresult)
-          end
-        else
-          testable = testsuite.parent
-          testable << testsuite
-        end
-      end
-
-      def self.collate_testresults(target_testsuite, target_testresult, testresult)
-        if target_testresult
-          collate_testresult_details(target_testresult, testresult)
-          target_testresult.parent.replace_child(target_testresult, testresult)
-        else
-          target_testsuite << testresult
-        end
-      end
-
-      def self.collate_testresult_details(target_testresult, testresult)
-        target_testdetails = details_for_testresult(target_testresult)
-        testdetails = details_for_testresult(testresult)
-
-        if target_testdetails
-          if testdetails
-            target_testresult.parent.replace_child(target_testdetails, testdetails)
-          else
-            target_testresult.parent.delete_element(target_testdetails)
-          end
-        end
-      end
-
-      def self.update_testsuites_status(report)
-        report.elements.each("//section[contains(@class, 'test-suite')]") do |testsuite|
-          failing_tests_xpath = "./*[contains(@class, 'tests')]//*[" \
-                "contains(@class, 'failing')]"
-
-          class_attributes = testsuite.attribute('class').value
-          test_failures = REXML::XPath.match(testsuite, failing_tests_xpath)
-          test_status = test_failures.size.zero? ? 'passing' : 'failing'
-
-          testsuite.add_attribute('class', class_attributes.sub('failing', test_status))
-        end
-      end
-
-      def self.update_test_counts(report)
-        tests_xpath = "//*[contains(@class, 'tests')]//*[contains(@class, 'test')]//*[contains(@class, 'title')]"
-        tests = REXML::XPath.match(report, tests_xpath)
-
-        failing_tests_xpath = "//*[contains(@class, 'tests')]//*[" \
-                "contains(@class, 'details') and " \
-                "contains(@class, 'failing')]"
-
-        test_failures = REXML::XPath.match(report, failing_tests_xpath)
-        test_count = REXML::XPath.first(report, ".//*[@id='test-count']/span")
-        if test_count
-          test_count.text = tests.size
-        end
-        fail_count = REXML::XPath.first(report, ".//*[@id='fail-count']/span")
-        if fail_count
-          fail_count.text = test_failures.size
-        end
-      end
-
-      def self.details_for_testresult(testresult)
-        testcase = REXML::XPath.first(testresult, ".//*[contains(@class, 'title')]")
-
-        xpath = "../*[" \
-                "contains(@class, 'details') and " \
-                "contains(@class, 'failing') and " \
-                "contains(@class, '#{testcase.text}')]"
-
-        REXML::XPath.first(testresult, xpath)
-      end
-
       #####################################################
       # @!group Documentation
       #####################################################

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

@@ -0,0 +1,282 @@
+module TestCenter
+  module Helper
+    module HtmlTestReport
+      class Report
+        require 'rexml/formatters/transitive'
+
+        attr_reader :root
+        def initialize(html_file)
+          @root = html_file.root
+        end
+
+        def testsuites
+          testsuite_elements = REXML::XPath.match(@root, "//section[contains(@class, 'test-suite')]")
+          testsuite_elements.map do |testsuite_element|
+            TestSuite.new(testsuite_element)
+          end
+        end
+
+        def add_testsuite(testsuite)
+          testsuites_element = REXML::XPath.first(@root, ".//*[@id='test-suites']")
+          testsuites_element.push(testsuite.root)
+        end
+
+        def collate_report(report)
+          testsuites.each(&:remove_duplicate_testcases)
+          report.testsuites.each(&:remove_duplicate_testcases)
+          FastlaneCore::UI.verbose("TestCenter::Helper::HtmlTestReport::Report.collate_report to report:\n\t#{@root}")
+          report.testsuites.each do |given_testsuite|
+            existing_testsuite = testsuite_with_title(given_testsuite.title)
+            if existing_testsuite.nil?
+              FastlaneCore::UI.verbose("\tadding testsuite\n\t\t#{given_testsuite}")
+              add_testsuite(given_testsuite)
+            else
+              FastlaneCore::UI.verbose("\tcollating testsuite\n\t\t#{given_testsuite.root}")
+              existing_testsuite.collate_testsuite(given_testsuite)
+              FastlaneCore::UI.verbose("\tafter collation exiting testsuite\n\t\t#{existing_testsuite.root}")
+            end
+          end
+          update_test_count
+          update_fail_count
+        end
+
+        def testsuite_with_title(title)
+          testsuite_element = REXML::XPath.first(@root, ".//*[contains(@id, 'test-suites')]//*[@id='#{title}' and contains(concat(' ', @class, ' '), ' test-suite ')]")
+          TestSuite.new(testsuite_element) unless testsuite_element.nil?
+        end
+
+        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 ')]")
+          set_test_count(testcase_elements.size)
+        end
+
+        def fail_count
+          fail_count_element = REXML::XPath.first(@root, ".//*[@id = 'counters']//*[@id='fail-count']/*[@class = 'number']/text()")
+          return fail_count_element.to_s.to_i if fail_count_element
+          return 0
+        end
+
+        def set_fail_count(fail_count)
+          counters_element = REXML::XPath.first(@root, ".//*[@id = 'counters']")
+          fail_count_number_element = REXML::XPath.first(counters_element, ".//*[@id='fail-count']/*[@class = 'number']/text()")
+          if fail_count_number_element
+            fail_count_number_element.value = fail_count.to_s
+          else
+            test_count_element = REXML::XPath.first(counters_element, ".//*[@id='test-count']")
+            fail_count_element = test_count_element.clone
+            fail_count_element.add_attribute('id', 'fail-count')
+
+            test_count_element.each_element do |element|
+              fail_count_element.add_element(element.clone)
+            end
+            REXML::XPath.first(fail_count_element, ".//*[@class = 'number']").text = fail_count
+            counters_element.add_element(fail_count_element)
+          end
+        end
+
+        def update_fail_count
+          xpath_class_attributes = [
+            "contains(concat(' ', @class, ' '), ' test ')",
+            "contains(concat(' ', @class, ' '), ' failing ')"
+          ].join(' and ')
+
+          failing_testcase_elements = REXML::XPath.match(@root, ".//[#{xpath_class_attributes}]")
+          set_fail_count(failing_testcase_elements.size)
+        end
+
+        def add_test_center_footer
+          test_center_footer = REXML::XPath.first(@root, ".//footer[@id = 'test-center-footer']")
+          return if test_center_footer
+
+          test_center_anchor = REXML::Element.new('a')
+          test_center_anchor.text = 'collate_html_reports'
+          test_center_anchor.add_attribute('href', 'https://github.com/lyndsey-ferguson/fastlane-plugin-test_center#collate_html_reports')
+
+          test_center_footer = REXML::Element.new('footer')
+          test_center_footer.add_attribute('id', 'test-center-footer')
+          test_center_footer.text = 'Collated by the '
+          test_center_footer.add_element(test_center_anchor)
+          test_center_footer.add_text(' action from the test_center fastlane plugin')
+
+          body_element = REXML::XPath.first(@root, "//body")
+          body_element.elements.add(test_center_footer)
+        end
+
+        def save_report(report_path)
+          add_test_center_footer
+
+          output = ''
+          formatter = REXML::Formatters::Transitive.new
+          formatter.write(@root, output)
+
+          File.open(report_path, 'w') do |f|
+            f.puts output
+          end
+        end
+      end
+
+      class TestSuite
+        attr_reader :root
+
+        def initialize(testsuite_element)
+          @root = testsuite_element
+        end
+
+        def title
+          @root.attribute('id').value
+        end
+
+        def testcases
+          testcase_elements = REXML::XPath.match(@root, ".//*[contains(@class, 'tests')]//*[contains(concat(' ', @class, ' '), ' test ')]")
+          testcase_elements.map do |testcase_element|
+            TestCase.new(testcase_element)
+          end
+        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?
+        end
+
+        def passing?
+          @root.attribute('class').value.include?('passing')
+        end
+
+        def set_passing(status)
+          desired_status = status ? ' passing ' : ' failing '
+          to_replace = status ? /\bfailing\b/ : /\bpassing\b/
+  
+          attribute = @root.attribute('class').value.sub(to_replace, desired_status)
+          attribute.gsub!(/\s{2,}/, ' ')
+          @root.add_attribute('class', attribute)  
+        end
+
+        def add_testcase(testcase)
+          tests_table = REXML::XPath.first(@root, ".//*[contains(@class, 'tests')]/table")
+          details = testcase.failure_details
+          if details
+            tests_table.push(details)
+            tests_table.insert_before(details, testcase.root)
+          else
+            tests_table.push(testcase.root)
+          end
+        end
+
+        def duplicate_testcases?
+          nonuniq_testcases = testcases
+          uniq_testcases = nonuniq_testcases.uniq { |tc| tc.title }
+          nonuniq_testcases != uniq_testcases
+        end
+
+        def remove_duplicate_testcases
+          nonuniq_testcases = testcases
+          uniq_testcases = nonuniq_testcases.uniq { |tc| tc.title }
+          (nonuniq_testcases - uniq_testcases).each do |tc|
+            failure_details = tc.failure_details
+            tc.root.parent.delete_element(failure_details)
+            tc.root.parent.delete_element(tc.root)
+          end
+        end
+
+        def collate_testsuite(testsuite)
+          given_testcases = testsuite.testcases
+          given_testcases.each do |given_testcase|
+            existing_testcase = testcase_with_title(given_testcase.title)
+            if existing_testcase.nil?
+              FastlaneCore::UI.verbose("\t\tadding testcase\n\t\t\t#{given_testcase.root}")
+              unless given_testcase.passing?
+                FastlaneCore::UI.verbose("\t\t\twith failure:\n\t\t\t\t#{given_testcase.failure_details}")
+              end
+              add_testcase(given_testcase)
+            else
+              FastlaneCore::UI.verbose("\t\tupdating testcase\n\t\t\t#{existing_testcase.root}")
+              unless given_testcase.passing?
+                FastlaneCore::UI.verbose("\t\t\twith failure:\n\t\t\t\t#{given_testcase.failure_details}")
+              end
+              existing_testcase.update_testcase(given_testcase)
+            end
+          end
+          set_passing(testcases.all?(&:passing?))
+        end
+      end
+
+      class TestCase
+        attr_reader :root
+
+        def initialize(testcase_element)
+          @root = testcase_element
+        end
+
+        def title
+          REXML::XPath.first(@root, ".//h3[contains(@class, 'title')]/text()").to_s.strip
+        end
+
+        def passing?
+          @root.attribute('class').value.include?('passing')
+        end
+
+        def row_color
+          @root.attribute('class').value.include?('odd') ? 'odd' : ''
+        end
+
+        def set_row_color(row_color)
+          raise 'row_color must either be "odd" or ""' unless ['odd', ''].include?(row_color)
+
+          current_class_attribute = @root.attribute('class').value.sub(/\bodd\b/, '')
+          @root.add_attribute('class', current_class_attribute << ' ' << row_color)
+        end
+
+        def failure_details
+          return nil if @root.attribute('class').value.include?('passing')
+
+          xpath_class_attributes = [
+            "contains(concat(' ', @class, ' '), ' details ')",
+            "contains(concat(' ', @class, ' '), ' failing ')",
+            "contains(concat(' ', @class, ' '), ' #{title} ')"
+          ].join(' and ')
+          
+          REXML::XPath.first(@root.parent, ".//[#{xpath_class_attributes}]")
+        end
+
+        def remove_failure_details
+          details = failure_details
+          return if details.nil?
+          
+          details.parent.delete_element(details)
+        end
+
+        def update_testcase(testcase)
+          color = row_color
+          failure = failure_details
+          if failure.nil? && !passing?
+            FastlaneCore::UI.error("\t\t\t\tupdating failing test case that does not have failure_details")
+          end
+          parent = @root.parent
+
+          failure.parent.delete(failure) unless failure.nil?
+
+          new_failure = testcase.failure_details
+          if new_failure && testcase.passing?
+            FastlaneCore::UI.error("\t\t\t\tswapping passing failing test case that _does_have_ failure_details")
+          end
+
+          parent.replace_child(@root, testcase.root)
+          @root = testcase.root
+          unless new_failure.nil?
+            parent.insert_after(@root, new_failure)
+          end
+          set_row_color(color)
+        end
+      end
+    end
+  end
+end

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

@@ -57,7 +57,7 @@ module TestCenter
             )
             CollateJunitReportsAction.run(config)
             FileUtils.rm_rf(report_files - [collated_file])
-          elsif report_files.size == 1 && report_files.first != collated_file
+          elsif report_files.size == 1 && ! File.identical?(report_files.first, collated_file)
             FastlaneCore::UI.verbose("Copying junit report file #{report_files.first}")
             FileUtils.mkdir_p(File.dirname(collated_file))
             FileUtils.mv(report_files.first, collated_file)
@@ -80,7 +80,7 @@ module TestCenter
             )
             CollateHtmlReportsAction.run(config)
             FileUtils.rm_rf(report_files - [collated_file])
-          elsif report_files.size == 1 && report_files.first != collated_file
+          elsif report_files.size == 1 && ! File.identical?(report_files.first, collated_file)
             FastlaneCore::UI.verbose("Copying html report file #{report_files.first}")
             FileUtils.mkdir_p(File.dirname(collated_file))
             FileUtils.mv(report_files.first, collated_file)
@@ -103,7 +103,7 @@ module TestCenter
             )
             CollateJsonReportsAction.run(config)
             FileUtils.rm_rf(report_files - [collated_file])
-          elsif report_files.size == 1 && report_files.first != collated_file
+          elsif report_files.size == 1 && ! File.identical?(report_files.first, collated_file)
             FastlaneCore::UI.verbose("Copying json report file #{report_files.first}")
             FileUtils.mkdir_p(File.dirname(collated_file))
             FileUtils.mv(report_files.first, collated_file)
@@ -126,7 +126,7 @@ module TestCenter
             )
             CollateTestResultBundlesAction.run(config)
             FileUtils.rm_rf(test_result_bundlepaths - [collated_test_result_bundlepath])
-          elsif test_result_bundlepaths.size == 1 && test_result_bundlepaths.first != collated_test_result_bundlepath
+          elsif test_result_bundlepaths.size == 1 && File.realdirpath(test_result_bundlepaths.first) != File.realdirpath(collated_test_result_bundlepath)
             FastlaneCore::UI.verbose("Copying test_result bundle #{test_result_bundlepaths.first}")
             FileUtils.mkdir_p(File.dirname(collated_test_result_bundlepath))
             FileUtils.mv(test_result_bundlepaths.first, collated_test_result_bundlepath)

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

@@ -30,8 +30,13 @@ module TestCenter
                                   .merge(@retrying_scan_helper.scan_options)
 
           prepare_scan_config_for_destination
+          scan_options[:build_for_testing] = false
+          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
         end
 

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

@@ -81,6 +81,10 @@ module TestCenter
         def scan_options
           valid_scan_keys = Fastlane::Actions::ScanAction.available_options.map(&:key)
           xcargs = @options[:xcargs]
+          if xcargs&.include?('build-for-testing')
+            FastlaneCore::UI.important(":xcargs, #{xcargs}, contained 'build-for-testing', removing it")
+            xcargs.slice!('build-for-testing')
+          end
           retrying_scan_options = @reportnamer.scan_options.merge(
             {
               output_directory: output_directory,
@@ -153,8 +157,8 @@ module TestCenter
           junit_results, report_filepath = failure_details(additional_info)
 
           info = {
-            failed: junit_results[:failed],
-            passing: junit_results[:passing],
+            failed: junit_results.fetch(:failed, []),
+            passing: junit_results.fetch(:passing, []),
             batch: @options[:batch] || 1,
             try_count: @testrun_count,
             report_filepath: report_filepath

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

@@ -1,5 +1,5 @@
 module Fastlane
   module TestCenter
-    VERSION = "3.8.4"
+    VERSION = "3.8.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-test_center
 version: !ruby/object:Gem::Version
-  version: 3.8.4
+  version: 3.8.5
 platform: ruby
 authors:
 - Lyndsey Ferguson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-18 00:00:00.000000000 Z
+date: 2019-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -255,6 +255,7 @@ files:
 - lib/fastlane/plugin/test_center/actions/suppressed_tests.rb
 - lib/fastlane/plugin/test_center/actions/tests_from_junit.rb
 - lib/fastlane/plugin/test_center/actions/tests_from_xctestrun.rb
+- lib/fastlane/plugin/test_center/helper/html_test_report.rb
 - lib/fastlane/plugin/test_center/helper/junit_helper.rb
 - lib/fastlane/plugin/test_center/helper/multi_scan_manager.rb
 - lib/fastlane/plugin/test_center/helper/multi_scan_manager/device_manager.rb