@@ -35,7 +35,7 @@ module ActionController #:nodoc: end def cookies - @response.cookies + @request.cookies.merge(@response.cookies) end def redirect_to_url actionpack/lib/action_controller/testing/process.rb @@ -108,6 +108,11 @@ XML head :created, :location => 'created resource' end + def delete_cookie + cookies.delete("foo") + render :nothing => true + end + private def rescue_action(e) raise e @@ -512,6 +517,18 @@ XML assert @request.params[:foo].blank? end + def test_should_have_knowledge_of_client_side_cookie_state_even_if_they_are_not_set + @request.cookies['foo'] = 'bar' + get :no_op + assert_equal 'bar', cookies['foo'] + end + + def test_should_detect_if_cookie_is_deleted + @request.cookies['foo'] = 'bar' + get :delete_cookie + assert_nil cookies['foo'] + end + %w(controller response request).each do |variable| %w(get post put delete head process).each do |method| define_method("test_#{variable}_missing_for_#{method}_raises_error") do actionpack/test/controller/test_test.rb fc46c9b2207c62d4b029c2c891c61fc660c0b627 Craig Smith craigsmith@reevoo.com http://github.com/rails/rails/commit/316f4704eaa8aaba11e7ecebc1da9aa926fdd2d0 316f4704eaa8aaba11e7ecebc1da9aa926fdd2d0 2009-10-14T14:58:55-07:00 2009-06-05T06:58:38-07:00 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] 2f6030053f62533550957050fc75dc21dd5cecb9 Michael Koziarski michael@koziarski.com