aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorbrainopia <brainopia@evilmartians.com>2015-01-02 15:22:30 +0300
committerbrainopia <brainopia@evilmartians.com>2015-01-02 16:52:32 +0300
commit95333e131708d0500e03e3ed1b076f4817f04fbb (patch)
tree185193ce1e1971d2addf35d626e8849e685d567d /actionpack/lib/action_controller
parent70c2777d1c2bfaf538c5bc892a5c3f96f67291f1 (diff)
downloadrails-95333e131708d0500e03e3ed1b076f4817f04fbb.tar.gz
rails-95333e131708d0500e03e3ed1b076f4817f04fbb.tar.bz2
rails-95333e131708d0500e03e3ed1b076f4817f04fbb.zip
Integration requests should work in contexts without setup and teardown
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/test_case.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index b9172f8fa3..9a77f179d3 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -67,7 +67,8 @@ module ActionController
def reset_template_assertion
RENDER_TEMPLATE_INSTANCE_VARIABLES.each do |instance_variable|
- instance_variable_get("@_#{instance_variable}").clear
+ ivar = instance_variable_get("@_#{instance_variable}")
+ ivar.clear if ivar
end
end