Permalink
Browse files

Merge pull request #5166 from arunagw/3-2-stable

3 2 stable
  • Loading branch information...
2 parents 5661dab + 0bfcd4f commit 8125304f20a5f719c8e451640060bb09f48737c7 @fxn fxn committed Feb 25, 2012
Showing with 3 additions and 4 deletions.
  1. +3 −4 actionpack/test/controller/integration_test.rb
@@ -296,10 +296,9 @@ def test_post
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"

0 comments on commit 8125304

Please sign in to comment.