fastlane-plugin-retry_tests 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad6db1868ae50026fe22c693857fb1a1a78f61fb
-  data.tar.gz: 103f996af1ed6c2ee7bb026ef53731233648f1e1
+  metadata.gz: fe339a4e3bda1cf89bd4d256ed998d1f5e8eeb12
+  data.tar.gz: 5d05893392c40d4ece6b1421edc32dc920d149cc
 SHA512:
-  metadata.gz: 6f5106da53a539dcd50e7e3136e8a4bad77226e3d7d7cb5e3884e8206cb9bbef2f2072df341383feb574cb1a447aa5722b1ca7de40de3ebc6fac462cc9415eb1
-  data.tar.gz: 7e1f5374483038c240082c79dab5ad1597001ceb3d0d51c674b285005a2b770933ced8463780b02c1a329952f6587561207d8cf2d057146a6a3569d333b9bb2b
+  metadata.gz: 2779d970d5a821cacdfa96bebc23d523defc46be1edd0cd24001ec896e74eac53387b09923371561371fb30f399965ccc4cc83a3a32a6f6b1cf4b9da54b7cbf7
+  data.tar.gz: c61f2d9b8d0043800ce84112e3ca539a4240f8dbf01fdbec129017f72c9bcb6eec5bf2adcb5a4420c81c26a8d83c28db050ac7df84cf2ad202d09f1748bc73f6

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

@@ -1,4 +1,3 @@
-#Adapted from the "fastlane-plugin-test_center" plugin
 
 require 'nokogiri'
 require 'nokogiri-plist'
@@ -12,12 +11,9 @@ module Fastlane
         if report_filepaths.size == 1
           FileUtils.cp(report_filepaths[0], params[:collated_report])
         else
-          #Convert .plist reports to Nokogiri XML objects
           target_report = File.open(report_filepaths.shift) {|f| Nokogiri::XML(f)}
           file_name = params[:collated_report] + "/#{params[:scheme]}.test_result/1_Test/action_TestSummaries.plist"
           reports = report_filepaths.map { |report_filepath| Nokogiri::XML(Nokogiri::PList(open(report_filepath)).to_plist_xml) }
-
-          #Merge .plist reports
           reports.each do |retry_report|
             mergeLists(target_report, retry_report, params)
           end
@@ -26,15 +22,24 @@ module Fastlane
         copy_log(params[:logs], params[:collated_report] + "/")
       end
 
+      def self.clean_report(report)
+        report = report.gsub(/<(\w+): 0x(\w+)>/, '(\1: 0x\2)')
+        report = report.gsub(/<XCAccessibilityElement:\/>0x(\w+)/, '(XCAccessibilityElement): 0x\1')
+        report
+      end
+
+      def self.copy_log(log_files, logs_folder)
+        target_log = log_files.shift
+        FileUtils.cp_r(target_log, logs_folder)
+      end
+
       def self.mergeLists(target_report, retry_report, params)
         retry_report = clean_report(retry_report)
+        UI.verbose("Merging retried results...")
         Dir.mkdir(params[:collated_report]) unless File.exists?(params[:collated_report])
         file_name = params[:collated_report] + "/action_TestSummaries.plist"
         retried_tests = retry_report.xpath("//key[contains(.,'TestSummaryGUID')]/..")
-
         current_node = retried_tests.shift
-
-        #Copy retried test results into the base report
         while (current_node != nil)
           testName = get_test_name(current_node)
           matching_node = target_report.at_xpath("//string[contains(.,'#{testName}')]/..")
@@ -47,37 +52,28 @@ module Fastlane
         end
       end
 
-      def self.clean_report(report)
-        report = report.gsub(/<(\w+): 0x(\w+)>/, '(\1: 0x\2)')
-        report = report.gsub(/<XCAccessibilityElement:\/>0x(\w+)/, '(XCAccessibilityElement): 0x\1')
-        report
-      end
-
       def self.merge_assets(asset_files, assets_folder)
-        #copy screenshots from all retries into the results folder
+        UI.verbose ("Merging screenshot folders...")
         Dir.mkdir(assets_folder) unless File.exists?(assets_folder)
         asset_files.each do |folder|
           FileUtils.cp_r(Dir[folder + '/*'], assets_folder)
         end
       end
 
-      def self.copy_log(log_files, logs_folder)
-        target_log = log_files.shift
-        FileUtils.cp_r(target_log, logs_folder)
-      end
-
       def self.merge_logs(log_files, logs_folder)
         UI.verbose("Merging console logs...")
-        all = ""
         target_log = log_files.shift
         log_files.each do |log|
-          all = all + log + " "
+          to_append = File.read(log)
+          File.open(target_log, "a") do |handle|
+            handle.puts to_append
+          end
+          FileUtils.cp_r(target_log, logs_folder)
         end
-        sh("cat #{all}> #{target_log}")
-        FileUtils.cp_r(target_log, logs_folder)
       end
 
       def self.write_report_to_file(report, file_name)
+        UI.verbose("Writing merged results to file...")
         File.new(file_name, 'w')
         File.open(file_name, 'w') do |f|
           f.write(report.to_xml)
@@ -171,7 +167,6 @@ module Fastlane
       end
 
       def self.authors
-        #Adapted from the "fastlane-plugin-test_center" plugin by:
         ["lyndsey-ferguson/@lyndseydf"]
       end
 

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

@@ -1,5 +1,3 @@
-#Adapted from the "fastlane-plugin-test_center" plugin
-
 module Fastlane
   module Actions
     require 'fastlane/actions/scan'
@@ -25,8 +23,7 @@ module Fastlane
           config = FastlaneCore::Configuration.create(Fastlane::Actions::ScanAction.available_options, scan_options)
           Fastlane::Actions::ScanAction.run(config)
         rescue FastlaneCore::Interface::FastlaneTestFailure => e
-          FastlaneCore::UI.verbose("Scan failed with error #{e}")
-          #Retry for the specified number of times if there were failed tests
+          UI.verbose("Scan failed with #{e}")
           if try_count < params[:try_count]
             report_filepath = junit_report_filepath(scan_options)
             failed_tests = other_action.tests_from_junit(junit: report_filepath)[:failed]
@@ -43,6 +40,7 @@ module Fastlane
         asset_files = Dir.glob("#{folder}*/#{scan_options[:scheme]}.test_result/1_Test/Attachments")
         log_files = Dir.glob("#{folder}*/#{scan_options[:scheme]}.test_result/1_Test/action.xcactivitylog")
         #Merge all reports, screenshots, and logs if there were retried tests
+
         if report_files.size > 1
           other_action.collate_junit_reports(
             scheme: scan_options[:scheme],
@@ -134,7 +132,6 @@ module Fastlane
       end
 
       def self.authors
-        #Adapted from the "fastlane-plugin-test_center" plugin by:
         ["lyndsey-ferguson/@lyndseydf"]
       end
 

data/lib/fastlane/plugin/retry_tests.rb

@@ -1,7 +1,7 @@
-require 'fastlane/plugin/retry_tests/version'
+#require 'fastlane/plugin/retry_tests/version'
 
 module Fastlane
-  module RetryTests
+  module TestCenter
     # Return all .rb files inside the "actions" and "helper" directory
     def self.all_classes
       Dir[File.expand_path('**/{actions,helper}/*.rb', File.dirname(__FILE__))]
@@ -11,6 +11,6 @@ end
 
 # By default we want to import all available actions and helpers
 # A plugin can contain any number of actions and plugins
-Fastlane::RetryTests.all_classes.each do |current|
+Fastlane::TestCenter.all_classes.each do |current|
   require current
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-retry_tests
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Gloria Chow
@@ -217,5 +217,5 @@ rubyforge_project:
 rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
-summary: Makes testing your iOS app easier
+summary: Makes testing your iOS app easier.
 test_files: []