aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2013-07-28 01:44:54 -0700
committerGuillermo Iguaran <guilleiguaran@gmail.com>2013-07-28 01:44:54 -0700
commitb6c0639825a2ed723a00c32acec87bfeffc1b9ed (patch)
treed98d138e65517476f7df5e4d1135a011c34eabee
parent6b7424c23015a93d981b054c525850b71e98f322 (diff)
parent09beb9c292da55158b9f966bf3ae0a583e2bfe7b (diff)
downloadrails-b6c0639825a2ed723a00c32acec87bfeffc1b9ed.tar.gz
rails-b6c0639825a2ed723a00c32acec87bfeffc1b9ed.tar.bz2
rails-b6c0639825a2ed723a00c32acec87bfeffc1b9ed.zip
Merge pull request #11633 from neerajdotname/fix_rder_dependent_test
fix order dependent test
-rw-r--r--activerecord/test/cases/transactions_test.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/activerecord/test/cases/transactions_test.rb b/activerecord/test/cases/transactions_test.rb
index 9c5f2e4724..f84088def3 100644
--- a/activerecord/test/cases/transactions_test.rb
+++ b/activerecord/test/cases/transactions_test.rb
@@ -453,6 +453,11 @@ class TransactionTest < ActiveRecord::TestCase
raise ActiveRecord::Rollback
end
end
+
+ ensure
+ Topic.reset_column_information # reset the column information to get correct reading
+ Topic.connection.remove_column('topics', 'stuff') if Topic.column_names.include?('stuff')
+ Topic.reset_column_information # reset the column information again for other tests
end
def test_transactions_state_from_rollback