fastlane-plugin-test_center 3.13.0 → 3.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd3718fbdf6d40f912c0bec66d449e7e920961212f5dddf72a1960dba9429d24
-  data.tar.gz: a261932eb1cb2eb2d24f2d934df71cb3743ef6328a25c64648052678dd95ea3b
+  metadata.gz: e081e2a0d9d6bcb59c38f24072eb0059edef4457f03fed6e2318930260e9f5a4
+  data.tar.gz: 681403d6200f5d943e28f9c3fa6b90a6f450d7a9252c476eb7cf77c7e0c6101d
 SHA512:
-  metadata.gz: 1f1324b7256876f8cd0f7d8a05c24ee4e72954443b652ed869a445c9edf3bb29c2b28b34b88dd7d79879cc26ddd2fd0366437781c8f75f757c54e86a5103ed7f
-  data.tar.gz: 9932b4bb2db2134e913ed25b79797612bd1796c9dc74938ac9fda788cb5c58b07cadfd94688552045898d2443de34767726c26f8623413483b22b280486d1e27
+  metadata.gz: 98e979a4fbafe31e6dc33bd1a3a94a1e1da316ce8226c3688e9d223461a33c5d75c9291dc837e256c227915959547f8964df38c524e40b45742408235ee94713
+  data.tar.gz: 3049728d26e108dea44480f7445e41be419f4189e3bb2b63b8cef7871a9d7bf58b5edcee01351dc40496209f6805706bfcb0b6cf08b9fee6c43bba1decbfecda

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

@@ -44,9 +44,10 @@ module Fastlane
         html_file_contents = File.read(html_report_filepath)
         File.open(html_report_filepath, 'w') do |file|
           html_file_contents.each_line do |line|
-            m = %r{(<section class="test-detail[^"]*">)(.*(<|>).*)(</section>)}.match(line)
+            m = %r{(<section class="test-detail[^"]*">)(.*(<|>|&(?!amp;)).*)(</section>)}.match(line)
             if m
               test_details = m[2]
+              test_details.gsub!(/&(?!amp;)/, '&amp;')
               test_details.gsub!('<', '&lt;')
               test_details.gsub!('>', '&gt;')
               line = m[1] + test_details + m[4]

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

@@ -1,6 +1,7 @@
 module Fastlane
   module Actions
     class CollateJunitReportsAction < Action
+      require 'set'
 
       def self.run(params)
         report_filepaths = params[:reports]
@@ -9,17 +10,27 @@ module Fastlane
         else
           UI.verbose("collate_junit_reports with #{report_filepaths}")
           reports = report_filepaths.map { |report_filepath| REXML::Document.new(File.new(report_filepath)) }
+          packages = reports.map { |r| r.root.attribute('name').value }.uniq
+          combine_multiple_targets = packages.size > 1 
+
           # copy any missing testsuites
           target_report = reports.shift
-          preprocess_testsuites(target_report)
+
+          package = target_report.root.attribute('name').value
+          preprocess_testsuites(target_report, package, combine_multiple_targets)
 
           reports.each do |report|
             increment_testable_tries(target_report.root, report.root)
-            preprocess_testsuites(report)
+            package = report.root.attribute('name').value
+            preprocess_testsuites(report, package, combine_multiple_targets)
             UI.verbose("> collating last report file #{report_filepaths.last}")
             report.elements.each('//testsuite') do |testsuite|
               testsuite_name = testsuite.attribute('name').value
-              target_testsuite = REXML::XPath.first(target_report, "//testsuite[@name='#{testsuite_name}']")
+              package_attribute = ''
+              if combine_multiple_targets
+                package_attribute = "@package='#{package}'"
+              end
+              target_testsuite = REXML::XPath.first(target_report, "//testsuite[@name='#{testsuite_name}' #{package_attribute}]")
               if target_testsuite
                 UI.verbose("  > collating testsuite #{testsuite_name}")
                 collate_testsuite(target_testsuite, testsuite)
@@ -36,6 +47,7 @@ module Fastlane
           end
           testable = REXML::XPath.first(target_report, 'testsuites')
           update_testable_counts(testable)
+          testable.add_attribute('name', packages.to_a.join(', '))
 
           FileUtils.mkdir_p(File.dirname(params[:collated_report]))
           File.open(params[:collated_report], 'w') do |f|
@@ -81,10 +93,11 @@ module Fastlane
         update_testsuite_counts(testsuite)
       end
 
-      def self.preprocess_testsuites(report)
+      def self.preprocess_testsuites(report, package, combine_multiple_targets)
         report.elements.each('//testsuite') do |testsuite|
           flatten_duplicate_testsuites(report, testsuite)
           collapse_testcase_multiple_failures_in_testsuite(testsuite)
+          testsuite.add_attribute('package', package) if combine_multiple_targets
         end
       end
 

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

@@ -221,10 +221,12 @@ module Fastlane
             'collate the test_result bundles to a temporary bundle \"result.test_result\"'
           )
           bundles = Dir['../spec/fixtures/*.test_result'].map { |relpath| File.absolute_path(relpath) }
-          collate_test_result_bundles(
-            bundles: bundles,
-            collated_bundle: File.join('test_output', 'result.test_result')
-          )
+          Dir.mktmpdir('test_output') do |dir|
+            collate_test_result_bundles(
+              bundles: bundles,
+              collated_bundle: File.join(dir, 'result.test_result')
+            )
+          end
           "
         ]
       end

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

@@ -86,15 +86,19 @@ module Fastlane
       def self.example_code
         [
           "
+          require 'tmpdir'
+
           UI.important(
             'example: ' \\
             'collate the xcresult bundles to a temporary xcresult bundle \"result.xcresult\"'
           )
-          xcresults = Dir['../spec/fixtures/*.xcresult'].map { |relpath| File.absolute_path(relpath) }
-          collate_xcresults(
-            xcresults: xcresults,
-            collated_xcresult: File.join('test_output', 'result.xcresult')
-          )
+          xcresults = Dir['../spec/fixtures/AtomicBoyUITests-batch-{3,4}/result.xcresult'].map { |relpath| File.absolute_path(relpath) }
+          Dir.mktmpdir('test_output') do |dir|
+            collate_xcresults(
+              xcresults: xcresults,
+              collated_xcresult: File.join(dir, 'result.xcresult')
+            )
+          end
           "
         ]
       end

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

@@ -171,7 +171,10 @@ module Fastlane
         use_scanfile_to_override_settings(scan_options)
         turn_off_concurrent_workers(scan_options)
         UI.important("Turning off :skip_build as it doesn't do anything with multi_scan") if scan_options[:skip_build]
-        scan_options.reject! { |k,v| k == :skip_build }
+        if scan_options[:disable_xcpretty]
+          UI.important("Turning off :disable_xcpretty as xcpretty is needed to generate junit reports for retrying failed tests")
+        end
+        scan_options.reject! { |k,v| %i[skip_build disable_xcpretty].include?(k) }
         ScanHelper.remove_preexisting_simulator_logs(scan_options)
         if scan_options[:test_without_building]
           UI.verbose("Preparing Scan config options for multi_scan testing")
@@ -487,6 +490,85 @@ module Fastlane
         ]
       end
 
+      def self.integration_tests
+        [
+          "
+          UI.header('Basic test')
+          multi_scan(
+            workspace: File.absolute_path('../AtomicBoy/AtomicBoy.xcworkspace'),
+            scheme: 'AtomicBoy',
+            fail_build: false,
+            try_count: 2,
+            disable_xcpretty: true
+          )
+          ",
+          "
+          UI.header('Basic test with 1 specific test')
+          multi_scan(
+            workspace: File.absolute_path('../AtomicBoy/AtomicBoy.xcworkspace'),
+            scheme: 'AtomicBoy',
+            fail_build: false,
+            try_count: 2,
+            only_testing: ['AtomicBoyUITests/AtomicBoyUITests/testExample']
+          )
+          ",
+          "
+          UI.header('Basic test with test target expansion')
+          multi_scan(
+            workspace: File.absolute_path('../AtomicBoy/AtomicBoy.xcworkspace'),
+            scheme: 'AtomicBoy',
+            fail_build: false,
+            try_count: 2,
+            only_testing: ['AtomicBoyUITests', 'AtomicBoyTests']
+          )
+          ",
+          "
+          UI.header('Parallel test run')
+          multi_scan(
+            workspace: File.absolute_path('../AtomicBoy/AtomicBoy.xcworkspace'),
+            scheme: 'AtomicBoy',
+            fail_build: false,
+            try_count: 2,
+            parallel_testrun_count: 2
+          )
+          ",
+          "
+          UI.header('Parallel test run with fewer tests than parallel test runs')
+          multi_scan(
+            workspace: File.absolute_path('../AtomicBoy/AtomicBoy.xcworkspace'),
+            scheme: 'AtomicBoy',
+            fail_build: false,
+            try_count: 2,
+            parallel_testrun_count: 4,
+            only_testing: ['AtomicBoyUITests/AtomicBoyUITests/testExample']
+          )
+          ",
+          "
+          UI.header('Basic test with batches')
+          multi_scan(
+            workspace: File.absolute_path('../AtomicBoy/AtomicBoy.xcworkspace'),
+            scheme: 'AtomicBoy',
+            fail_build: false,
+            try_count: 2,
+            batch_count: 2
+          )
+          ",
+          "
+          UI.header('Basic test with xcresult')
+          multi_scan(
+            workspace: File.absolute_path('../AtomicBoy/AtomicBoy.xcworkspace'),
+            scheme: 'AtomicBoy',
+            output_types: 'xcresult',
+            output_files: 'result.xcresult',
+            collate_reports: false,
+            fail_build: false,
+            try_count: 2,
+            batch_count: 2
+          )
+          "
+        ]
+      end
+
       def self.authors
         ["lyndsey-ferguson/@lyndseydf"]
       end

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

@@ -0,0 +1,103 @@
+require 'trainer'
+require 'shellwords'
+
+module Fastlane
+  module Actions
+    class TestsFromXcresultAction < Action
+      def self.run(params)
+        unless FastlaneCore::Helper.xcode_at_least?('11.0.0')
+          UI.error("Error: tests_from_xcresult requires at least Xcode 11.0")
+          return {}
+        end
+
+        xcresult_path = File.absolute_path(params[:xcresult])
+
+        # taken from the rubygem trainer, in the test_parser.rb module
+        result_bundle_object_raw = sh("xcrun xcresulttool get --path #{xcresult_path.shellescape} --format json", print_command: false, print_command_output: false)
+        result_bundle_object = JSON.parse(result_bundle_object_raw)
+
+        # Parses JSON into ActionsInvocationRecord to find a list of all ids for ActionTestPlanRunSummaries
+        actions_invocation_record = Trainer::XCResult::ActionsInvocationRecord.new(result_bundle_object)
+        test_refs = actions_invocation_record.actions.map do |action|
+          action.action_result.tests_ref
+        end.compact
+
+        ids = test_refs.map(&:id)
+        summaries = ids.map do |id|
+          raw = sh("xcrun xcresulttool get --format json --path #{xcresult_path.shellescape} --id #{id}", print_command: false, print_command_output: false)
+          json = JSON.parse(raw)
+          Trainer::XCResult::ActionTestPlanRunSummaries.new(json)
+        end
+        failures = actions_invocation_record.issues.test_failure_summaries || []
+        all_summaries = summaries.map(&:summaries).flatten
+        testable_summaries = all_summaries.map(&:testable_summaries).flatten
+        failed = []
+        passing = []
+        failure_details = {}
+        rows = testable_summaries.map do |testable_summary|
+          all_tests = testable_summary.all_tests.flatten
+          all_tests.each do |t|
+            if t.test_status == 'Success'
+              passing << "#{t.parent.name}/#{t.identifier}"
+            else
+              test_identifier = "#{t.parent.name}/#{t.identifier}"
+              failed << test_identifier
+              failure = t.find_failure(failures)
+              if failure
+                failure_details[test_identifier] = {
+                  message: failure.failure_message
+                }
+              end
+            end
+          end
+        end
+        {
+          failed: failed.uniq,
+          passing: passing.uniq,
+          failure_details: failure_details
+        }
+      end
+
+      #####################################################
+      # @!group Documentation
+      #####################################################
+
+      def self.description
+        "☑️ Retrieves the failing and passing tests as reportedn an xcresult bundle"
+      end
+
+
+      def self.available_options
+        [
+          FastlaneCore::ConfigItem.new(
+            key: :xcresult,
+            env_name: "FL_TESTS_FROM_XCRESULT_XCRESULT_PATH",
+            description: "The path to the xcresult bundle to retrieve the tests from",
+            verify_block: proc do |path|
+              UI.user_error!("Error: cannot find the xcresult bundle at '#{path}'") unless Dir.exist?(path)
+              UI.user_error!("Error: cannot parse files that are not in the xcresult format") unless File.extname(path) == ".xcresult"
+            end
+          )
+        ]
+      end
+
+      def self.return_value
+        "A Hash with information about the test results:\r\n" \
+        "failed: an Array of the failed test identifiers\r\n" \
+        "passing: an Array of the passing test identifiers\r\n"
+      end
+
+      def self.authors
+        ["lyndsey-ferguson/lyndseydf"]
+      end
+
+      def self.category
+        :testing
+      end
+
+      def self.is_supported?(platform)
+        %i[ios mac].include?(platform)
+      end
+    end
+  end
+end

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

@@ -66,9 +66,10 @@ module TestCenter
           @test_collector = TestCollector.new(@options)
           @options.reject! { |key| %i[testplan].include?(key) }
           @batch_count = @test_collector.test_batches.size
-          if @test_collector.test_batches.flatten.size < @options[:parallel_testrun_count].to_i
-            FastlaneCore::UI.important(":parallel_testrun_count greater than the number of tests (#{@test_collector.only_testing.size}). Reducing to that number.")
-            @options[:parallel_testrun_count] = @test_collector.only_testing.size
+          tests = @test_collector.test_batches.flatten
+          if tests.size < @options[:parallel_testrun_count].to_i
+            FastlaneCore::UI.important(":parallel_testrun_count greater than the number of tests (#{tests.size}). Reducing to that number.")
+            @options[:parallel_testrun_count] = tests.size
           end
         end
 
@@ -233,6 +234,7 @@ module TestCenter
           @test_collector.testables.each do |testable|
             collate_batched_reports_for_testable(testable)
           end
+          collate_multitarget_junits
           move_single_testable_reports_to_final_location
         end
 
@@ -294,6 +296,31 @@ module TestCenter
           File.symlink(xcresult_bundlename_path, test_result_bundlename_path)
         end
 
+        def collate_multitarget_junits
+          return if @test_collector.testables.size < 2
+
+          Fastlane::UI.verbose("Collating test targets's junit results")
+
+          given_custom_report_file_name = @options[:custom_report_file_name]
+          given_output_types = @options[:output_types]
+          given_output_files = @options[:output_files]
+
+          report_name_helper = ReportNameHelper.new(
+            given_output_types,
+            given_output_files,
+            given_custom_report_file_name
+          )
+
+          absolute_output_directory = File.absolute_path(output_directory)
+          source_reports_directory_glob = "#{absolute_output_directory}/*"
+
+          TestCenter::Helper::MultiScanManager::ReportCollator.new(
+            source_reports_directory_glob: source_reports_directory_glob,
+            output_directory: absolute_output_directory,
+            reportnamer: report_name_helper
+          ).collate_junit_reports 
+        end
+
         def collate_batched_reports_for_testable(testable)
           FastlaneCore::UI.verbose("Collating results for all batches")
 

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

@@ -91,31 +91,77 @@ module TestCenter
       end
 
       def xctestrun_known_tests
-        config = FastlaneCore::Configuration.create(
-          ::Fastlane::Actions::TestsFromXctestrunAction.available_options,
-          {
-            xctestrun: @xctestrun_path,
-            invocation_based_tests: @invocation_based_tests,
-            swift_test_prefix: @swift_test_prefix
-          }
-        )
-        ::Fastlane::Actions::TestsFromXctestrunAction.run(config)
+        unless @known_tests
+          config = FastlaneCore::Configuration.create(
+            ::Fastlane::Actions::TestsFromXctestrunAction.available_options,
+            {
+              xctestrun: @xctestrun_path,
+              invocation_based_tests: @invocation_based_tests,
+              swift_test_prefix: @swift_test_prefix
+            }
+          )
+          @known_tests = ::Fastlane::Actions::TestsFromXctestrunAction.run(config)
+        end
+        @known_tests
       end
 
-      def expand_testsuites_to_tests
+      def expand_short_testidentifiers_to_tests(testables_tests)
+        # Remember, testable_tests is of the format:
+        # {
+        #   'testable1' => [
+        #     'testsuite1/testcase1',
+        #     'testsuite1/testcase2',
+        #     'testsuite2/testcase1',
+        #     'testsuite2/testcase2',
+        #     ...
+        #     'testsuiteN/testcase1', ... 'testsuiteN/testcaseM'
+        #   ],
+        #   ...
+        #   'testableO' => [
+        #     'testsuite1/testcase1',
+        #     'testsuite1/testcase2',
+        #     'testsuite2/testcase1',
+        #     'testsuite2/testcase2',
+        #     ...
+        #     'testsuiteN/testcase1', ... 'testsuiteN/testcaseM'
+        #   ]
+        # }
         return if @invocation_based_tests
 
+        # iterate among all the test identifers for each testable
+        # A test identifier is seperated into components by '/'
+        # if a test identifier has only 2 separators, it probably is
+        # 'testable/testsuite' (but it could be 'testsuite/testcase' )
+        all_known_tests = nil
         known_tests = []
-        @testables_tests.each do |testable, tests|
+        testables_tests.each do |testable, tests|
           tests.each_with_index do |test, index|
-            if test.count('/') < 2
-              known_tests += xctestrun_known_tests[testable]
-              test_components = test.split('/')
-              testsuite = test_components.size == 1 ? test_components[0] : test_components[1]
-              @testables_tests[testable][index] = known_tests.select { |known_test| known_test.include?(testsuite) }
+            test_components = test.split('/')
+            is_full_test_identifier = (test_components.size == 3)
+            next if is_full_test_identifier
+
+            all_known_tests ||= xctestrun_known_tests.clone
+
+            testsuite = ''
+            if test_components.size == 1
+              if test_components[0] == testable
+                # The following || [] is just in case the user provided multiple
+                # test targets or there are no actual tests found.
+                testables_tests[testable][index] = all_known_tests[testable] || []
+                all_known_tests.delete(testable)
+                next
+              end
+
+              testsuite = test_components[0]
+            else
+              testsuite = test_components[1]
+            end
+
+            testables_tests[testable][index], all_known_tests[testable] = all_known_tests[testable].partition do |known_test|
+              known_test.split('/')[1] == testsuite
             end
           end
-          @testables_tests[testable].flatten!
+          testables_tests[testable].flatten!
         end
       end
 
@@ -123,7 +169,7 @@ module TestCenter
         unless @testables_tests
           if @only_testing
             @testables_tests = only_testing_to_testables_tests
-            expand_testsuites_to_tests
+            expand_short_testidentifiers_to_tests(@testables_tests)
           else
             @testables_tests = xctestrun_known_tests
             if @skip_testing

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

@@ -1,5 +1,5 @@
 module Fastlane
   module TestCenter
-    VERSION = "3.13.0"
+    VERSION = "3.14.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-test_center
 version: !ruby/object:Gem::Version
-  version: 3.13.0
+  version: 3.14.3
 platform: ruby
 authors:
 - Lyndsey Ferguson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-02 00:00:00.000000000 Z
+date: 2020-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: trainer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: xcodeproj
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -270,6 +284,7 @@ files:
 - lib/fastlane/plugin/test_center/actions/test_options_from_testplan.rb
 - lib/fastlane/plugin/test_center/actions/testplans_from_scheme.rb
 - lib/fastlane/plugin/test_center/actions/tests_from_junit.rb
+- lib/fastlane/plugin/test_center/actions/tests_from_xcresult.rb
 - lib/fastlane/plugin/test_center/actions/tests_from_xctestrun.rb
 - lib/fastlane/plugin/test_center/helper/fastlane_core/device_manager/simulator_extensions.rb
 - lib/fastlane/plugin/test_center/helper/html_test_report.rb
@@ -295,7 +310,7 @@ homepage: https://github.com/lyndsey-ferguson/fastlane-plugin-test_center
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -310,8 +325,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Makes testing your iOS app easier
 test_files: []