Merge pull request #193 from koic/fix_a_false_positive_for_minitest_e…

…mpty_line_before_assertion_methods

Fix a false positive for `Minitest/EmptyLineBeforeAssertionMethods`

changelog/fix_a_false_positive_for_minitest_empty_line_before_assertion_methods.md

@@ -0,0 +1 @@
+* [#189](https://github.com/rubocop/rubocop-minitest/issues/189): Fix a false positive for `Minitest/EmptyLineBeforeAssertionMethods` when using `rescue` before assertion method. ([@koic][])

lib/rubocop/cop/minitest/empty_line_before_assertion_methods.rb

@@ -25,7 +25,7 @@ class EmptyLineBeforeAssertionMethods < Base
         def on_send(node)
           return unless (assertion_method = assertion_method(node))
           return unless (previous_line_node = assertion_method.left_sibling)
-          return unless previous_line_node.is_a?(RuboCop::AST::Node)
+          return if node.parent.resbody_type?
           return if accept_previous_line?(previous_line_node, assertion_method)
 
           previous_line_node = previous_line_node.arguments.last if use_heredoc_argument?(previous_line_node)
@@ -45,7 +45,8 @@ def assertion_method(node)
         end
 
         def accept_previous_line?(previous_line_node, node)
-          return true if previous_line_node.args_type? || node.parent.basic_conditional?
+          return true if !previous_line_node.is_a?(RuboCop::AST::Node) ||
+                         previous_line_node.args_type? || node.parent.basic_conditional?
 
           previous_line_node.send_type? && assertion_method?(previous_line_node)
         end

test/rubocop/cop/minitest/empty_line_before_assertion_methods_test.rb

@@ -149,6 +149,32 @@ def test_do_something
     RUBY
   end
 
+  def test_registers_offense_when_using_statement_before_assertion_method_used_in_rescue
+    assert_offense(<<~'RUBY')
+      def test_do_something
+        yaml_load_paths.each do |path|
+          YAML.load_file(path)
+        rescue Psych::Exception => e
+          do_something
+          flunk("Error loading #{path}: #{e.inspect}")
+          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Add empty line before assertion.
+        end
+      end
+    RUBY
+
+    assert_correction(<<~'RUBY')
+      def test_do_something
+        yaml_load_paths.each do |path|
+          YAML.load_file(path)
+        rescue Psych::Exception => e
+          do_something
+
+          flunk("Error loading #{path}: #{e.inspect}")
+        end
+      end
+    RUBY
+  end
+
   def test_does_not_register_offense_when_using_empty_line_before_assertion_methods
     assert_no_offenses(<<~RUBY)
       def test_do_something
@@ -238,6 +264,18 @@ def test_do_something
     RUBY
   end
 
+  def test_does_not_register_offense_when_using_rescue_before_assertion_method
+    assert_no_offenses(<<~'RUBY')
+      def test_do_something
+        yaml_load_paths.each do |path|
+          YAML.load_file(path)
+        rescue Psych::Exception => e
+          flunk("Error loading #{path}: #{e.inspect}")
+        end
+      end
+    RUBY
+  end
+
   def test_does_not_register_offense_when_using_only_non_assertion_method
     assert_no_offenses(<<~RUBY)
       do_something(thing)