diff options
Diffstat (limited to 'railties/test')
| -rw-r--r-- | railties/test/initializer_test.rb | 8 | ||||
| -rw-r--r-- | railties/test/rails_info_controller_test.rb | 2 |
2 files changed, 2 insertions, 8 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 diff --git a/railties/test/rails_info_controller_test.rb b/railties/test/rails_info_controller_test.rb index 607ece99a9..ab31f3a487 100644 --- a/railties/test/rails_info_controller_test.rb +++ b/railties/test/rails_info_controller_test.rb @@ -1,6 +1,6 @@ require 'abstract_unit' require 'action_controller' -require 'action_controller/test_process' +require 'action_controller/testing/process' require 'rails/info' require 'rails/info_controller' |