diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-12-26 21:56:21 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-12-26 21:56:21 +0000 |
| commit | f4f8923cf0ef5bd31f9e98cecf4603d0c4bde296 (patch) | |
| tree | 2c5d9b59cefa59476ef48ea85aa0c2f00e1e33c1 /actionpack/test/controller/session/cookie_store_test.rb | |
| parent | 6dc12881110d26bb952bd0f565623144f10a07b6 (diff) | |
| parent | 5cebe69e74d411c3c9e5f6ab9d4b2b16ee36177c (diff) | |
| download | rails-f4f8923cf0ef5bd31f9e98cecf4603d0c4bde296.tar.gz rails-f4f8923cf0ef5bd31f9e98cecf4603d0c4bde296.tar.bz2 rails-f4f8923cf0ef5bd31f9e98cecf4603d0c4bde296.zip | |
Merge commit 'fred/pullable'
Diffstat (limited to 'actionpack/test/controller/session/cookie_store_test.rb')
| -rw-r--r-- | actionpack/test/controller/session/cookie_store_test.rb | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/actionpack/test/controller/session/cookie_store_test.rb b/actionpack/test/controller/session/cookie_store_test.rb index 69aec59dc0..d349c18d1d 100644 --- a/actionpack/test/controller/session/cookie_store_test.rb +++ b/actionpack/test/controller/session/cookie_store_test.rb @@ -25,7 +25,7 @@ class CookieStoreTest < ActionController::IntegrationTest def set_session_value session[:foo] = "bar" - render :text => Marshal.dump(session.to_hash) + render :text => Verifier.generate(session.to_hash) end def get_session_value @@ -94,8 +94,7 @@ class CookieStoreTest < ActionController::IntegrationTest with_test_route_set do get '/set_session_value' assert_response :success - session_payload = Verifier.generate(Marshal.load(response.body)) - assert_equal ["_myapp_session=#{session_payload}; path=/"], + assert_equal ["_myapp_session=#{response.body}; path=/"], headers['Set-Cookie'] end end @@ -148,8 +147,8 @@ class CookieStoreTest < ActionController::IntegrationTest with_test_route_set do get '/set_session_value' assert_response :success - session_payload = Verifier.generate(Marshal.load(response.body)) - assert_equal ["_myapp_session=#{session_payload}; path=/"], + session_payload = response.body + assert_equal ["_myapp_session=#{response.body}; path=/"], headers['Set-Cookie'] get '/call_reset_session' |