Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Modernize cookie testing code, and increase coverage (Heckle++) #7101

…[Kevin Clark]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5977 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit fcd73821c2d19adbcf7e595137e4ba25af0e2cde 1 parent d2205ea
@technoweenie technoweenie authored
Showing with 34 additions and 24 deletions.
  1. +2 −0  actionpack/CHANGELOG
  2. +32 −24 actionpack/test/controller/cookie_test.rb
View
2  actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Modernize cookie testing code, and increase coverage (Heckle++) #7101 [Kevin Clark]
+
* Improve Test Coverage for ActionController::Routing::Route#matches_controller_and_action? (Heckle++) #7115 [Kevin Clark]
* Heckling ActionController::Resources::Resource revealed that set_prefixes didn't break when :name_prefix was munged. #7081 [Kevin Clark]
View
56 actionpack/test/controller/cookie_test.rb
@@ -4,77 +4,85 @@ class CookieTest < Test::Unit::TestCase
class TestController < ActionController::Base
def authenticate_with_deprecated_writer
cookie "name" => "user_name", "value" => "david"
- render_text "hello world"
end
def authenticate
cookies["user_name"] = "david"
- render_text "hello world"
end
def authenticate_for_fourten_days
cookies["user_name"] = { "value" => "david", "expires" => Time.local(2005, 10, 10) }
- render_text "hello world"
end
def authenticate_for_fourten_days_with_symbols
cookies[:user_name] = { :value => "david", :expires => Time.local(2005, 10, 10) }
- render_text "hello world"
end
def set_multiple_cookies
cookies["user_name"] = { "value" => "david", "expires" => Time.local(2005, 10, 10) }
cookies["login"] = "XJ-122"
- render_text "hello world"
end
def access_frozen_cookies
cookies["will"] = "work"
- render_text "hello world"
end
- def rescue_action(e) raise end
+ def logout
+ cookies.delete("user_name")
+ end
+
+ def rescue_action(e)
+ raise unless ActionController::MissingTemplate # No templates here, and we don't care about the output
+ end
end
def setup
@request = ActionController::TestRequest.new
@response = ActionController::TestResponse.new
+ @controller = TestController.new
@request.host = "www.nextangle.com"
end
def test_setting_cookie_with_deprecated_writer
- @request.action = "authenticate_with_deprecated_writer"
- assert_equal [ CGI::Cookie::new("name" => "user_name", "value" => "david") ], process_request.headers["cookie"]
+ get :authenticate_with_deprecated_writer
+ assert_equal [ CGI::Cookie::new("name" => "user_name", "value" => "david") ], @response.headers["cookie"]
end
def test_setting_cookie
- @request.action = "authenticate"
- assert_equal [ CGI::Cookie::new("name" => "user_name", "value" => "david") ], process_request.headers["cookie"]
+ get :authenticate
+ assert_equal [ CGI::Cookie::new("name" => "user_name", "value" => "david") ], @response.headers["cookie"]
end
def test_setting_cookie_for_fourteen_days
- @request.action = "authenticate_for_fourten_days"
- assert_equal [ CGI::Cookie::new("name" => "user_name", "value" => "david", "expires" => Time.local(2005, 10, 10)) ], process_request.headers["cookie"]
+ get :authenticate_for_fourten_days
+ assert_equal [ CGI::Cookie::new("name" => "user_name", "value" => "david", "expires" => Time.local(2005, 10, 10)) ], @response.headers["cookie"]
end
def test_setting_cookie_for_fourteen_days_with_symbols
- @request.action = "authenticate_for_fourten_days"
- assert_equal [ CGI::Cookie::new("name" => "user_name", "value" => "david", "expires" => Time.local(2005, 10, 10)) ], process_request.headers["cookie"]
+ get :authenticate_for_fourten_days
+ assert_equal [ CGI::Cookie::new("name" => "user_name", "value" => "david", "expires" => Time.local(2005, 10, 10)) ], @response.headers["cookie"]
end
def test_multiple_cookies
- @request.action = "set_multiple_cookies"
- assert_equal 2, process_request.headers["cookie"].size
+ get :set_multiple_cookies
+ assert_equal 2, @response.cookies.size
end
def test_setting_test_cookie
- @request.action = "access_frozen_cookies"
- assert_nothing_raised { process_request }
+ assert_nothing_raised { get :access_frozen_cookies }
+ end
+
+ def test_expiring_cookie
+ get :logout
+ assert_equal [ CGI::Cookie::new("name" => "user_name", "value" => "", "expires" => Time.at(0)) ], @response.headers["cookie"]
+ end
+
+ def test_cookiejar_accessor
+ @request.cookies["user_name"] = CGI::Cookie.new("name" => "user_name", "value" => "david", "expires" => Time.local(2025, 10, 10))
+ @controller.request = @request
+ jar = ActionController::CookieJar.new(@controller)
+ assert_equal "david", jar["user_name"]
+ assert_equal nil, jar["something_else"]
end
-
- private
- def process_request
- TestController.process(@request, @response)
- end
end
Please sign in to comment.
Something went wrong with that request. Please try again.