aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/initializer_test.rb
diff options
context:
space:
mode:
Diffstat (limited to 'railties/test/initializer_test.rb')
-rw-r--r--railties/test/initializer_test.rb8
1 files changed, 1 insertions, 7 deletions
diff --git a/railties/test/initializer_test.rb b/railties/test/initializer_test.rb
index 561f7b8b54..d77a045e56 100644
--- a/railties/test/initializer_test.rb
+++ b/railties/test/initializer_test.rb
@@ -351,7 +351,7 @@ class InitializerDatabaseMiddlewareTest < Test::Unit::TestCase
def test_database_middleware_doesnt_initialize_when_session_store_is_not_active_record
store = ActionController::Base.session_store
- ActionController::Base.session_store = ActionController::Session::CookieStore
+ ActionController::Base.session_store = ActionDispatch::Session::CookieStore
# Define the class, so we don't have to actually make it load
eval("class ActiveRecord::ConnectionAdapters::ConnectionManagement; end")
@@ -380,12 +380,6 @@ class InitializerViewPathsTest < Test::Unit::TestCase
ActionMailer::Base.view_paths.expects(:load!).never
Rails::Initializer.run(:load_view_paths, @config)
end
-
- def test_load_view_paths_loads_view_paths
- ActionController::Base.view_paths.expects(:load!)
- ActionMailer::Base.view_paths.expects(:load!)
- Rails::Initializer.run(:load_view_paths, @config)
- end
end
class RailsRootTest < Test::Unit::TestCase