diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-04-20 18:31:22 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-04-20 18:31:40 -0700 |
commit | 685a53a360d0d8fc4a9f3b49f900621c940a71f2 (patch) | |
tree | fa6b38f75a873a21c3e380f1acbab3d019293363 /railties/test/initializer_test.rb | |
parent | db05c73fb6e2294c576ef9889c70940891682c32 (diff) | |
parent | 164a94d0bc8c9124ab820506e5ad79496395c026 (diff) | |
download | rails-685a53a360d0d8fc4a9f3b49f900621c940a71f2.tar.gz rails-685a53a360d0d8fc4a9f3b49f900621c940a71f2.tar.bz2 rails-685a53a360d0d8fc4a9f3b49f900621c940a71f2.zip |
Merge branch 'master' into cherry
Conflicts:
activesupport/CHANGELOG
activesupport/lib/active_support/core_ext/class/delegating_attributes.rb
activesupport/lib/active_support/core_ext/hash/conversions.rb
activesupport/lib/active_support/core_ext/module/attribute_accessors.rb
activesupport/lib/active_support/core_ext/string/multibyte.rb
activesupport/lib/active_support/core_ext/time/calculations.rb
activesupport/lib/active_support/deprecation.rb
Diffstat (limited to 'railties/test/initializer_test.rb')
-rw-r--r-- | railties/test/initializer_test.rb | 8 |
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 |