diff options
author | Guo Xiang Tan <tgx_world@hotmail.com> | 2014-03-13 21:35:58 -0700 |
---|---|---|
committer | Guo Xiang Tan <tgx_world@hotmail.com> | 2014-03-14 20:48:59 -0700 |
commit | 3baace687cfbf4c98367fda31e0a4b0f85ce813f (patch) | |
tree | ff8454c43247efefa83b2defb6e8ebc4e0872b96 /activerecord/test/cases/adapters/mysql | |
parent | 3560d7aad7c9bffc903ec1378c1c1d7c738f5b86 (diff) | |
download | rails-3baace687cfbf4c98367fda31e0a4b0f85ce813f.tar.gz rails-3baace687cfbf4c98367fda31e0a4b0f85ce813f.tar.bz2 rails-3baace687cfbf4c98367fda31e0a4b0f85ce813f.zip |
Use teardown helper method.
Follow-Up to https://github.com/rails/rails/pull/14348
Ensure that SQLCounter.clear_log is called after each test.
This is a step to prevent side effects when running tests. This will allow us to run them in random order.
Diffstat (limited to 'activerecord/test/cases/adapters/mysql')
-rw-r--r-- | activerecord/test/cases/adapters/mysql/active_schema_test.rb | 2 | ||||
-rw-r--r-- | activerecord/test/cases/adapters/mysql/reserved_word_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/adapters/mysql/active_schema_test.rb b/activerecord/test/cases/adapters/mysql/active_schema_test.rb index 0878925a6c..e77138eb1d 100644 --- a/activerecord/test/cases/adapters/mysql/active_schema_test.rb +++ b/activerecord/test/cases/adapters/mysql/active_schema_test.rb @@ -11,7 +11,7 @@ class ActiveSchemaTest < ActiveRecord::TestCase end end - def teardown + teardown do ActiveRecord::Base.remove_connection ActiveRecord::Base.establish_connection(@connection) end diff --git a/activerecord/test/cases/adapters/mysql/reserved_word_test.rb b/activerecord/test/cases/adapters/mysql/reserved_word_test.rb index 8eb9565963..61ae0abfd1 100644 --- a/activerecord/test/cases/adapters/mysql/reserved_word_test.rb +++ b/activerecord/test/cases/adapters/mysql/reserved_word_test.rb @@ -37,7 +37,7 @@ class MysqlReservedWordTest < ActiveRecord::TestCase 'distinct_select'=>'distinct_id int, select_id int' end - def teardown + teardown do drop_tables_directly ['group', 'select', 'values', 'distinct', 'distinct_select', 'order'] end |