Permalink
Browse files

refactor the before_setup hooks to a module

  • Loading branch information...
tenderlove committed Aug 9, 2012
1 parent 0b29c7b commit 1e8c0a29d0190c375580c594479f517f4c9aa4bf
Showing with 12 additions and 13 deletions.
  1. +12 −13 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

0 comments on commit 1e8c0a2

Please sign in to comment.