aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/transactions_test.rb
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord/test/transactions_test.rb')
-rw-r--r--activerecord/test/transactions_test.rb11
1 files changed, 9 insertions, 2 deletions
diff --git a/activerecord/test/transactions_test.rb b/activerecord/test/transactions_test.rb
index cf10b7d3ee..ea3b6ec5c5 100644
--- a/activerecord/test/transactions_test.rb
+++ b/activerecord/test/transactions_test.rb
@@ -3,9 +3,14 @@ require 'fixtures/topic'
class TransactionTest < Test::Unit::TestCase
+ self.use_transactional_fixtures = false
+
+ fixtures :topics
+
def setup
- @topics = create_fixtures "topics"
- @first, @second = Topic.find(1, 2)
+ # sqlite does not seem to return these in the right order, so we sort them
+ # explicitly for sqlite's sake. sqlite3 does fine.
+ @first, @second = Topic.find(1, 2).sort_by { |t| t.id }
end
def test_successful
@@ -53,6 +58,8 @@ class TransactionTest < Test::Unit::TestCase
end
def test_failing_with_object_rollback
+ assert !@first.approved?, "First should be unapproved initially"
+
begin
Topic.transaction(@first, @second) do
@first.approved = true