aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/test/activerecord/polymorphic_routes_test.rb
diff options
context:
space:
mode:
authorAaron Patterson <tenderlove@github.com>2018-09-25 09:27:37 -0700
committerGitHub <noreply@github.com>2018-09-25 09:27:37 -0700
commit6d698fdb070f4134c1795e8befb4e4c5e29a682f (patch)
treeccbaae1d82da6abfc99e151752a557a99da83dfc /actionview/test/activerecord/polymorphic_routes_test.rb
parent4f12139a22f70ff0abc1709b8888011f8bfee42c (diff)
parent3301804ff6abcd5aae06cc5acbb82bc6a472f008 (diff)
downloadrails-6d698fdb070f4134c1795e8befb4e4c5e29a682f.tar.gz
rails-6d698fdb070f4134c1795e8befb4e4c5e29a682f.tar.bz2
rails-6d698fdb070f4134c1795e8befb4e4c5e29a682f.zip
Merge pull request #33973 from rails/remove-catch-all
Remove deprecated catch-all route in the AV tests
Diffstat (limited to 'actionview/test/activerecord/polymorphic_routes_test.rb')
-rw-r--r--actionview/test/activerecord/polymorphic_routes_test.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/actionview/test/activerecord/polymorphic_routes_test.rb b/actionview/test/activerecord/polymorphic_routes_test.rb
index 4b931f793f..25e05f6222 100644
--- a/actionview/test/activerecord/polymorphic_routes_test.rb
+++ b/actionview/test/activerecord/polymorphic_routes_test.rb
@@ -62,10 +62,14 @@ module Weblog
end
class PolymorphicRoutesTest < ActionController::TestCase
- include SharedTestRoutes.url_helpers
+ Routes = ActionDispatch::Routing::RouteSet.new
+ Routes.draw {}
+ include Routes.url_helpers
+
default_url_options[:host] = "example.com"
def setup
+ super
@project = Project.new
@task = Task.new
@step = Step.new
@@ -763,9 +767,11 @@ class DirectRoutesTest < ActionView::TestCase
include Routes.url_helpers
def setup
+ super
@category = Category.new("1")
@collection = Collection.new("2")
@product = Product.new("3")
+ @controller.singleton_class.include Routes.url_helpers
end
def test_direct_routes