diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-03-28 17:47:46 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-03-28 17:47:46 -0700 |
commit | aea1477362b640ebe52cf991b915ad32e7bf2571 (patch) | |
tree | ae4005c56fba372099f51b2e1e7bd55bf541c44a /activerecord/test | |
parent | 25f94971abf71fe51089f53b72cc08b636c230b3 (diff) | |
download | rails-aea1477362b640ebe52cf991b915ad32e7bf2571.tar.gz rails-aea1477362b640ebe52cf991b915ad32e7bf2571.tar.bz2 rails-aea1477362b640ebe52cf991b915ad32e7bf2571.zip |
make sure we have an active database connection before running each connection management test
Diffstat (limited to 'activerecord/test')
-rw-r--r-- | activerecord/test/cases/connection_management_test.rb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/activerecord/test/cases/connection_management_test.rb b/activerecord/test/cases/connection_management_test.rb index 82ea46b41f..1313e28bb1 100644 --- a/activerecord/test/cases/connection_management_test.rb +++ b/activerecord/test/cases/connection_management_test.rb @@ -20,8 +20,9 @@ module ActiveRecord @app = App.new @management = ConnectionManagement.new(@app) - @connections_cleared = false - ActiveRecord::Base.stubs(:clear_active_connections!).with { @connections_cleared = true } + # make sure we have an active connection + assert ActiveRecord::Base.connection + assert ActiveRecord::Base.connection_handler.active_connections? end def test_app_delegation @@ -33,13 +34,13 @@ module ActiveRecord test "clears active connections after each call" do @management.call(@env) - assert @connections_cleared + assert !ActiveRecord::Base.connection_handler.active_connections? end test "doesn't clear active connections when running in a test case" do @env['rack.test'] = true @management.call(@env) - assert !@connections_cleared + assert ActiveRecord::Base.connection_handler.active_connections? end end end |