1 files changed, 57 insertions, 38 deletions

diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 37deb9c98a..e5054a9eb8 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -85,39 +85,28 @@ module RenderERBUtils
   end
 end
 
-module SetupOnce
-  extend ActiveSupport::Concern
-
-  included do
-    cattr_accessor :setup_once_block
-    self.setup_once_block = nil
-
-    setup :run_setup_once
-  end
+SharedTestRoutes = ActionDispatch::Routing::RouteSet.new
 
-  module ClassMethods
-    def setup_once(&block)
-      self.setup_once_block = block
+module ActionDispatch
+  module SharedRoutes
+    def before_setup
+      @routes = SharedTestRoutes
+      super
     end
   end
 
-  private
-    def run_setup_once
-      if self.setup_once_block
-        self.setup_once_block.call
-        self.setup_once_block = nil
-      end
+  # Hold off drawing routes until all the possible controller classes
+  # have been loaded.
+  module DrawOnce
+    class << self
+      attr_accessor :drew
     end
-end
+    self.drew = false
 
-SharedTestRoutes = ActionDispatch::Routing::RouteSet.new
+    def before_setup
+      super
+      return if DrawOnce.drew
 
-module ActiveSupport
-  class TestCase
-    include SetupOnce
-    # Hold off drawing routes until all the possible controller classes
-    # have been loaded.
-    setup_once do
       SharedTestRoutes.draw do
         get ':controller(/:action)'
       end
@@ -125,10 +114,18 @@ module ActiveSupport
       ActionDispatch::IntegrationTest.app.routes.draw do
         get ':controller(/:action)'
       end
+
+      DrawOnce.drew = true
     end
   end
 end
 
+module ActiveSupport
+  class TestCase
+    include ActionDispatch::DrawOnce
+  end
+end
+
 class RoutedRackApp
   attr_reader :routes
 
@@ -159,9 +156,7 @@ class BasicController
 end
 
 class ActionDispatch::IntegrationTest < ActiveSupport::TestCase
-  setup do
-    @routes = SharedTestRoutes
-  end
+  include ActionDispatch::SharedRoutes
 
   def self.build_app(routes = nil)
     RoutedRackApp.new(routes || ActionDispatch::Routing::RouteSet.new) do |middleware|
@@ -171,7 +166,7 @@ class ActionDispatch::IntegrationTest < ActiveSupport::TestCase
       middleware.use "ActionDispatch::ParamsParser"
       middleware.use "ActionDispatch::Cookies"
       middleware.use "ActionDispatch::Flash"
-      middleware.use "ActionDispatch::Head"
+      middleware.use "Rack::Head"
       yield(middleware) if block_given?
     end
   end
@@ -290,10 +285,7 @@ module ActionController
 
   class TestCase
     include ActionDispatch::TestProcess
-
-    setup do
-      @routes = SharedTestRoutes
-    end
+    include ActionDispatch::SharedRoutes
   end
 end
 
@@ -304,9 +296,7 @@ module ActionView
   class TestCase
     # Must repeat the setup because AV::TestCase is a duplication
     # of AC::TestCase
-    setup do
-      @routes = SharedTestRoutes
-    end
+    include ActionDispatch::SharedRoutes
   end
 end
 
@@ -356,6 +346,35 @@ end
 
 module RoutingTestHelpers
   def url_for(set, options, recall = nil)
-    set.send(:url_for, options.merge(:only_path => true, :_path_segments => recall))
+    set.send(:url_for, options.merge(:only_path => true, :_recall => recall))
+  end
+end
+
+class ResourcesController < ActionController::Base
+  def index() render :nothing => true end
+  alias_method :show, :index
+end
+
+class ThreadsController  < ResourcesController; end
+class MessagesController < ResourcesController; end
+class CommentsController < ResourcesController; end
+class AuthorsController < ResourcesController; end
+class LogosController < ResourcesController; end
+
+class AccountsController <  ResourcesController; end
+class AdminController   <  ResourcesController; end
+class ProductsController < ResourcesController; end
+class ImagesController < ResourcesController; end
+class PreferencesController < ResourcesController; end
+
+module Backoffice
+  class ProductsController < ResourcesController; end
+  class TagsController < ResourcesController; end
+  class ManufacturersController < ResourcesController; end
+  class ImagesController < ResourcesController; end
+
+  module Admin
+    class ProductsController < ResourcesController; end
+    class ImagesController < ResourcesController; end
   end
 end