diff options
| author | Xavier Noria <fxn@hashref.com> | 2012-02-25 04:42:22 -0800 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2012-02-25 04:42:22 -0800 |
| commit | 8125304f20a5f719c8e451640060bb09f48737c7 (patch) | |
| tree | 65670f5fba523f458772c0979495e34e88d6f276 | |
| parent | 5661dab5fe19f34d1a0060007d1e393a52a0fa4c (diff) | |
| parent | 0bfcd4ffffb42b0430ddf0a58a56c8361f61a48f (diff) | |
| download | rails-8125304f20a5f719c8e451640060bb09f48737c7.tar.gz rails-8125304f20a5f719c8e451640060bb09f48737c7.tar.bz2 rails-8125304f20a5f719c8e451640060bb09f48737c7.zip | |
Merge pull request #5166 from arunagw/3-2-stable
3 2 stable
| -rw-r--r-- | actionpack/test/controller/integration_test.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb index 1ef0ba08be..ea44e68da1 100644 --- a/actionpack/test/controller/integration_test.rb +++ b/actionpack/test/controller/integration_test.rb @@ -296,10 +296,9 @@ class IntegrationProcessTest < ActionDispatch::IntegrationTest self.cookies['cookie_1'] = "sugar" self.cookies['cookie_2'] = "oatmeal" get '/cookie_monster' - assert headers["Set-Cookie"].include?"path=/" - assert headers["Set-Cookie"].include?"cookie_3=chocolate;" - assert headers["Set-Cookie"].include?"cookie_1=; path=/" - + _headers = headers["Set-Cookie"].split("\n") + assert _headers.include?("cookie_1=; path=/") + assert _headers.include?("cookie_3=chocolate; path=/") assert cookies.to_hash["cookie_1"], "" assert cookies.to_hash["cookie_2"], "oatmeal" assert cookies.to_hash["cookie_3"], "chocolate" |