diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb index 60bf583dfd..f7a3f9a533 100644 --- a/actionpack/test/abstract_unit.rb +++ b/actionpack/test/abstract_unit.rb @@ -112,6 +112,15 @@ def run_setup_once SharedTestRoutes = ActionDispatch::Routing::RouteSet.new +module ActionDispatch + module SharedRoutes + def before_setup + @routes = SharedTestRoutes + super + end + end +end + module ActiveSupport class TestCase include SetupOnce @@ -159,10 +168,7 @@ def config end class ActionDispatch::IntegrationTest < ActiveSupport::TestCase - def before_setup - @routes = SharedTestRoutes - super - end + include ActionDispatch::SharedRoutes def self.build_app(routes = nil) RoutedRackApp.new(routes || ActionDispatch::Routing::RouteSet.new) do |middleware| @@ -291,11 +297,7 @@ def self.test_routes(&block) class TestCase include ActionDispatch::TestProcess - - def before_setup - @routes = SharedTestRoutes - super - end + include ActionDispatch::SharedRoutes end end @@ -306,10 +308,7 @@ module ActionView class TestCase # Must repeat the setup because AV::TestCase is a duplication # of AC::TestCase - def before_setup - @routes = SharedTestRoutes - super - end + include ActionDispatch::SharedRoutes end end