diff options
| author | Xavier Noria <fxn@hashref.com> | 2012-02-25 03:43:38 -0800 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2012-02-25 03:43:38 -0800 |
| commit | 5661dab5fe19f34d1a0060007d1e393a52a0fa4c (patch) | |
| tree | a7a4b340c0d250592b74f0fa381cb37b0cfef639 /actionpack/test/controller | |
| parent | 6dbf6f39f95931c783e1d62cac586723c391199d (diff) | |
| parent | 99fa8e5e942b6b528bc59118d2ed1f131d937919 (diff) | |
| download | rails-5661dab5fe19f34d1a0060007d1e393a52a0fa4c.tar.gz rails-5661dab5fe19f34d1a0060007d1e393a52a0fa4c.tar.bz2 rails-5661dab5fe19f34d1a0060007d1e393a52a0fa4c.zip | |
Merge pull request #5164 from arunagw/build_fix_ruby187-p358
Build fix ruby187 p358
Diffstat (limited to 'actionpack/test/controller')
| -rw-r--r-- | actionpack/test/controller/integration_test.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb index 2ad95f5c29..1ef0ba08be 100644 --- a/actionpack/test/controller/integration_test.rb +++ b/actionpack/test/controller/integration_test.rb @@ -296,8 +296,13 @@ class IntegrationProcessTest < ActionDispatch::IntegrationTest self.cookies['cookie_1'] = "sugar" self.cookies['cookie_2'] = "oatmeal" get '/cookie_monster' - assert_equal "cookie_1=; path=/\ncookie_3=chocolate; path=/", headers["Set-Cookie"] - assert_equal({"cookie_1"=>"", "cookie_2"=>"oatmeal", "cookie_3"=>"chocolate"}, cookies.to_hash) + assert headers["Set-Cookie"].include?"path=/" + assert headers["Set-Cookie"].include?"cookie_3=chocolate;" + assert headers["Set-Cookie"].include?"cookie_1=; path=/" + + assert cookies.to_hash["cookie_1"], "" + assert cookies.to_hash["cookie_2"], "oatmeal" + assert cookies.to_hash["cookie_3"], "chocolate" end end |