diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-12-01 17:36:03 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2011-12-01 23:41:51 +0000 |
| commit | 47b97a739d5588cfa439a4805fb1ddd3b7a7acbe (patch) | |
| tree | 8db3240de2080eb6408c5abf528b6b9886b8ac2e | |
| parent | 3a40d386194cf6d572b145cea0da57c286204554 (diff) | |
| download | rails-47b97a739d5588cfa439a4805fb1ddd3b7a7acbe.tar.gz rails-47b97a739d5588cfa439a4805fb1ddd3b7a7acbe.tar.bz2 rails-47b97a739d5588cfa439a4805fb1ddd3b7a7acbe.zip | |
Fix up test altering global state that was causing me grief
| -rw-r--r-- | activerecord/test/cases/locking_test.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/activerecord/test/cases/locking_test.rb b/activerecord/test/cases/locking_test.rb index 3d6db91f81..be7edb858f 100644 --- a/activerecord/test/cases/locking_test.rb +++ b/activerecord/test/cases/locking_test.rb @@ -320,6 +320,8 @@ class OptimisticLockingWithSchemaChangeTest < ActiveRecord::TestCase assert_equal true, p1.frozen? assert_raises(ActiveRecord::RecordNotFound) { Person.find(p1.id) } assert_raises(ActiveRecord::RecordNotFound) { LegacyThing.find(t.id) } + ensure + remove_counter_column_from(Person, 'legacy_things_count') end private @@ -331,8 +333,8 @@ class OptimisticLockingWithSchemaChangeTest < ActiveRecord::TestCase model.update_all(col => 0) if current_adapter?(:OpenBaseAdapter) end - def remove_counter_column_from(model) - model.connection.remove_column model.table_name, :test_count + def remove_counter_column_from(model, col = :test_count) + model.connection.remove_column model.table_name, col model.reset_column_information end |