aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorwycats <wycats@gmail.com>2010-06-04 10:27:21 -0700
committerwycats <wycats@gmail.com>2010-06-04 20:11:05 -0700
commitff4c218095687ef9925baaca78d644579831d3c1 (patch)
tree79aefbb8537e0a13a011477f05bc91a44b3a6701 /actionpack/lib/action_controller
parentcb1b2a719ac2ba31dc8d66195c0be32798255be0 (diff)
downloadrails-ff4c218095687ef9925baaca78d644579831d3c1.tar.gz
rails-ff4c218095687ef9925baaca78d644579831d3c1.tar.bz2
rails-ff4c218095687ef9925baaca78d644579831d3c1.zip
Memoizing methods on request means we need to clear them out on recycle!
Diffstat (limited to 'actionpack/lib/action_controller')
-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 34499fa784..37906b79f6 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -155,6 +155,8 @@ module ActionController
@formats = nil
@env.delete_if { |k, v| k =~ /^(action_dispatch|rack)\.request/ }
@env.delete_if { |k, v| k =~ /^action_dispatch\.rescue/ }
+ @method = @request_method = nil
+ @fullpath = @ip = @remote_ip = nil
@env['action_dispatch.request.query_parameters'] = {}
end
end
@@ -167,9 +169,7 @@ module ActionController
@block = nil
@length = 0
@body = []
- @charset = nil
- @content_type = nil
-
+ @charset = @content_type = nil
@request = @template = nil
end
end