diff options
| author | Yehuda Katz <wycats@gmail.com> | 2009-02-02 09:54:23 -0800 |
|---|---|---|
| committer | Yehuda Katz <wycats@gmail.com> | 2009-02-02 09:54:23 -0800 |
| commit | 44cdf0c5fe080d470429ab0640af25e927244907 (patch) | |
| tree | 0dcaa131da49eaeb0e056d0b4cc03673bf5af4c2 /actionpack/test/controller | |
| parent | 3030bc90c95e335d726f06fd7a61ed96055e9109 (diff) | |
| download | rails-44cdf0c5fe080d470429ab0640af25e927244907.tar.gz rails-44cdf0c5fe080d470429ab0640af25e927244907.tar.bz2 rails-44cdf0c5fe080d470429ab0640af25e927244907.zip | |
Some merge cleanup
Diffstat (limited to 'actionpack/test/controller')
| -rw-r--r-- | actionpack/test/controller/session/cookie_store_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/controller/session/cookie_store_test.rb b/actionpack/test/controller/session/cookie_store_test.rb index 3a1a9854c3..b48a8c3830 100644 --- a/actionpack/test/controller/session/cookie_store_test.rb +++ b/actionpack/test/controller/session/cookie_store_test.rb @@ -177,7 +177,7 @@ class CookieStoreTest < ActionController::IntegrationTest end def test_session_store_with_expire_after - app = ActionController::Session::CookieStore.new(DispatcherApp, :key => SessionKey, :secret => SessionSecret, :expire_after => 5.hours) + app = ActionDispatch::Session::CookieStore.new(DispatcherApp, :key => SessionKey, :secret => SessionSecret, :expire_after => 5.hours) @integration_session = open_session(app) with_test_route_set do |