fastlane-plugin-test_center 1.2.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c46c83ee933f5f236e9b6b2d6b75c0b7f9f3bc2
-  data.tar.gz: c86c033bcc93a1eb6d83a86029fae1a4ba0d660d
+  metadata.gz: 1260815a43648f4c6b82c856b8113b96906bb757
+  data.tar.gz: 902bf36489b92aa7ce6c9ab3590d2c0cf99b9fd9
 SHA512:
-  metadata.gz: 4b2f5a8ce473ed081db5edda0969e9df423f153876152d865f8955b9486d32cbc4f99899ebb80cdf3ed86656fe45dafc40f780e46aff5c8348d573f223949701
-  data.tar.gz: 28598d3337505c1fc033ac6da1cc5fe086f09bf4f1ef4f744087473b2260aad10f3300dec80f756af2ef6e84f0492b8ab7fc810df3a4bafd8969784ca35fb55f
+  metadata.gz: b80ac781c34de4efc71202e5b14e187abd6801bd61d4e731168e32702dc703935b4e5a7dc7b70b3825d25ebbd1f79492ceaf38276e19a03107f04c9a82e545a2
+  data.tar.gz: c4ded416a5215782795b81ed066b2210ad70e0dcc419b4ac475fb149bdc90d1b6a9d57b2283b6691f2ddc7941eff1c2e7f3109db0b362a99389552f42d098656

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

@@ -1,6 +1,7 @@
 module Fastlane
   module Actions
     require 'fastlane/actions/scan'
+    require 'shellwords'
 
     class MultiScanAction < Action
       def self.run(params)
@@ -22,9 +23,10 @@ module Fastlane
         rescue FastlaneCore::Interface::FastlaneTestFailure => e
           UI.verbose("Scan failed with #{e}")
           if try_count < params[:try_count]
-          report_filepath = junit_report_filepath(scan_options)
-          scan_options[:only_testing] = other_action.tests_from_junit(junit: report_filepath)[:failed]
-          increment_junit_report_filename(scan_options)
+            report_filepath = junit_report_filepath(scan_options)
+            failed_tests = other_action.tests_from_junit(junit: report_filepath)[:failed]
+            scan_options[:only_testing] = failed_tests.map(&:shellescape)
+            increment_junit_report_filename(scan_options)
             retry
           end
         end
@@ -123,7 +125,7 @@ module Fastlane
       end
 
       def self.authors
-        ["lyndsey-ferguson/@ldferguson"]
+        ["lyndsey-ferguson/@lyndseydf"]
       end
 
       def self.is_supported?(platform)

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

@@ -5,7 +5,7 @@ module Fastlane
 
       def self.run(params)
         project_path = params[:xcodeproj]
-        tests_to_skip = params[:tests]
+        all_tests_to_skip = params[:tests]
         scheme = params[:scheme]
 
         scheme_filepaths = Dir.glob("#{project_path}/{xcshareddata,xcuserdata}/**/xcschemes/#{scheme || '*'}.xcscheme")
@@ -18,6 +18,11 @@ module Fastlane
           is_dirty = false
           xcscheme = Xcodeproj::XCScheme.new(scheme_filepath)
           xcscheme.test_action.testables.each do |testable|
+            buildable_name = File.basename(testable.buildable_references[0].buildable_name, '.xctest')
+
+            tests_to_skip = all_tests_to_skip.select { |test| test.start_with?(buildable_name) }
+                                             .map { |test| test.sub("#{buildable_name}/", '') }
+
             tests_to_skip.each do |test_to_skip|
               skipped_test = Xcodeproj::XCScheme::TestAction::TestableReference::SkippedTest.new
               skipped_test.identifier = test_to_skip
@@ -55,9 +60,9 @@ module Fastlane
             verify_block: proc do |tests|
               UI.user_error!("Error: no tests were given to suppress!") unless tests and !tests.empty?
               tests.each do |test_identifier|
-                is_valid_test_identifier = %r{^[a-zA-Z][a-zA-Z0-9]+(\/test[a-zA-Z0-9]+)?$} =~ test_identifier
+                is_valid_test_identifier = %r{^[a-zA-Z][a-zA-Z0-9]+\/[a-zA-Z][a-zA-Z0-9]+(\/test[a-zA-Z0-9]+)?$} =~ test_identifier
                 unless is_valid_test_identifier
-                  UI.user_error!("Error: invalid test identifier '#{test_identifier}'. It must be in the format of 'TestSuiteToSuppress' or 'TestSuiteToSuppress/testToSuppress'")
+                  UI.user_error!("Error: invalid test identifier '#{test_identifier}'. It must be in the format of 'Testable/TestSuiteToSuppress' or 'Testable/TestSuiteToSuppress/testToSuppress'")
                 end
               end
             end,
@@ -76,7 +81,7 @@ module Fastlane
       end
 
       def self.authors
-        ["lyndsey-ferguson/@ldferguson"]
+        ["lyndsey-ferguson/@lyndseydf"]
       end
 
       def self.is_supported?(platform)

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

@@ -11,14 +11,20 @@ module Fastlane
           UI.user_error!("Error: cannot find any schemes in the Xcode project")
         end
 
-        report_file = File.open(params[:junit]) { |f| REXML::Document.new(f) }
-        UI.user_error!("Malformed XML test report file given") if report_file.root.nil?
-        UI.user_error!("Valid XML file is not an Xcode test report") if report_file.get_elements('testsuites').empty?
-
-        if params[:suppress_type] == :failed
-          tests_per_target_to_suppress = failing_tests(report_file)
-        else
-          tests_per_target_to_suppress = passing_tests(report_file)
+        testables = Hash.new([])
+        desired_passed_status = (params[:suppress_type] == :passing)
+
+        report = ::TestCenter::Helper::XcodeJunit::Report.new(params[:junit])
+
+        report.testables.each do |testable|
+          testables[testable.name] = []
+          testable.testsuites.each do |testsuite|
+            testsuite.testcases.each do |testcase|
+              if testcase.passed? == desired_passed_status
+                testables[testable.name] << testcase.skipped_test
+              end
+            end
+          end
         end
 
         scheme_filepaths.each do |scheme_filepath|
@@ -27,10 +33,7 @@ module Fastlane
 
           xcscheme.test_action.testables.each do |testable|
             buildable_name = testable.buildable_references[0].buildable_name
-
-            tests_per_target_to_suppress[buildable_name].each do |test_to_skip|
-              skipped_test = Xcodeproj::XCScheme::TestAction::TestableReference::SkippedTest.new
-              skipped_test.identifier = test_to_skip
+            testables[buildable_name].each do |skipped_test|
               testable.add_skipped_test(skipped_test)
               is_dirty = true
             end
@@ -39,49 +42,6 @@ module Fastlane
         end
       end
 
-      def self.failing_tests(report_file)
-        tests = Hash.new { |hash, key| hash[key] = [] }
-
-        report_file.elements.each('*/testsuite/testcase/failure') do |failure_element|
-          testcase = failure_element.parent
-          testsuite_element = testcase.parent
-          buildable_name = buildable_name_from_testcase(testcase)
-
-          tests[buildable_name] << xctest_identifier(testcase)
-          # Remove all the failures from this in-memory xml file to make
-          # it easier to find the passing tests below
-          testsuite_element.delete_element testcase
-        end
-        tests
-      end
-
-      def self.passing_tests(report_file)
-        tests = Hash.new { |hash, key| hash[key] = [] }
-
-        report_file.elements.each('*/testsuite/testcase') do |testcase|
-          buildable_name = buildable_name_from_testcase(testcase)
-
-          tests[buildable_name] << xctest_identifier(testcase)
-        end
-        tests
-      end
-
-      def self.buildable_name_from_testcase(testcase)
-        testsuite_element = testcase.parent
-        buildable_element = testsuite_element.parent
-        buildable_element.attributes['name']
-      end
-
-      def self.xctest_identifier(testcase)
-        testcase_class = testcase.attributes['classname']
-        testcase_testmethod = testcase.attributes['name']
-
-        is_swift = testcase_class.include?('.')
-        testcase_class.gsub!(/.*\./, '')
-        testcase_testmethod << '()' if is_swift
-        "#{testcase_class}/#{testcase_testmethod}"
-      end
-
       #####################################################
       # @!group Documentation
       #####################################################
@@ -131,7 +91,7 @@ module Fastlane
       end
 
       def self.authors
-        ["lyndsey-ferguson/@ldferguson"]
+        ["lyndsey-ferguson/@lyndseydf"]
       end
 
       def self.is_supported?(platform)

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

@@ -17,8 +17,12 @@ module Fastlane
         scheme_filepaths.each do |scheme_filepath|
           xcscheme = Xcodeproj::XCScheme.new(scheme_filepath)
           xcscheme.test_action.testables.each do |testable|
+            buildable_name = testable.buildable_references[0]
+                                     .buildable_name
+
+            buildable_name = File.basename(buildable_name, '.xctest')
             testable.skipped_tests.map do |skipped_test|
-              skipped_tests.add(skipped_test.identifier)
+              skipped_tests.add("#{buildable_name}/#{skipped_test.identifier}")
             end
           end
         end
@@ -57,7 +61,7 @@ module Fastlane
       end
 
       def self.authors
-        ["lyndsey-ferguson/@ldferguson"]
+        ["lyndsey-ferguson/@lyndseydf"]
       end
 
       def self.is_supported?(platform)

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

@@ -2,43 +2,26 @@ module Fastlane
   module Actions
     class TestsFromJunitAction < Action
       def self.run(params)
-        report_file = File.open(params[:junit]) { |f| REXML::Document.new(f) }
-        UI.user_error!("Malformed XML test report file given") if report_file.root.nil?
-        UI.user_error!("Valid XML file is not an Xcode test report") if report_file.get_elements('testsuites').empty?
-
+        report = ::TestCenter::Helper::XcodeJunit::Report.new(params[:junit])
+        passing = []
+        failed = []
+        report.testables.each do |testable|
+          testable.testsuites.each do |testsuite|
+            testsuite.testcases.each do |testcase|
+              if testcase.passed?
+                passing << testcase.identifier
+              else
+                failed << testcase.identifier
+              end
+            end
+          end
+        end
         {
-          passing: passing_tests(report_file).to_a,
-          failed: failing_tests(report_file).to_a
+          failed: failed,
+          passing: passing
         }
       end
 
-      def self.failing_tests(report_file)
-        tests = Set.new
-
-        report_file.elements.each('*/testsuite/testcase/failure') do |failure_element|
-          testcase = failure_element.parent
-          tests << xctest_identifier(testcase)
-        end
-        tests
-      end
-
-      def self.passing_tests(report_file)
-        tests = Set.new
-
-        report_file.elements.each('*/testsuite/testcase[not(failure)]') do |testcase|
-          tests << xctest_identifier(testcase)
-        end
-        tests
-      end
-
-      def self.xctest_identifier(testcase)
-        testcase_class = testcase.attributes['classname']
-        testcase_testmethod = testcase.attributes['name']
-
-        testcase_class.gsub!(/.*\./, '')
-        "#{testcase_class}/#{testcase_testmethod}"
-      end
-
       #####################################################
       # @!group Documentation
       #####################################################
@@ -65,7 +48,7 @@ module Fastlane
       end
 
       def self.authors
-        ["lyndsey-ferguson/ldferguson"]
+        ["lyndsey-ferguson/lyndseydf"]
       end
 
       def self.is_supported?(platform)

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

@@ -0,0 +1,94 @@
+require_relative 'xcodebuild_string'
+
+module TestCenter
+  module Helper
+    module XcodeJunit
+      require 'xcodeproj'
+
+      class Report
+        def initialize(junit_report_filepath)
+          report_file = File.open(junit_report_filepath) { |f| REXML::Document.new(f) }
+          UI.user_error!("Malformed XML test report file given") if report_file.root.nil?
+          UI.user_error!("Valid XML file is not an Xcode test report") if report_file.get_elements('testsuites').empty?
+
+          @testables = []
+          report_file.elements.each('testsuites') do |testsuites_element|
+            @testables << Testable.new(testsuites_element)
+          end
+        end
+
+        def testables
+          return @testables
+        end
+      end
+
+      class Testable
+        def initialize(xml_element)
+          @root = xml_element
+          @testsuites = []
+          @root.elements.each('testsuite') do |testsuite_element|
+            @testsuites << TestSuite.new(testsuite_element)
+          end
+        end
+
+        def name
+          return @root.attributes['name']
+        end
+
+        def testsuites
+          return @testsuites
+        end
+      end
+
+      class TestSuite
+        def initialize(xml_element)
+          @root = xml_element
+          @testcases = []
+          @root.elements.each('testcase') do |testcase_element|
+            @testcases << TestCase.new(testcase_element)
+          end
+        end
+
+        def name
+          return @root.attributes['name']
+        end
+
+        def identifier
+          name.testsuite
+        end
+
+        def is_swift?
+          return name.include?('.')
+        end
+
+        def testcases
+          return @testcases
+        end
+      end
+
+      class TestCase
+        attr_reader :identifier
+        attr_reader :skipped_test
+
+        def initialize(xml_element)
+          @root = xml_element
+          name = xml_element.attributes['name']
+          full_testsuite = xml_element.parent.attributes['name']
+          testsuite = full_testsuite.testsuite
+          is_swift = full_testsuite.testsuite_swift?
+
+          testable_filename = xml_element.parent.parent.attributes['name']
+          testable = File.basename(testable_filename, '.xctest')
+          @identifier = "#{testable}/#{testsuite}/#{name}"
+          @skipped_test = Xcodeproj::XCScheme::TestAction::TestableReference::SkippedTest.new
+          @skipped_test.identifier = "#{testsuite}/#{name}#{'()' if is_swift}"
+          @passed = xml_element.get_elements('failure').size.zero?
+        end
+
+        def passed?
+          @passed
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+
+class String
+  def testsuite_swift?
+    self.include?('.')
+  end
+
+  def testsuite
+    if self.testsuite_swift?
+      self.split('.')[1]
+    else
+      self
+    end
+  end
+end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module TestCenter
-    VERSION = "1.2.0"
+    VERSION = "2.0.0"
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-test_center
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Lyndsey Ferguson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-18 00:00:00.000000000 Z
+date: 2017-12-27 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: xcodeproj
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -142,7 +156,9 @@ files:
 - lib/fastlane/plugin/test_center/actions/suppress_tests_from_junit.rb
 - lib/fastlane/plugin/test_center/actions/suppressed_tests.rb
 - lib/fastlane/plugin/test_center/actions/tests_from_junit.rb
+- lib/fastlane/plugin/test_center/helper/junit_helper.rb
 - lib/fastlane/plugin/test_center/helper/test_center_helper.rb
+- lib/fastlane/plugin/test_center/helper/xcodebuild_string.rb
 - lib/fastlane/plugin/test_center/version.rb
 homepage: https://github.com/lyndsey-ferguson/fastlane-plugin-test_center
 licenses: