diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-01-02 10:59:59 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-01-02 10:59:59 -0300 |
| commit | 6442c90f098f7095ada0cd66bb7291b6798a5583 (patch) | |
| tree | 1d4df68e7784018a658a1405cb0838ff34fac7d6 /actionpack/lib | |
| parent | 9598c9655f04b3bf6dfc245437ad5a09f23c792c (diff) | |
| parent | 95333e131708d0500e03e3ed1b076f4817f04fbb (diff) | |
| download | rails-6442c90f098f7095ada0cd66bb7291b6798a5583.tar.gz rails-6442c90f098f7095ada0cd66bb7291b6798a5583.tar.bz2 rails-6442c90f098f7095ada0cd66bb7291b6798a5583.zip | |
Merge pull request #18298 from brainopia/integration_requests_without_setup
Integration requests should work in contexts without setup and teardown
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 3 |
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 |