aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-11-06 12:02:32 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-11-06 12:02:32 -0200
commite16f8e58e75587033c4ac7acb11492f31387b90d (patch)
tree660c03f4805b77f4fcd54d20e36b74aac312ffc2 /actionpack/lib/action_dispatch
parentdf93428d91b71f0600e246056a9e8b4a89f06705 (diff)
parent76f5a9afb35e52bbdc392d6fc35422e22be987c2 (diff)
downloadrails-e16f8e58e75587033c4ac7acb11492f31387b90d.tar.gz
rails-e16f8e58e75587033c4ac7acb11492f31387b90d.tar.bz2
rails-e16f8e58e75587033c4ac7acb11492f31387b90d.zip
Merge pull request #17523 from tgxworld/reset_session_after_calling_with_routing
Remove session to allow `with_routing` to be called twice.
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r--actionpack/lib/action_dispatch/testing/integration.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index c300a4ea0d..fb816aa875 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -326,6 +326,10 @@ module ActionDispatch
@integration_session = Integration::Session.new(app)
end
+ def remove! # :nodoc:
+ @integration_session = nil
+ end
+
%w(get post patch put head delete cookies assigns
xml_http_request xhr get_via_redirect post_via_redirect).each do |method|
define_method(method) do |*args|