aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2018-09-24 15:58:27 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2018-09-24 15:58:27 -0700
commitd8c0aa88e055c9f08a729827544b186561a6c203 (patch)
tree9d79afa593c6f9e55644dc7a9cbcdc9cb1ccc980 /actionpack/lib
parent4f96e739c215331562c09cd215536c35a85508fd (diff)
downloadrails-d8c0aa88e055c9f08a729827544b186561a6c203.tar.gz
rails-d8c0aa88e055c9f08a729827544b186561a6c203.tar.bz2
rails-d8c0aa88e055c9f08a729827544b186561a6c203.zip
Add hack to deal with warnings
We should be able to remove this once the catch-all route is gone from AP
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_dispatch/testing/assertions/routing.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/testing/assertions/routing.rb b/actionpack/lib/action_dispatch/testing/assertions/routing.rb
index f11ae0e023..af41521c5c 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/routing.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/routing.rb
@@ -10,7 +10,7 @@ module ActionDispatch
# Suite of assertions to test routes generated by \Rails and the handling of requests made to them.
module RoutingAssertions
def setup # :nodoc:
- @routes = nil
+ @routes ||= nil
super
end