diff options
| author | Craig Smith <craigsmith@reevoo.com> | 2009-06-05 14:58:38 +0100 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2009-10-15 10:58:55 +1300 |
| commit | 316f4704eaa8aaba11e7ecebc1da9aa926fdd2d0 (patch) | |
| tree | 2f6030053f62533550957050fc75dc21dd5cecb9 /actionpack/lib/action_controller/testing | |
| parent | fc46c9b2207c62d4b029c2c891c61fc660c0b627 (diff) | |
| download | rails-316f4704eaa8aaba11e7ecebc1da9aa926fdd2d0.tar.gz rails-316f4704eaa8aaba11e7ecebc1da9aa926fdd2d0.tar.bz2 rails-316f4704eaa8aaba11e7ecebc1da9aa926fdd2d0.zip | |
Test cases should see all the cookies, not just cookies that have been set in the controller.
Previously this example would always pass, even when cookies.delete was not called.
@request.cookies['foo'] = 'bar'
get :delete_cookie
assert_nil cookies['foo']
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#2768 state:committed]
Diffstat (limited to 'actionpack/lib/action_controller/testing')
| -rw-r--r-- | actionpack/lib/action_controller/testing/process.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/testing/process.rb b/actionpack/lib/action_controller/testing/process.rb index bbc7f3c8f9..323cce6a2f 100644 --- a/actionpack/lib/action_controller/testing/process.rb +++ b/actionpack/lib/action_controller/testing/process.rb @@ -35,7 +35,7 @@ module ActionController #:nodoc: end def cookies - @response.cookies + @request.cookies.merge(@response.cookies) end def redirect_to_url |