aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2015-08-23 16:53:41 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2015-08-23 16:53:41 -0700
commit97c65aa144d8664e25f65383620f70645e65c2bc (patch)
tree815e7fa21ef4d1469231386fa38ef357c1fff0ac
parent7de86d2cf31eb0f604700d1550bd875188c6d29b (diff)
downloadrails-97c65aa144d8664e25f65383620f70645e65c2bc.tar.gz
rails-97c65aa144d8664e25f65383620f70645e65c2bc.tar.bz2
rails-97c65aa144d8664e25f65383620f70645e65c2bc.zip
remove more env access
-rw-r--r--actionpack/lib/action_controller/test_case.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index bb73f359c9..24c07f02e0 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -510,10 +510,10 @@ module ActionController
@request.env.delete 'HTTP_COOKIE'
- if cookies = @request.env['action_dispatch.cookies']
+ if @request.have_cookie_jar?
unless @response.committed?
- cookies.write(@response)
- self.cookies.update(cookies.instance_variable_get(:@cookies))
+ @request.cookie_jar.write(@response)
+ self.cookies.update(@request.cookie_jar.instance_variable_get(:@cookies))
end
end
@response.prepare!