fastlane-plugin-retry 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f8e3ca7cd39efec921792b15c54547aa6ca852aa22042878426240292c7d2fb
-  data.tar.gz: 13207f94594b1e2b56ed7cb281a9138f8ab7a3ceb5151ded1c44ae03118e9eb5
+  metadata.gz: bf7d989288a94f8f5b9ad304cb3602330b42eb2b06c705d26cb9ebda859996f8
+  data.tar.gz: 0f1a78cb7988a9d7a3e09795f7f7c62e17c6998b116a630e83d0fe2640ad6411
 SHA512:
-  metadata.gz: ba9ca0bff84f6678ba1e62eb085d9f71ae1189f80c3c5ccd1b8b7ceba0f34b2c1be4572d57ca9d57a10bd20629117cfa9da62e4f532e7d9deab5da4ddecb7e80
-  data.tar.gz: 1be1c820c5104db4ad1cced8576887945414c466c4c6bb43d92faa14d19ea6f1cccccc570ae8efb1b64706d1abe80e72516bf7463cfe88ed05b988b948654ee5
+  metadata.gz: 50c1aec0645d67957b94a8ad0a1878769cfea0807223738bbcf26e4781e71ae815c68a3b5bb58f8a23a9fc0f44b773d8a13ed368081cfed9a82ef7a9c2777764
+  data.tar.gz: 235e9dd814f07cd40f048942f78debebd3e3a52b1e2c2719e668ada64b0676d656541c7c140b2ebcb68f46a91ced9ccf6d503eaf49689d10c192c59e6a51e0c1

data/README.md

@@ -2,49 +2,41 @@
 
 [![fastlane Plugin Badge](https://rawcdn.githack.com/fastlane/fastlane/master/fastlane/assets/plugin-badge.svg)](https://rubygems.org/gems/fastlane-plugin-retry)
 
-A fastlane plugin that automatically retries failed XCUITest test cases. This plugin is loosely based off [lyndsey-ferguson's fastlane-plugin-test_center](https://github.com/lyndsey-ferguson/fastlane-plugin-test_center) plugin, which uses JUnit reports instead of PList to generate a simple HTML report.
-
-This plugin works with the following logic:
-1) Run the whole test suite once
-2) Parse the generated .plist results to obtain a list of the failed tests
-3) Retry the failed tests an 'x' number of times (see below for how to specify the number of retries) and generate a .plist report for each retry run
-4) Merge all .plist reports together to generate one final .plist report
-
-Tip: You can then use the final .plist report with the [XCHtmlReport plugin](https://github.com/TitouanVanBelle/XCTestHTMLReport) to generate a very beautiful HTML report including screenshots and console logs! See the sample fastfile for usage.
+Retries failed XCUITest test cases. 
 
 This plugin is available in the [Ruby Gems directory](https://rubygems.org/gems/fastlane-plugin-retry).
 
+
 ## Installation
 
 This project is a [_fastlane_](https://github.com/fastlane/fastlane) plugin. To get started with `fastlane-plugin-retry`, add it to your project by running:
 
-```
+```bash
 fastlane add_plugin retry
-```
-Check that the command above generated a Pluginfile in your project's fastlane folder. The Pluginfile should contain the following text:
-```
-gem 'fastlane-plugin-retry', '~> 1.0', '>= 1.0.5'
-```
-Add the following line to your project's Gemfile:
-```
-plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
-eval_gemfile(plugins_path) if File.exist?(plugins_path)
-```
-Finally, run the following command to install the plugin files to your project's Bundler folder.
-```
 bundle install
 ```
 
+
 ## Usage
 
-See the sample fastfile for how to configure your project's fastfile. Once you have configured your fastfile, use the following command to run your tests with retry (you can change the number of tries and the device).
 ```
-bundle exec fastlane run_tests_with_retry tries:3 devices:"platform=iOS Simulator,name=iPhone 8,OS=11.4"
+multi_scan(
+workspace: File.absolute_path('../xxxxxx.xcworkspace'),
+scheme: 'xxxxxx',
+try_count: options[:tries],
+result_bundle: result_bundle_path,
+output_directory: result_bundle_path,
+destination: options[:devices],
+xctestrun: xctestrun_path,
+test_without_building: true
+)
+
+sh("/usr/local/bin/xchtmlreport -r [location of the .plist generated by multi_scan]")
 ```
 
 ## Issues and Feedback
 
-For any other issues and feedback about this plugin, please submit it to this repository.
+For any other issues and feedback about this plugin, please submit it to this repository or Slack message to @gloria.
 
 ## Troubleshooting
 

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

@@ -8,19 +8,16 @@ module Fastlane
 
       def self.run(params)
         report_filepaths = params[:reports].reverse
-        # If no retries are required return the results
         if report_filepaths.size == 1
           FileUtils.cp(report_filepaths[0], params[:collated_report])
         else
           target_report = File.open(report_filepaths.shift) {|f| Nokogiri::XML(f)}
           reports = report_filepaths.map { |report_filepath| Nokogiri::XML(Nokogiri::PList(open(report_filepath)).to_plist) }
-          # Clean each retry report and merge it into the first report
           reports.each do |retry_report|
             retry_report = clean_report(retry_report.to_s)
             mergeLists(target_report, retry_report, params)
           end
         end
-        # Merge screenshots and console logs from all retry runs
         merge_assets(params[:assets], params[:collated_report] + "/Attachments")
         merge_logs(params[:logs], params[:collated_report] + "/")
       end
@@ -33,7 +30,6 @@ module Fastlane
         retried_tests = retry_report.xpath("//key[contains(.,'TestSummaryGUID')]/..")
         current_node = retried_tests.shift
         while (current_node != nil)
-          # For each retried test, get the corresponding node of data from the retried report and merge it into the base report
           testName = get_test_name(current_node)
           matching_node = target_report.at_xpath("//string[contains(.,'#{testName}')]/..")
           if (!matching_node.nil?)
@@ -55,7 +51,6 @@ module Fastlane
 
       # Cleans formatting of report
       def self.clean_report(report)
-        # Removes unescaped <> characters which cause the final .plist to become unreadable
         report = report.gsub("<XCAccessibilityElement:/>0x", " XCAccessibilityElement ")
         report = report.gsub("<XCAccessibilityElement:></XCAccessibilityElement:>", " XCAccessibilityElement ")
         report = Nokogiri::XML(report)

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

@@ -38,10 +38,8 @@ module Fastlane
       def self.parse_failures(plist, scheme_name)
         failures = Array.new
         target_report = File.open(plist) {|f| Nokogiri::XML(f)}
-        # Get the names of all the failed tests from the specified report
         failed = target_report.xpath("//key[contains(.,'Failure')]/../key[contains(.,'TestIdentifier')]/following-sibling::string[contains(.,'()') and contains (., '/')]")
         failed.each do |test_name|
-          # Reformat the test name to be usable by the xcodebuild 'only_testing' flag
           failures << ("#{scheme_name}/" + test_name.to_s.split('(')[0].split('>')[1])
         end
         failures
@@ -50,9 +48,9 @@ module Fastlane
       # Merge results from all retries
       def self.merge_reports(scan_options, final_report_path)
         folder = get_folder_root(scan_options[:output_directory])
-        report_files = Dir.glob("#{folder}*/*/*/action_TestSummaries.plist")
-        asset_files = Dir.glob("#{folder}*/*/*/Attachments")
-        log_files = Dir.glob("#{folder}*/*/*/action.xcactivitylog")
+        report_files = Dir.glob("#{folder}*/**/action_TestSummaries.plist")
+        asset_files = Dir.glob("#{folder}*/**/Attachments")
+        log_files = Dir.glob("#{folder}*/**/action.xcactivitylog")
         if report_files.size > 1
           other_action.collate_junit_reports(
             reports: report_files,

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Retry
-    VERSION = "1.1.0"
+    VERSION = "1.1.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-retry
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - gmgchow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-07 00:00:00.000000000 Z
+date: 2018-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry