Skip to content

Commit 0f3dbe2

Browse files
authored
Merge pull request rails#52005 from Shopify/transaction-blank
Fix `ActiveRecord::Transaction#blank?`
2 parents 9cafa55 + 5705309 commit 0f3dbe2

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

activerecord/lib/active_record/transaction.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,12 @@ def after_rollback(&block)
111111
def open?
112112
true
113113
end
114-
alias_method :blank?, :open?
115114

116115
# Returns true if no transaction is currently active.
117116
def closed?
118117
false
119118
end
119+
alias_method :blank?, :closed?
120120

121121
# Returns a UUID for this transaction.
122122
def uuid

activerecord/test/cases/transactions_test.rb

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,14 @@ def setup
1919
@first, @second = Topic.find(1, 2).sort_by(&:id)
2020
end
2121

22-
def test_after_all_transactions_committ
22+
def test_blank?
23+
assert_predicate Topic.current_transaction, :blank?
24+
Topic.transaction do
25+
assert_not_predicate Topic.current_transaction, :blank?
26+
end
27+
end
28+
29+
def test_after_all_transactions_commit
2330
called = 0
2431
ActiveRecord.after_all_transactions_commit { called += 1 }
2532
assert_equal 1, called

0 commit comments

Comments
 (0)