aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2018-09-24 14:49:26 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2018-09-24 15:39:15 -0700
commit4f96e739c215331562c09cd215536c35a85508fd (patch)
tree22ab11502954a40ce72f51efdfbc2f206a189a09 /actionpack/lib
parent0a829f7db10263c5bf5f8b4ee04ea92a05ecdd39 (diff)
downloadrails-4f96e739c215331562c09cd215536c35a85508fd.tar.gz
rails-4f96e739c215331562c09cd215536c35a85508fd.tar.bz2
rails-4f96e739c215331562c09cd215536c35a85508fd.zip
Remove deprecated catch-all route in the AV tests
This commit removes a deprecated catch-all route in the AV tests. It defines and includes the necessary routes for each test such that we don't need the catch-all anymore. This also helps push us toward #33970
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_dispatch/testing/assertions/routing.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/testing/assertions/routing.rb b/actionpack/lib/action_dispatch/testing/assertions/routing.rb
index 77cb311630..f11ae0e023 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/routing.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/routing.rb
@@ -9,6 +9,11 @@ module ActionDispatch
module Assertions
# Suite of assertions to test routes generated by \Rails and the handling of requests made to them.
module RoutingAssertions
+ def setup # :nodoc:
+ @routes = nil
+ super
+ end
+
# Asserts that the routing of the given +path+ was handled correctly and that the parsed options (given in the +expected_options+ hash)
# match +path+. Basically, it asserts that \Rails recognizes the route given by +expected_options+.
#