gitlab_quality-test_tooling 1.31.0 → 1.32.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d848eed10080ffc5f609ba56a75e7baf6f60cef5792d66c9c1bf9fdb8dbd2b9
-  data.tar.gz: 5d799f1628b689fda63e0ca68fb70c5f2e6e37d20d867d6ade61e4ff04ea7e57
+  metadata.gz: e3c5680095668ee71c082a8183693ec031714d59641fbd0ba7f2ef32555a73dc
+  data.tar.gz: 42c9bc53f92cb752fddb7cbf529e08f951245c751dcfac35835fd002a307ed30
 SHA512:
-  metadata.gz: 2e881613627b3fb87abf0c00895a8b44919769b222aa1a42c60c81b8f77a79a99232145e60c798f0296d24f53f761cb6a5fd4c7d00d1cb982dcc3c58fd68a833
-  data.tar.gz: 90b1345308d5f4abb94ab81f16520bf79870de753f570223c5bc45ade1fdb7d2ca099004d682bdbcfe106c3557ebdd093ce0461b493fd98e6e687bb9930b293e
+  metadata.gz: a1f2f1791fd8e59b4e4b8e2a3ef5ca1d0c501d34ccdb9525eb621b3776495d28ac810c1280a5a0b3007b7c73aa9b08775ce87c9da5ef01cda1d396c7c79f1840
+  data.tar.gz: e7d5b62b448ce3e48a50368feebc11bd5d2956f61c34628de7484ad658fdc6d1ab027eee716d754b8d16d2732245820ee220a809199b1ef9295c7457b54f7ea4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab_quality-test_tooling (1.31.0)
+    gitlab_quality-test_tooling (1.32.1)
       activesupport (>= 7.0, < 7.2)
       amatch (~> 0.4.1)
       gitlab (~> 4.19)

data/lib/gitlab_quality/test_tooling/report/report_as_issue.rb

@@ -124,12 +124,12 @@ module GitlabQuality
           issue_attrs = {}
 
           new_description = new_issue_description(test)
-          issue_attrs[:description] = new_description unless issue.description == new_description
+          issue_attrs[:description] = new_description if issue.description != new_description
 
           new_labels = up_to_date_labels(test: test, issue: issue).to_a
-          issue_attrs[:labels] = new_labels unless issue.labels == new_labels
+          issue_attrs[:add_labels] = new_labels if (new_labels - issue.labels).any?
 
-          gitlab.edit_issue(iid: issue.iid, options: issue_attrs) unless issue_attrs.empty?
+          gitlab.edit_issue(iid: issue.iid, options: issue_attrs) if issue_attrs.any?
         end
 
         def issue_labels(issue)

data/lib/gitlab_quality/test_tooling/test_meta/processor/add_to_blocking_processor.rb

@@ -50,18 +50,21 @@ module GitlabQuality
 
             private
 
-            attr_reader :context, :file_path, :file, :file_contents, :example_name, :mr_title, :changed_line_no
+            attr_reader :context, :file_path, :file, :file_contents, :example_name, :mr_title, :changed_line_no, :matched_lines
 
             # Checks if there is already an MR open
             #
             # @return [Boolean]
-            def proceed_with_commit?
+            def proceed_with_commit? # rubocop:disable Metrics/AbcSize
               if changed_line_no.negative?
                 Runtime::Logger.info("  No lines were changed in #{file_path}. Will not proceed with creating MR.")
                 return false
               elsif context.commit_processed?(file_path, changed_line_no)
                 Runtime::Logger.info("  Record already processed for #{file_path}:#{changed_line_no}. Will not proceed with creating MR.")
                 return false
+              elsif context.quarantined?(matched_lines, file_contents)
+                Runtime::Logger.info("  This test is in quarantine: #{file_path}:#{changed_line_no}. Will not proceed with creating MR.")
+                return false
               end
 
               true
@@ -120,7 +123,7 @@ module GitlabQuality
             #
             # @return [Array<String, Integer>] first value holds the new content, the second value holds the line number of the test
             def add_metadata # rubocop:disable Metrics/AbcSize
-              matched_lines = context.find_example_match_lines(file_contents, example_name)
+              @matched_lines = context.find_example_match_lines(file_contents, example_name)
 
               if matched_lines.any? { |line| line[0].include?(':blocking') }
                 Runtime::Logger.info("Example '#{example_name}' is already blocking")

data/lib/gitlab_quality/test_tooling/test_meta/processor/add_to_quarantine_processor.rb

@@ -60,12 +60,12 @@ module GitlabQuality
             private
 
             attr_reader :context, :file_path, :file_contents, :failure_issue_url, :example_name,
-              :mr_title, :failure_issue, :changed_line_no
+              :mr_title, :failure_issue, :changed_line_no, :matched_lines
 
             # Checks if the failure issue is closed or if there is already an MR open
             #
             # @return [Boolean]
-            def proceed_with_commit?
+            def proceed_with_commit? # rubocop:disable Metrics/AbcSize
               if context.issue_is_closed?(failure_issue)
                 Runtime::Logger.info("  Failure issue '#{failure_issue_url}' is closed. Will not proceed with creating MR.")
                 return false
@@ -75,6 +75,9 @@ module GitlabQuality
               elsif failure_is_related_to_test_environment?
                 Runtime::Logger.info("  Failure issue '#{failure_issue_url}' is environment related. Will not proceed with creating MR.")
                 return false
+              elsif context.quarantined?(matched_lines, file_contents)
+                Runtime::Logger.info("  This test is already in quarantine: #{file_path}:#{changed_line_no}. Will not proceed with creating MR.")
+                return false
               end
 
               true
@@ -199,7 +202,7 @@ module GitlabQuality
             #
             # @return [Array<String, Integer>] first value holds the new content, the second value holds the line number of the test
             def add_metadata # rubocop:disable Metrics/AbcSize
-              matched_lines = context.find_example_match_lines(file_contents, example_name)
+              @matched_lines = context.find_example_match_lines(file_contents, example_name)
 
               context.update_matched_line(matched_lines.last, file_contents.dup) do |line|
                 indentation = context.indentation(line)

data/lib/gitlab_quality/test_tooling/test_meta/test_meta_updater.rb

@@ -129,6 +129,26 @@ module GitlabQuality
           matched_lines
         end
 
+        # Scans the content from the matched line until `do` is found to look for quarantine token
+        #
+        # @param [Array] matched_lines an array of arrays containing the matched line and their index
+        # @param [String] file_contents the content of the spec file
+        # @return [Bolean]
+        def quarantined?(matched_lines, file_contents)
+          lines = file_contents.split("\n")
+
+          matched_lines.each do |matched_line|
+            matched_line_starting_index = matched_line[1]
+
+            lines[matched_line_starting_index..].each do |line|
+              return true if line.include?('quarantine: {')
+              break if / do$/.match?(line)
+            end
+          end
+
+          false
+        end
+
         # Update the provided matched_line with content from the block if given
         #
         # @param [Array<String, Integer>] matched_line first value holds the line content, the second value holds the line number

data/lib/gitlab_quality/test_tooling/version.rb

@@ -2,6 +2,6 @@
 
 module GitlabQuality
   module TestTooling
-    VERSION = "1.31.0"
+    VERSION = "1.32.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_quality-test_tooling
 version: !ruby/object:Gem::Version
-  version: 1.31.0
+  version: 1.32.1
 platform: ruby
 authors:
 - GitLab Quality
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-15 00:00:00.000000000 Z
+date: 2024-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control