Merge pull request #1856 from rubocop/expect-actual-autocorrect-with-…

…hash

Fix autocorrect error for RSpec/ExpectActual

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Master (Unreleased)
 
+- Fix an autocorrect error for `RSpec/ExpectActual`. ([@bquorning])
+
 ## 2.28.0 (2024-03-30)
 
 - Extract RSpec Rails cops to a separate repository, [`rubocop-rspec_rails`](/~https://github.com/rubocop/rubocop-rspec_rails). The `rubocop-rspec_rails` repository is a dependency of `rubocop-rspec` and the cops related to rspec-rails are aliased (`RSpec/Rails/Foo` == `RSpecRails/Foo`) until v3.0 is released, so the change will be invisible to users until then. ([@ydah])

lib/rubocop/cop/rspec/expect_actual.rb

@@ -58,22 +58,27 @@ class ExpectActual < Base
           (send
             (send nil? :expect $#literal?)
             #Runners.all
-            {
+            ${
               (send (send nil? $:be) :== $_)
               (send nil? $_ $_ ...)
             }
           )
         PATTERN
 
-        def on_send(node)
-          expect_literal(node) do |actual, matcher, expected|
+        def on_send(node) # rubocop:disable Metrics/MethodLength
+          expect_literal(node) do |actual, send_node, matcher, expected|
             next if SKIPPED_MATCHERS.include?(matcher)
 
             add_offense(actual.source_range) do |corrector|
               next unless CORRECTABLE_MATCHERS.include?(matcher)
               next if literal?(expected)
 
-              swap(corrector, actual, expected)
+              corrector.replace(actual, expected.source)
+              if matcher == :be
+                corrector.replace(expected, actual.source)
+              else
+                corrector.replace(send_node, "#{matcher}(#{actual.source})")
+              end
             end
           end
         end
@@ -94,11 +99,6 @@ def complex_literal?(node)
           COMPLEX_LITERALS.include?(node.type) &&
             node.each_child_node.all?(&method(:literal?))
         end
-
-        def swap(corrector, actual, expected)
-          corrector.replace(actual, expected.source)
-          corrector.replace(expected, actual.source)
-        end
       end
     end
   end

spec/rubocop/cop/rspec/expect_actual_spec.rb

@@ -148,6 +148,28 @@
     RUBY
   end
 
+  it 'autocorrects literal hash when expected is without parentheses' do
+    expect_offense(<<~RUBY)
+      describe Foo do
+        it 'uses expect incorrectly' do
+          expect(foo: 1, bar: 2).to eq bar
+                 ^^^^^^^^^^^^^^ Provide the actual value you are testing to `expect(...)`.
+          expect({ foo: 1, bar: 2 }).to eq bar
+                 ^^^^^^^^^^^^^^^^^^ Provide the actual value you are testing to `expect(...)`.
+        end
+      end
+    RUBY
+
+    expect_correction(<<~RUBY)
+      describe Foo do
+        it 'uses expect incorrectly' do
+          expect(bar).to eq(foo: 1, bar: 2)
+          expect(bar).to eq({ foo: 1, bar: 2 })
+        end
+      end
+    RUBY
+  end
+
   it 'flags ranges containing only literal values within expect(...)' do
     expect_offense(<<~RUBY)
       describe Foo do