diff options
author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2019-02-12 13:48:07 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-12 13:48:07 -0500 |
commit | 3fb8ecc1353c76e5e80320c4886442b5ba525ea3 (patch) | |
tree | f05229a4eeb91b3e7e6d33d96cff942e55130140 /activerecord | |
parent | 0ee96d13de29680e148ccb8e5b68025f29fd091c (diff) | |
parent | 32bd378821f87045e12e515695ddaaa5b9ffda3e (diff) | |
download | rails-3fb8ecc1353c76e5e80320c4886442b5ba525ea3.tar.gz rails-3fb8ecc1353c76e5e80320c4886442b5ba525ea3.tar.bz2 rails-3fb8ecc1353c76e5e80320c4886442b5ba525ea3.zip |
Merge pull request #35237 from eileencodes/fix-teardown-in-db-selector-test
Fix DatabaseSelector test that fails sometimes
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/test/cases/database_selector_test.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/activerecord/test/cases/database_selector_test.rb b/activerecord/test/cases/database_selector_test.rb index 4106a6ec46..fd02d2acb4 100644 --- a/activerecord/test/cases/database_selector_test.rb +++ b/activerecord/test/cases/database_selector_test.rb @@ -11,6 +11,10 @@ module ActiveRecord @session = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session.new(@session_store) end + teardown do + ActiveRecord::Base.connection_handlers = { writing: ActiveRecord::Base.default_connection_handler } + end + def test_empty_session assert_equal Time.at(0), @session.last_write_timestamp end |