rubocop-minitest 0.23.0 → 0.23.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27c1c1e73140c8a3b7a03627a9e7a8772a91468924a78a55ef9d7eb1de01c41b
-  data.tar.gz: b04c7e1341cbe6792b360ef49fc495a0534dbbc817cc1c3643465018c5ef7776
+  metadata.gz: ee4acdf54fd339c943921f0bb7ba2e99cd652d2be3e14c8a1c835436e14aa605
+  data.tar.gz: d33499947d46061e36757f06fbd92666c45dc3efa7600124f0d2cdec62178c92
 SHA512:
-  metadata.gz: 60a86b10b510ca5da0d49d647ff5e20d8296e6fbb89214b3e2cb371eaf3096d4e866b3ebafeac446ae7ee6e0d2a139eadbcc77a4e23c144c10332acdef92f552
-  data.tar.gz: 31acd00dd4c8cbe95e50926694a1c844cb21c1ac6c9695d6a9fa120e9d936b16a7869f44552bcc413e737bf4983be67a2481935940fb5515422e5d14a2b4f0bf
+  metadata.gz: 63bf17a69865c62245a43499c72c721c66aa7c4bb8d2f18e9c187ab7d5c5d4b6c47b8511db19a77d7b697d13883f4af430ad435c3f3f31e9503678b843883b93
+  data.tar.gz: a22a130e89bf44ef0a6b457caf0877e001197bea8a8e34bd099525d880c97e05baf06b9dbe1b76e57ae114bc6ec3b0579b6ade84720238b9c54e4d6a160a9b7d

data/lib/rubocop/cop/minitest/empty_line_before_assertion_methods.rb

@@ -18,25 +18,40 @@ module RuboCop
       #
       class EmptyLineBeforeAssertionMethods < Base
         include MinitestExplorationHelpers
+        include RangeHelp
         extend AutoCorrector
 
         MSG = 'Add empty line before assertion.'
 
+        # rubocop:disable Metrics/CyclomaticComplexity
         def on_send(node)
-          return unless assertion_method?(node)
-          return unless (previous_line_node = node.left_sibling)
-          return if accept_previous_line?(previous_line_node, node)
+          return unless (assertion_method = assertion_method(node))
+          return unless (previous_line_node = assertion_method.left_sibling)
+          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)
-          return unless no_empty_line?(previous_line_node, node)
+          return if use_assertion_method_at_last_of_block?(previous_line_node)
+          return unless no_empty_line?(previous_line_node, assertion_method)
 
-          register_offense(node, previous_line_node)
+          register_offense(assertion_method, previous_line_node)
         end
+        # rubocop:enable Metrics/CyclomaticComplexity
 
         private
 
+        def assertion_method(node)
+          return node if assertion_method?(node)
+          return unless (parent = node.parent)
+          return unless parent.block_type?
+          return if parent.method?(:test)
+
+          node.parent if parent.body && assertion_method?(parent.body)
+        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
@@ -45,6 +60,16 @@ module RuboCop
           node.respond_to?(:arguments) && heredoc?(node.arguments.last)
         end
 
+        def use_assertion_method_at_last_of_block?(node)
+          return false if !node.block_type? || !node.body
+
+          if node.body.begin_type?
+            assertion_method?(node.body.children.last)
+          else
+            assertion_method?(node.body)
+          end
+        end
+
         def heredoc?(last_argument)
           last_argument.respond_to?(:heredoc?) && last_argument.heredoc?
         end
@@ -64,7 +89,7 @@ module RuboCop
             range = if heredoc?(previous_line_node)
                       previous_line_node.loc.heredoc_end
                     else
-                      previous_line_node
+                      range_by_whole_lines(previous_line_node.source_range, include_final_newline: true)
                     end
 
             corrector.insert_after(range, "\n")

data/lib/rubocop/minitest/version.rb

@@ -4,7 +4,7 @@ module RuboCop
   module Minitest
     # This module holds the RuboCop Minitest version information.
     module Version
-      STRING = '0.23.0'
+      STRING = '0.23.2'
 
       def self.document_version
         STRING.match('\d+\.\d+').to_s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-minitest
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.23.2
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-30 00:00:00.000000000 Z
+date: 2022-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop