diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-02-19 21:20:15 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-02-19 21:20:15 +0100 |
| commit | d8f1ee4b41352b870f617b01099b2877f754d32c (patch) | |
| tree | dd6bdf1d1ded6aab7bb926109a24e942fc740b73 /actionpack/test/controller/integration_test.rb | |
| parent | 8ba1fc18e13c03966d411947180022c1730e81ff (diff) | |
| parent | 7c0e008973e594ebf53607362c1dfbe34b693600 (diff) | |
| download | rails-d8f1ee4b41352b870f617b01099b2877f754d32c.tar.gz rails-d8f1ee4b41352b870f617b01099b2877f754d32c.tar.bz2 rails-d8f1ee4b41352b870f617b01099b2877f754d32c.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'actionpack/test/controller/integration_test.rb')
| -rw-r--r-- | actionpack/test/controller/integration_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb index 57517e45a7..b3f40fbe95 100644 --- a/actionpack/test/controller/integration_test.rb +++ b/actionpack/test/controller/integration_test.rb @@ -296,7 +296,7 @@ class IntegrationProcessTest < ActionController::IntegrationTest assert_equal "Gone", status_message assert_response 410 assert_response :gone - assert_equal ["cookie_1=; path=/", "cookie_3=chocolate; path=/"], headers["Set-Cookie"] + assert_equal "cookie_1=; path=/\ncookie_3=chocolate; path=/", headers["Set-Cookie"] assert_equal({"cookie_1"=>"", "cookie_2"=>"oatmeal", "cookie_3"=>"chocolate"}, cookies) assert_equal "Gone", response.body end |