Merge pull request rails#52005 from Shopify/transaction-blank

Fix `ActiveRecord::Transaction#blank?`
djmb · Jun 3, 2024 · 0f3dbe2 · 0f3dbe2
2 parents 9cafa55 + 5705309
commit 0f3dbe2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/activerecord/lib/active_record/transaction.rb b/activerecord/lib/active_record/transaction.rb
@@ -111,12 +111,12 @@ def after_rollback(&block)
  def open?
  true
  end
- alias_method :blank?, :open?
 
  # Returns true if no transaction is currently active.
  def closed?
  false
  end
+ alias_method :blank?, :closed?
 
  # Returns a UUID for this transaction.
  def uuid

diff --git a/activerecord/test/cases/transactions_test.rb b/activerecord/test/cases/transactions_test.rb
@@ -19,7 +19,14 @@ def setup
  @first, @second = Topic.find(1, 2).sort_by(&:id)
  end
 
- def test_after_all_transactions_committ
+ def test_blank?
+ assert_predicate Topic.current_transaction, :blank?
+ Topic.transaction do
+ assert_not_predicate Topic.current_transaction, :blank?
+ end
+ end
+
+ def test_after_all_transactions_commit
  called = 0
  ActiveRecord.after_all_transactions_commit { called += 1 }
  assert_equal 1, called