fix queue validation

voxpupuli · Jun 29, 2020 · f84300b · f84300b
1 parent ea72af4
commit f84300b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -20,7 +20,7 @@ Metrics/BlockLength:
 # Offense count: 2
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 123
+  Max: 129
 
 # Offense count: 1
 # Configuration parameters: IgnoredMethods.

diff --git a/app/models/pull_request.rb b/app/models/pull_request.rb
@@ -176,8 +176,14 @@ def validate(saved_changes)
   # validate() might use update() to change attributes which would trigger a new job
   # To prevent loops, we filter `saved_changed` of those attributes and won't create new job if those are the only changed attributes
   def queue_validation
-    attributes = %w[eligible_for_merge_comment eligible_for_ci_comment]
-    return unless (saved_changes.stringify_keys.keys & attributes).empty?
+    case saved_changes.stringify_keys.keys.sort
+    when %w[eligible_for_merge_comment eligible_for_ci_comment].sort
+      return
+    when %w[eligible_for_ci_comment]
+      return
+    when %w[eligible_for_merge_comment]
+      return
+    end
 
     ValidatePullRequestWorker.perform_async(id, saved_changes)
   end