fastlane-plugin-retry_tests 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efbcd821c57d6506fa4045bee410f8dd5271de7c
-  data.tar.gz: 9fedea7aa142c463ee5a4c91deaf65a0a7556bf4
+  metadata.gz: 1a0861a627d2bfd0292d137580b0d9b07c91964f
+  data.tar.gz: 9fdf46ae22536ba69d16e5d0fb147aeb14aed445
 SHA512:
-  metadata.gz: 8107bf8fc76c7223d186a0e7aae3c0d6f1d15eaadce9e43c2406e10fd53e2ef003e3fc228e42c3d91b2d2144a19748d85bb38a9f554f12405eac12c6838af902
-  data.tar.gz: 9ffa30243c8960a34ce2b17bc7fac7eaa7774fe673dfbeb59a10bd5f32f6929c35426e42b7bafc5bb86243bdc49f6e04884ed91c9dbb1c61ff8502da31da92df
+  metadata.gz: ed3bc24fe0e8436f9f281262eebaea90207c6e7be6765f01efbe333f06e867be38b9092b3062186edb24690f762788a19c9f6b5a92088b9d83550b2cbd80afdf
+  data.tar.gz: b1cb78997558327ed5846c6c85b2e4ff54e093661918afd01154fb60a4bd174ccf4b007a3579fadbf0bfc72b588ad32f660166c13f457424ef5b84235948086c

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

@@ -1,3 +1,4 @@
+#Adapted from the "fastlane-plugin-test_center" plugin
 
 require 'nokogiri'
 require 'nokogiri-plist'
@@ -11,9 +12,12 @@ 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
@@ -22,24 +26,15 @@ 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}')]/..")
@@ -52,28 +47,37 @@ 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)
-        UI.verbose ("Merging screenshot folders...")
+        #copy screenshots from all retries into the results folder
         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|
-          to_append = File.read(log)
-          File.open(target_log, "a") do |handle|
-            handle.puts to_append
-          end
-          FileUtils.cp_r(target_log, logs_folder)
+          all = all + log + " "
         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)
@@ -167,6 +171,7 @@ 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,3 +1,5 @@
+#Adapted from the "fastlane-plugin-test_center" plugin
+
 module Fastlane
   module Actions
     require 'fastlane/actions/scan'
@@ -5,6 +7,7 @@ module Fastlane
 
     class MultiScanAction < Action
       def self.run(params)
+=begin
         try_count = 0
         scan_options = params.values.reject { |k| k == :try_count }
         final_report_path = scan_options[:result_bundle]
@@ -23,7 +26,8 @@ module Fastlane
           config = FastlaneCore::Configuration.create(Fastlane::Actions::ScanAction.available_options, scan_options)
           Fastlane::Actions::ScanAction.run(config)
         rescue FastlaneCore::Interface::FastlaneTestFailure => e
-          UI.verbose("Scan failed with #{e}")
+          FastlaneCore::UI.verbose("Scan failed with error #{e}")
+          #Retry for the specified number of times if there were failed tests
           if try_count < params[:try_count]
             report_filepath = junit_report_filepath(scan_options)
             failed_tests = other_action.tests_from_junit(junit: report_filepath)[:failed]
@@ -31,6 +35,7 @@ module Fastlane
             retry
           end
         end
+=end
         merge_reports(scan_options, final_report_path)
       end
 
@@ -40,7 +45,6 @@ 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],
@@ -132,6 +136,7 @@ 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 TestCenter
+  module RetryTests
     # 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::TestCenter.all_classes.each do |current|
+Fastlane::RetryTests.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.2
+  version: 1.3.3
 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: []