diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-06-05 13:25:33 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-06-05 13:25:33 -0700 |
commit | e7f1556d0e75c635212273cc5e3cfd113456ff29 (patch) | |
tree | 39e81a1fa01bacb18eb2c396d845ebcd815055b9 /actionpack/test/controller | |
parent | 53bcbfbdc1eed45cc6615e59d36baf018ab43d96 (diff) | |
parent | df8154c845f8fb251c58f1fd882cc221cfdcbbc2 (diff) | |
download | rails-e7f1556d0e75c635212273cc5e3cfd113456ff29.tar.gz rails-e7f1556d0e75c635212273cc5e3cfd113456ff29.tar.bz2 rails-e7f1556d0e75c635212273cc5e3cfd113456ff29.zip |
Merge branch 'master' into erbout
Diffstat (limited to 'actionpack/test/controller')
-rw-r--r-- | actionpack/test/controller/rack_test.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/test/controller/rack_test.rb b/actionpack/test/controller/rack_test.rb index 026b0195d1..856f24bbdb 100644 --- a/actionpack/test/controller/rack_test.rb +++ b/actionpack/test/controller/rack_test.rb @@ -33,10 +33,10 @@ class BaseRackTest < Test::Unit::TestCase "REDIRECT_STATUS" => "200", "REQUEST_METHOD" => "GET" } + @request = ActionController::RackRequest.new(@env) # some Nokia phone browsers omit the space after the semicolon separator. # some developers have grown accustomed to using comma in cookie values. - @alt_cookie_fmt_request_hash = {"HTTP_COOKIE"=>"_session_id=c84ace847,96670c052c6ceb2451fb0f2;is_admin=yes"} - @request = ActionController::RackRequest.new(@env) + @alt_cookie_fmt_request = ActionController::RackRequest.new(@env.merge({"HTTP_COOKIE"=>"_session_id=c84ace847,96670c052c6ceb2451fb0f2;is_admin=yes"})) end def default_test; end @@ -100,11 +100,11 @@ class RackRequestTest < BaseRackTest end def test_cookie_syntax_resilience - cookies = CGI::Cookie::parse(@env["HTTP_COOKIE"]); + cookies = @request.cookies assert_equal ["c84ace84796670c052c6ceb2451fb0f2"], cookies["_session_id"], cookies.inspect assert_equal ["yes"], cookies["is_admin"], cookies.inspect - alt_cookies = CGI::Cookie::parse(@alt_cookie_fmt_request_hash["HTTP_COOKIE"]); + alt_cookies = @alt_cookie_fmt_request.cookies assert_equal ["c84ace847,96670c052c6ceb2451fb0f2"], alt_cookies["_session_id"], alt_cookies.inspect assert_equal ["yes"], alt_cookies["is_admin"], alt_cookies.inspect end |