aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
diff options
context:
space:
mode:
authoreileencodes <eileencodes@gmail.com>2015-07-07 14:36:18 -0400
committerAaron Patterson <aaron.patterson@gmail.com>2015-07-07 14:31:34 -0700
commitae29142142324545a328948e059e8b8118fd7a33 (patch)
tree280e5683ca97750f81b2dc6d74997eafcb05705f /actionpack/lib/action_dispatch
parent062cbd18ddbf6ef48c9a9a2a69081737aebbee89 (diff)
downloadrails-ae29142142324545a328948e059e8b8118fd7a33.tar.gz
rails-ae29142142324545a328948e059e8b8118fd7a33.tar.bz2
rails-ae29142142324545a328948e059e8b8118fd7a33.zip
Send cookies with request
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r--actionpack/lib/action_dispatch/middleware/cookies.rb4
-rw-r--r--actionpack/lib/action_dispatch/testing/test_process.rb2
2 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/cookies.rb b/actionpack/lib/action_dispatch/middleware/cookies.rb
index 9a1e2bd45c..07d97bd6bd 100644
--- a/actionpack/lib/action_dispatch/middleware/cookies.rb
+++ b/actionpack/lib/action_dispatch/middleware/cookies.rb
@@ -279,6 +279,10 @@ module ActionDispatch
self
end
+ def to_header
+ @cookies.map { |k,v| "#{k}=#{v}" }.join ';'
+ end
+
def handle_options(options) #:nodoc:
options[:path] ||= "/"
diff --git a/actionpack/lib/action_dispatch/testing/test_process.rb b/actionpack/lib/action_dispatch/testing/test_process.rb
index 415ef80cd2..494644cd46 100644
--- a/actionpack/lib/action_dispatch/testing/test_process.rb
+++ b/actionpack/lib/action_dispatch/testing/test_process.rb
@@ -19,7 +19,7 @@ module ActionDispatch
end
def cookies
- @request.cookie_jar
+ @cookie_jar ||= Cookies::CookieJar.build(@request.env, @request.host, @request.ssl?, @request.cookies)
end
def redirect_to_url