aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/cases/connection_management_test.rb9
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