diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-11-17 11:50:09 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-11-17 11:50:09 -0200 |
| commit | 549577193875e151b9afab28bf32e86e879a53a6 (patch) | |
| tree | fb01fe5ed7a133120eed082bf186d03345d718e6 /actionpack/lib/action_dispatch/testing/integration.rb | |
| parent | 8fd5592beefc07935443f01e6c8cda47d0c8d24c (diff) | |
| parent | c3e8d15e8babd8c27aa04ced8cde40fdc124416a (diff) | |
| download | rails-549577193875e151b9afab28bf32e86e879a53a6.tar.gz rails-549577193875e151b9afab28bf32e86e879a53a6.tar.bz2 rails-549577193875e151b9afab28bf32e86e879a53a6.zip | |
Merge pull request #17642 from tgxworld/fix_template_assertion_on_assigns
Fix for assigns(:..) resetting template assertions
Diffstat (limited to 'actionpack/lib/action_dispatch/testing/integration.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/integration.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb index fb816aa875..731305227d 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -334,9 +334,13 @@ module ActionDispatch xml_http_request xhr get_via_redirect post_via_redirect).each do |method| define_method(method) do |*args| reset! unless integration_session - reset_template_assertion - # reset the html_document variable, but only for new get/post calls - @html_document = nil unless method == 'cookies' || method == 'assigns' + + # reset the html_document variable, except for cookies/assigns calls + unless method == 'cookies' || method == 'assigns' + @html_document = nil + reset_template_assertion + end + integration_session.__send__(method, *args).tap do copy_session_variables! end |