fastlane-plugin-test_center 3.2.1 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01072b26dc483882f807f087b095f47b7f282f52
-  data.tar.gz: e4373343152c326ae60899501e1e54b022c30b33
+  metadata.gz: 22efb0b52e8b86d46ccf45368b8a64c852bf0013
+  data.tar.gz: 4c2d24379cb74a8124e657b47b8c5509b8122d06
 SHA512:
-  metadata.gz: 796e68e32c29601fcd85a6dbf563072db653fb33676e261a3a33273c6fe501acf015e5a13682443a0b6a5c4fb064417b235a70f7ef7c386bf2c027808ecfb26f
-  data.tar.gz: f7f629e9f40551b69220032df107abb0e3e2d73e072396a8ba2135c09c825f7ac8a67b3206585ce4c2e5d42ca055ba4c4cb2d5b98f403778c94709e347d90158
+  metadata.gz: 5db959306a7c4cb9ee3275df348be062fde1e8d32d1af2335ed0c8565dc8ec697065938fac884319c7db35c68e532f4f6e60c301b6cd6f9badf0071a12f7c0a5
+  data.tar.gz: 4577b7f03dc5e61fe468eea90718ad577f3b3a39c54730c014bc080298f4e2ece9c9ee92756c00f323978d2ea08ad4c6e7ef617eac18f80e9f810f69670d17d4

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

@@ -45,7 +45,7 @@ module Fastlane
           testcases.each do |testcase|
             testresult = testcase.parent.parent
             target_testresult = testcase_from_testsuite(target_testsuite, testcase.text)
-            collate_testresults(target_testresult, testresult)
+            collate_testresults(target_testsuite, target_testresult, testresult)
           end
         else
           testable = testsuite.parent
@@ -53,12 +53,12 @@ module Fastlane
         end
       end
 
-      def self.collate_testresults(target_testresult, testresult)
+      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_testresult << testresult
+          target_testsuite << testresult
         end
       end
 
@@ -97,8 +97,14 @@ module Fastlane
                 "contains(@class, 'failing')]"
 
         test_failures = REXML::XPath.match(report, failing_tests_xpath)
-        REXML::XPath.first(report, ".//*[@id='test-count']/span").text = tests.size
-        REXML::XPath.first(report, ".//*[@id='fail-count']/span").text = test_failures.size
+        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)

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

@@ -43,7 +43,7 @@ module Fastlane
         passing_testcount = 0
         failed_tests = []
         failure_details = {}
-        report_files = Dir.glob("#{scan_options[:output_directory]}/**/*#{reportnamer.junit_filextension}").map do |relative_filepath|
+        report_files = Dir.glob("#{scan_options[:output_directory]}/**/#{reportnamer.junit_fileglob}").map do |relative_filepath|
           File.absolute_path(relative_filepath)
         end
         report_files.each do |report_file|
@@ -54,7 +54,7 @@ module Fastlane
         end
 
         if reportnamer.includes_html?
-          report_files += Dir.glob("#{scan_options[:output_directory]}/**/*#{reportnamer.html_filextension}").map do |relative_filepath|
+          report_files += Dir.glob("#{scan_options[:output_directory]}/**/#{reportnamer.html_fileglob}").map do |relative_filepath|
             File.absolute_path(relative_filepath)
           end
         end
@@ -99,7 +99,7 @@ module Fastlane
       end
 
       def self.details
-        "Use this action to run your tests if you have fragile tests that fail" \
+        "Use this action to run your tests if you have fragile tests that fail " \
         "sporadically, if you have a huge number of tests that should be " \
         "batched, or have multiple test targets and need meaningful junit reports."
       end
@@ -185,7 +185,7 @@ module Fastlane
               if passed_test_count > 0 && failed_test_count > passed_test_count / 2
                 UI.abort_with_message!("Too many tests are failing")
               end
-              UI.message("😊 everything is fine, let\'s continue try #{try_attempt + 1} for batch #{batch}")
+              UI.message("\u{1f60a}  everything is fine, let\'s continue try #{try_attempt + 1} for batch #{batch}")
             }
           )'
         ]

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

@@ -92,7 +92,7 @@ module TestCenter
       end
 
       def collate_reports(output_directory, reportnamer)
-        report_files = Dir.glob("#{output_directory}/*#{reportnamer.junit_filextension}").map do |relative_filepath|
+        report_files = Dir.glob("#{output_directory}/#{reportnamer.junit_fileglob}").map do |relative_filepath|
           File.absolute_path(relative_filepath)
         end
         if report_files.size > 1
@@ -105,11 +105,11 @@ module TestCenter
           )
           Fastlane::Actions::CollateJunitReportsAction.run(config)
         end
-        retried_junit_reportfiles = Dir.glob("#{output_directory}/**/*-[1-9]*#{reportnamer.junit_filextension}")
+        retried_junit_reportfiles = Dir.glob("#{output_directory}/#{reportnamer.junit_numbered_fileglob}")
         FileUtils.rm_f(retried_junit_reportfiles)
 
         if reportnamer.includes_html?
-          report_files = Dir.glob("#{output_directory}/*#{reportnamer.html_filextension}").map do |relative_filepath|
+          report_files = Dir.glob("#{output_directory}/#{reportnamer.html_fileglob}").map do |relative_filepath|
             File.absolute_path(relative_filepath)
           end
           if report_files.size > 1
@@ -122,7 +122,7 @@ module TestCenter
             )
             Fastlane::Actions::CollateHtmlReportsAction.run(config)
           end
-          retried_html_reportfiles = Dir.glob("#{output_directory}/**/*-[1-9]*#{reportnamer.html_filextension}")
+          retried_html_reportfiles = Dir.glob("#{output_directory}/#{reportnamer.html_numbered_fileglob}")
           FileUtils.rm_f(retried_html_reportfiles)
         end
       end

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

@@ -64,8 +64,14 @@ module TestCenter
         File.extname(junit_reportname)
       end
 
-      # --- HTML ---
-      # TODO: what to do when there are no html output types?
+      def junit_fileglob
+        "#{File.basename(junit_reportname, '.*')}*#{junit_filextension}"
+      end
+
+      def junit_numbered_fileglob
+        "#{File.basename(junit_reportname, '.*')}-[1-9]*#{junit_filextension}"
+      end
+
       def includes_html?
         @output_types.split(',').find_index('html') != nil
       end
@@ -84,6 +90,14 @@ module TestCenter
         File.extname(html_reportname)
       end
 
+      def html_fileglob
+        "#{File.basename(html_reportname, '.*')}*#{html_filextension}"
+      end
+
+      def html_numbered_fileglob
+        "#{File.basename(html_reportname, '.*')}-[1-9]*#{html_filextension}"
+      end
+
       def increment
         @report_count += 1
       end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module TestCenter
-    VERSION = "3.2.1"
+    VERSION = "3.2.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-test_center
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.2
 platform: ruby
 authors:
 - Lyndsey Ferguson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-16 00:00:00.000000000 Z
+date: 2018-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plist