diff options
| author | Yves Senn <yves.senn@gmail.com> | 2014-07-22 22:19:17 +0200 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2014-07-22 22:19:17 +0200 |
| commit | 74a157ac5f0955ce3472ddeca578a9f2d69b0a98 (patch) | |
| tree | fa2e26b1c51507d10689bb986725ad496eb7b547 /actionpack/lib/action_dispatch/testing/integration.rb | |
| parent | 1db00698da05558f3ed48a9d1dce6ca0996c056e (diff) | |
| parent | d14f64699715d24a7ceb33e6ef8fa14127716c24 (diff) | |
| download | rails-74a157ac5f0955ce3472ddeca578a9f2d69b0a98.tar.gz rails-74a157ac5f0955ce3472ddeca578a9f2d69b0a98.tar.bz2 rails-74a157ac5f0955ce3472ddeca578a9f2d69b0a98.zip | |
Merge pull request #16234 from tgxworld/fix_template_assertion_for_integration_test
Fix AC::TemplateAssertions instance variables not resetting.
Diffstat (limited to 'actionpack/lib/action_dispatch/testing/integration.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/integration.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb index cb2cb10870..12b796b95f 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -329,6 +329,7 @@ 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' integration_session.__send__(method, *args).tap do |