aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/dispatch
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-12-04 15:21:47 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-12-04 15:21:47 -0200
commitdfa45ce7e1a3b0974cf6d5c3524483175faabf27 (patch)
tree9161f407b803d068bcbcfe97be0ab3d32f4a2197 /actionpack/test/dispatch
parent54bccc491589e838a83a08335063e811dffc77c7 (diff)
parentf7dbf388bd867cba7a66abf44affb09960ccb4c1 (diff)
downloadrails-dfa45ce7e1a3b0974cf6d5c3524483175faabf27.tar.gz
rails-dfa45ce7e1a3b0974cf6d5c3524483175faabf27.tar.bz2
rails-dfa45ce7e1a3b0974cf6d5c3524483175faabf27.zip
Merge pull request #17792 from rockrep/master
allow 'all' for :domain option in addition to :all
Diffstat (limited to 'actionpack/test/dispatch')
-rw-r--r--actionpack/test/dispatch/cookies_test.rb10
1 files changed, 10 insertions, 0 deletions
diff --git a/actionpack/test/dispatch/cookies_test.rb b/actionpack/test/dispatch/cookies_test.rb
index 9384c09454..19a98a4054 100644
--- a/actionpack/test/dispatch/cookies_test.rb
+++ b/actionpack/test/dispatch/cookies_test.rb
@@ -145,11 +145,21 @@ class CookiesTest < ActionController::TestCase
head :ok
end
+ def set_cookie_with_domain_all_as_string
+ cookies[:user_name] = {:value => "rizwanreza", :domain => 'all'}
+ head :ok
+ end
+
def delete_cookie_with_domain
cookies.delete(:user_name, :domain => :all)
head :ok
end
+ def delete_cookie_with_domain_all_as_string
+ cookies.delete(:user_name, :domain => 'all')
+ head :ok
+ end
+
def set_cookie_with_domain_and_tld
cookies[:user_name] = {:value => "rizwanreza", :domain => :all, :tld_length => 2}
head :ok