diff options
| author | Aditya Chadha <aditya@sublucid.com> | 2009-05-02 18:32:45 -0400 |
|---|---|---|
| committer | Aditya Chadha <aditya@sublucid.com> | 2009-05-02 18:32:45 -0400 |
| commit | 7a17ad3f2b89baea94450af8e63a640ace570938 (patch) | |
| tree | 89cd60c05d4a812b3c8636373a05689b1df5bf75 /actionpack/test/controller/integration_test.rb | |
| parent | 5469a0be1a517a0c2d8ee553b704df4e6f7df306 (diff) | |
| parent | 1b32f882091ed7744654f74238f3f3b1ba6701ae (diff) | |
| download | rails-7a17ad3f2b89baea94450af8e63a640ace570938.tar.gz rails-7a17ad3f2b89baea94450af8e63a640ace570938.tar.bz2 rails-7a17ad3f2b89baea94450af8e63a640ace570938.zip | |
Merge branch 'master' of git@github.com:lifo/docrails
Diffstat (limited to 'actionpack/test/controller/integration_test.rb')
| -rw-r--r-- | actionpack/test/controller/integration_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb index e39a934c24..70fa41aded 100644 --- a/actionpack/test/controller/integration_test.rb +++ b/actionpack/test/controller/integration_test.rb @@ -297,7 +297,7 @@ class IntegrationProcessTest < ActionController::IntegrationTest assert_response 410 assert_response :gone 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({"cookie_1"=>nil, "cookie_2"=>"oatmeal", "cookie_3"=>"chocolate"}, cookies) assert_equal "Gone", response.body end end @@ -337,7 +337,7 @@ class IntegrationProcessTest < ActionController::IntegrationTest get '/get_with_params?foo=bar' assert_equal '/get_with_params?foo=bar', request.env["REQUEST_URI"] assert_equal '/get_with_params?foo=bar', request.request_uri - assert_equal "", request.env["QUERY_STRING"] + assert_equal "foo=bar", request.env["QUERY_STRING"] assert_equal 'foo=bar', request.query_string assert_equal 'bar', request.parameters['foo'] |