diff options
author | Jon Leighton <j@jonathanleighton.com> | 2011-03-07 20:58:54 +0000 |
---|---|---|
committer | Jon Leighton <j@jonathanleighton.com> | 2011-03-07 20:58:54 +0000 |
commit | 67b17d029a8eeddd908cce2d4e0e27e4708e8463 (patch) | |
tree | 4cd589411104f7222835dd5012f4bb7743e1d215 /actionpack/test/dispatch/test_request_test.rb | |
parent | bb063b2f1b3e5b6fb2a4732cb696929f1652c555 (diff) | |
parent | 5968d7a65886d3450698889f685eccaf54749f43 (diff) | |
download | rails-67b17d029a8eeddd908cce2d4e0e27e4708e8463.tar.gz rails-67b17d029a8eeddd908cce2d4e0e27e4708e8463.tar.bz2 rails-67b17d029a8eeddd908cce2d4e0e27e4708e8463.zip |
Merge branch 'master' into nested_has_many_through
Diffstat (limited to 'actionpack/test/dispatch/test_request_test.rb')
-rw-r--r-- | actionpack/test/dispatch/test_request_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/dispatch/test_request_test.rb b/actionpack/test/dispatch/test_request_test.rb index e42ade73d1..81a8c24525 100644 --- a/actionpack/test/dispatch/test_request_test.rb +++ b/actionpack/test/dispatch/test_request_test.rb @@ -36,10 +36,10 @@ class TestRequestTest < ActiveSupport::TestCase req.cookies["user_name"] = "david" assert_equal({"user_name" => "david"}, req.cookies) - assert_equal "user_name=david;", req.env["HTTP_COOKIE"] + assert_equal "user_name=david", req.env["HTTP_COOKIE"] req.cookies["login"] = "XJ-122" assert_equal({"user_name" => "david", "login" => "XJ-122"}, req.cookies) - assert_equal %w(login=XJ-122 user_name=david), req.env["HTTP_COOKIE"].split(/; ?/).sort + assert_equal %w(login=XJ-122 user_name=david), req.env["HTTP_COOKIE"].split(/; /).sort end end |