diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-01-05 09:43:50 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-01-05 09:43:50 -0300 |
| commit | d824e02c20c683da01b77187946cc28de121d757 (patch) | |
| tree | 499ae5cd3fceac4cb5b5f701d1cd1a58a4aaca2a /actionpack | |
| parent | e50064c130f8b6465a78928e38588196515ccf27 (diff) | |
| parent | e275479ce5ea6126aa1dc2f964b6d06d07098e00 (diff) | |
| download | rails-d824e02c20c683da01b77187946cc28de121d757.tar.gz rails-d824e02c20c683da01b77187946cc28de121d757.tar.bz2 rails-d824e02c20c683da01b77187946cc28de121d757.zip | |
Merge pull request #18342 from brainopia/reset_template_assertion_without_warnings
Reset template assertions without warnings
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index 2e6c58b83a..d30615fade 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -66,8 +66,10 @@ module ActionController def reset_template_assertion RENDER_TEMPLATE_INSTANCE_VARIABLES.each do |instance_variable| - ivar = instance_variable_get("@_#{instance_variable}") - ivar.clear if ivar + ivar_name = "@_#{instance_variable}" + if instance_variable_defined?(ivar_name) + instance_variable_get(ivar_name).clear + end end end |