refactor the before_setup hooks to a module

This commit is contained in:
Aaron Patterson 2012-08-09 14:30:26 -07:00
parent 0b29c7bb7b
commit 1e8c0a29d0

@ -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