Merge pull request rubocop#788 from koic/fix_a_false_negative_for_rails_action_controller_test_case

[Fix rubocop#786] Fix a false negative for `Rails/ActionControllerTestCase`

Author: koic

changelog/fix_a_false_negative_for_rails_action_controller_test_case.md

@@ -0,0 +1 @@
+* [#786](https://github.com/rubocop/rubocop-rails/issues/786): Fix a false negative for `Rails/ActionControllerTestCase` when extending `ActionController::TestCase` and having a method definition. ([@koic][])

lib/rubocop/cop/rails/action_controller_test_case.rb

@@ -31,7 +31,7 @@ class ActionControllerTestCase < Base
         def_node_matcher :action_controller_test_case?, <<~PATTERN
           (class
             (const nil? _)
-            (const (const {nil? cbase} :ActionController) :TestCase) nil?)
+            (const (const {nil? cbase} :ActionController) :TestCase) _)
         PATTERN
 
         def on_class(node)

spec/rubocop/cop/rails/action_controller_test_case_spec.rb

@@ -36,6 +36,23 @@ class MyControllerTest < ActionDispatch::IntegrationTest
     RUBY
   end
 
+  it 'adds offense when extending `ActionController::TestCase` and having a method definition' do
+    expect_offense(<<~RUBY)
+      class MyControllerTest < ActionController::TestCase
+                               ^^^^^^^^^^^^^^^^^^^^^^^^^^ Use `ActionDispatch::IntegrationTest` instead.
+        def test_foo
+        end
+      end
+    RUBY
+
+    expect_correction(<<~RUBY)
+      class MyControllerTest < ActionDispatch::IntegrationTest
+        def test_foo
+        end
+      end
+    RUBY
+  end
+
   it 'does not add offense when extending `ActionDispatch::IntegrationTest`' do
     expect_no_offenses(<<~RUBY)
       class MyControllerTest < ActionDispatch::IntegrationTest