Merge pull request #1554 from ydah/fix-false-positive-rspec-PredicateMatcher

Fix a false positive for `RSpec/PredicateMatcher` when multiple arguments and not replaceable method

Author: bquorning

CHANGELOG.md

@@ -6,6 +6,7 @@
 - Fix a false positive for `RSpec/NoExpectationExample` when using skipped in metadata is multiline string. ([@ydah])
 - Fix a false positive for `RSpec/ContextMethod` when multi-line context with `#` at the beginning. ([@ydah])
 - Fix an incorrect autocorrect for `RSpec/PredicateMatcher` when multiline expect and predicate method with heredoc. ([@ydah])
+- Fix a false positive for `RSpec/PredicateMatcher` when `include` with multiple argument. ([@ydah])
 
 ## 2.17.0 (2023-01-13)
 

lib/rubocop/cop/rspec/predicate_matcher.rb

@@ -149,6 +149,8 @@ def check_explicit(node) # rubocop:disable Metrics/MethodLength
           return if part_of_ignored_node?(node)
 
           predicate_matcher?(node) do |actual, matcher|
+            next unless replaceable_matcher?(matcher)
+
             add_offense(node, message: message_explicit(matcher)) do |corrector|
               next if uncorrectable_matcher?(node, matcher)
 
@@ -157,6 +159,15 @@ def check_explicit(node) # rubocop:disable Metrics/MethodLength
           end
         end
 
+        def replaceable_matcher?(matcher)
+          case matcher.method_name.to_s
+          when 'include'
+            matcher.arguments.one?
+          else
+            true
+          end
+        end
+
         def uncorrectable_matcher?(node, matcher)
           heredoc_argument?(matcher) && !same_line?(node, matcher)
         end

spec/rubocop/cop/rspec/predicate_matcher_spec.rb

@@ -95,14 +95,14 @@
 
       it 'registers an offense for a predicate method with heredoc' do
         expect_offense(<<~RUBY)
-          expect(foo.include?(<<~TEXT)).to be_truthy
-          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Prefer using `include` matcher over `include?`.
+          expect(foo.something?(<<~TEXT)).to be_truthy
+          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Prefer using `be_something` matcher over `something?`.
             bar
           TEXT
         RUBY
 
         expect_correction(<<~RUBY)
-          expect(foo).to include(<<~TEXT)
+          expect(foo).to be_something(<<~TEXT)
             bar
           TEXT
         RUBY
@@ -346,14 +346,14 @@
          'heredoc and multiline expect' do
         expect_offense(<<~RUBY)
           expect(foo)
-          ^^^^^^^^^^^ Prefer using `include?` over `include` matcher.
-            .to include(<<~TEXT)
+          ^^^^^^^^^^^ Prefer using `something?` over `be_something` matcher.
+            .to be_something(<<~TEXT)
               bar
             TEXT
 
           expect(foo)
-          ^^^^^^^^^^^ Prefer using `include?` over `include` matcher.
-            .to include(bar, <<~TEXT, 'baz')
+          ^^^^^^^^^^^ Prefer using `something?` over `be_something` matcher.
+            .to be_something(bar, <<~TEXT, 'baz')
               bar
             TEXT
         RUBY
@@ -365,14 +365,14 @@
          'heredoc include #{} and multiline expect' do
         expect_offense(<<~'RUBY')
           expect(foo)
-          ^^^^^^^^^^^ Prefer using `include?` over `include` matcher.
-            .to include(<<~TEXT)
+          ^^^^^^^^^^^ Prefer using `something?` over `be_something` matcher.
+            .to be_something(<<~TEXT)
               #{bar}
             TEXT
 
           expect(foo)
-          ^^^^^^^^^^^ Prefer using `include?` over `include` matcher.
-            .to include(bar, <<~TEXT, 'baz')
+          ^^^^^^^^^^^ Prefer using `something?` over `be_something` matcher.
+            .to be_something(bar, <<~TEXT, 'baz')
               #{bar}
             TEXT
         RUBY
@@ -384,21 +384,35 @@
          'heredoc surrounded by back ticks and multiline expect' do
         expect_offense(<<~'RUBY')
           expect(foo)
-          ^^^^^^^^^^^ Prefer using `include?` over `include` matcher.
-            .to include(<<~`COMMAND`)
+          ^^^^^^^^^^^ Prefer using `something?` over `be_something` matcher.
+            .to be_something(<<~`COMMAND`)
               pwd
             COMMAND
 
           expect(foo)
-          ^^^^^^^^^^^ Prefer using `include?` over `include` matcher.
-            .to include(bar, <<~COMMAND, 'baz')
+          ^^^^^^^^^^^ Prefer using `something?` over `be_something` matcher.
+            .to be_something(bar, <<~COMMAND, 'baz')
               pwd
             COMMAND
         RUBY
 
         expect_no_corrections
       end
 
+      it 'does not register an offense for a `include` ' \
+         'with no argument' do
+        expect_no_offenses(<<~RUBY)
+          expect(foo).to include
+        RUBY
+      end
+
+      it 'does not register an offense for a `include` ' \
+         'with multiple arguments' do
+        expect_no_offenses(<<~RUBY)
+          expect(foo).to include(foo, bar)
+        RUBY
+      end
+
       it 'registers an offense for a predicate method with a block' do
         expect_offense(<<~RUBY)
           expect(foo).to be_all { |x| x.present? }