From c211d904ba358d3d1ae85d56fa3a805ea505c23a Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Fri, 20 Aug 2010 18:55:02 -0700 Subject: Revert "Just add connection management middleware if running in a concurrent environment." This reverts commit 6b29dc876fe185881d46731c3ae170478a3828fe. --- railties/test/application/initializers/frameworks_test.rb | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'railties/test/application/initializers') diff --git a/railties/test/application/initializers/frameworks_test.rb b/railties/test/application/initializers/frameworks_test.rb index d8e916f45f..4ff10091b1 100644 --- a/railties/test/application/initializers/frameworks_test.rb +++ b/railties/test/application/initializers/frameworks_test.rb @@ -98,17 +98,7 @@ module ApplicationTests require "#{app_path}/config/environment" - expects = [ActiveRecord::QueryCache, ActiveRecord::SessionStore] - middleware = Rails.application.config.middleware.map { |m| m.klass } - assert_equal expects, middleware & expects - end - - test "database middleware initializes when allow concurrency is true" do - add_to_config "config.threadsafe!" - - require "#{app_path}/config/environment" - - expects = [ActiveRecord::ConnectionAdapters::ConnectionManagement, ActiveRecord::QueryCache] + expects = [ActiveRecord::ConnectionAdapters::ConnectionManagement, ActiveRecord::QueryCache, ActiveRecord::SessionStore] middleware = Rails.application.config.middleware.map { |m| m.klass } assert_equal expects, middleware & expects end -- cgit v1.2.3