diff options
| author | Guo Xiang Tan <tgx_world@hotmail.com> | 2014-07-20 22:51:39 +0800 |
|---|---|---|
| committer | Guo Xiang Tan <tgx_world@hotmail.com> | 2014-07-21 08:47:26 +0800 |
| commit | d14f64699715d24a7ceb33e6ef8fa14127716c24 (patch) | |
| tree | 61e753f69ed11de0d437fb209d3ef665ac1728cf /actionpack/lib/action_dispatch | |
| parent | 08754f12e65a9ec79633a605e986d0f1ffa4b251 (diff) | |
| download | rails-d14f64699715d24a7ceb33e6ef8fa14127716c24.tar.gz rails-d14f64699715d24a7ceb33e6ef8fa14127716c24.tar.bz2 rails-d14f64699715d24a7ceb33e6ef8fa14127716c24.zip | |
Fix AC::TemplateAssertions instance variables not resetting.
Fixes https://github.com/rails/rails/issues/16119.
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -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 |