aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/testing/integration.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-06-01 12:39:03 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-06-01 12:39:03 -0300
commitbdfc662a1195d13e3ef78cc8e79df8a8a2e3ca97 (patch)
tree8a0579453f36b82ec8c18a99cf3cb71029dbed55 /actionpack/lib/action_dispatch/testing/integration.rb
parentbd83caa66680380685a3961339c81b77ab1e85ff (diff)
parentca83436d1b3b6cedd1eca2259f65661e69b01909 (diff)
downloadrails-bdfc662a1195d13e3ef78cc8e79df8a8a2e3ca97.tar.gz
rails-bdfc662a1195d13e3ef78cc8e79df8a8a2e3ca97.tar.bz2
rails-bdfc662a1195d13e3ef78cc8e79df8a8a2e3ca97.zip
Merge pull request #20138 from tgxworld/deprecated_assert_template
Deprecate `assert_template` and `assigns()`.
Diffstat (limited to 'actionpack/lib/action_dispatch/testing/integration.rb')
-rw-r--r--actionpack/lib/action_dispatch/testing/integration.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index dff809f6cd..dc664d5540 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -429,7 +429,6 @@ module ActionDispatch
# 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