Merge pull request #1453 from Earlopain/transaction-exit-numblock

Make `Rails/TransactionExitStatement` aware of numblocks

changelog/fix_transaction_exit_numblocks.md

@@ -0,0 +1 @@
+* [#1453](https://github.com/rubocop/rubocop-rails/pull/1453): Make `Rails/TransactionExitStatement` aware of numblocks. ([@earlopain][])

lib/rubocop/cop/rails/transaction_exit_statement.rb

@@ -99,7 +99,7 @@ def in_transaction_block?(node)
           return false unless transaction_method_name?(node.method_name)
           return false unless (parent = node.parent)
 
-          parent.block_type? && parent.body
+          parent.any_block_type? && parent.body
         end
 
         def statement(statement_node)
@@ -113,7 +113,7 @@ def statement(statement_node)
         end
 
         def nested_block?(statement_node)
-          name = statement_node.ancestors.find(&:block_type?).children.first.method_name
+          name = statement_node.ancestors.find(&:any_block_type?).children.first.method_name
           !transaction_method_name?(name)
         end
 

spec/rubocop/cop/rails/transaction_exit_statement_spec.rb

@@ -11,6 +11,16 @@
       RUBY
     end
 
+    it 'registers an offense when `return` is used in transaction with numblock' do
+      expect_offense(<<~RUBY, method: method)
+        ApplicationRecord.%{method} do
+          _1.after_commit { }
+          return if user.active?
+          ^^^^^^ Exit statement `return` is not allowed. Use `raise` (rollback) or `next` (commit).
+        end
+      RUBY
+    end
+
     it 'registers an offense when `break` is used in transactions' do
       expect_offense(<<~RUBY, method: method)
         ApplicationRecord.%{method} do
@@ -56,6 +66,17 @@
       RUBY
     end
 
+    it 'registers an offense when `return` is used in `each` with numblock in transactions' do
+      expect_offense(<<~RUBY, method: method)
+        ApplicationRecord.%{method} do
+          foo.each do
+            return if _1
+            ^^^^^^ Exit statement `return` is not allowed. Use `raise` (rollback) or `next` (commit).
+          end
+        end
+      RUBY
+    end
+
     it 'registers an offense when `throw` is used in `loop` in transactions' do
       expect_offense(<<~RUBY, method: method)
         ApplicationRecord.%{method} do
@@ -77,6 +98,16 @@
       RUBY
     end
 
+    it 'does not register an offense when `break` is used in `each` with numblock in transactions' do
+      expect_no_offenses(<<~RUBY)
+        ApplicationRecord.#{method} do
+          foo.each do
+            break if _1
+          end
+        end
+      RUBY
+    end
+
     it 'registers an offense when `return` is used in `rescue`' do
       expect_offense(<<~RUBY, method: method)
         ApplicationRecord.%{method} do