Merge pull request #816 from ydah/fix/presence

Fix an incorrect autocorrect for `Rails/Presence` when a right-hand side of the relational operator

changelog/fix_fix_an_incorrect_autocorrect_for_rails_presence.md

@@ -0,0 +1 @@
+* [#816](https://github.com/rubocop/rubocop-rails/pull/816): Fix an incorrect autocorrect for `Rails/Presence` when a right-hand side of the relational operator. ([@ydah][])

lib/rubocop/cop/rails/presence.rb

@@ -93,7 +93,7 @@ def on_if(node)
 
         def register_offense(node, receiver, other)
           add_offense(node, message: message(node, receiver, other)) do |corrector|
-            corrector.replace(node.source_range, replacement(receiver, other))
+            corrector.replace(node.source_range, replacement(receiver, other, node.left_sibling))
           end
         end
 
@@ -106,7 +106,7 @@ def ignore_other_node?(node)
         end
 
         def message(node, receiver, other)
-          prefer = replacement(receiver, other).gsub(/^\s*|\n/, '')
+          prefer = replacement(receiver, other, node.left_sibling).gsub(/^\s*|\n/, '')
           current = current(node).gsub(/^\s*|\n/, '')
           format(MSG, prefer: prefer, current: current)
         end
@@ -119,7 +119,7 @@ def current(node)
           end
         end
 
-        def replacement(receiver, other)
+        def replacement(receiver, other, left_sibling)
           or_source = if other&.send_type?
                         build_source_for_or_method(other)
                       elsif other.nil? || other.nil_type?
@@ -128,7 +128,8 @@ def replacement(receiver, other)
                         " || #{other.source}"
                       end
 
-          "#{receiver.source}.presence" + or_source
+          replaced = "#{receiver.source}.presence#{or_source}"
+          left_sibling ? "(#{replaced})" : replaced
         end
 
         def build_source_for_or_method(other)

spec/rubocop/cop/rails/presence_spec.rb

@@ -301,6 +301,25 @@
     end
   end
 
+  context 'when a right-hand side of the relational operator' do
+    %w[< > <= >= == !=].each do |operator|
+      it "registers an offense and corrects when `#{operator}`" do
+        expect_offense(<<~RUBY, operator: operator)
+          a #{operator} if b.present?
+            _{operator} ^^^^^^^^^^^^^ Use `(b.presence || c)` instead of `if b.present? ... end`.
+            b
+          else
+            c
+          end
+        RUBY
+
+        expect_correction(<<~RUBY)
+          a #{operator} (b.presence || c)
+        RUBY
+      end
+    end
+  end
+
   it 'does not register an offense when using `#presence`' do
     expect_no_offenses(<<~RUBY)
       a.presence