1 files changed, 53 insertions, 38 deletions

diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 60e2cea8a2..1954324222 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -19,7 +19,6 @@ begin
 rescue LoadError
   puts "'drb/unix' is not available"
 end
-require 'tempfile'
 
 PROCESS_COUNT = (ENV['N'] || 4).to_i
 
@@ -42,6 +41,8 @@ module Rails
     def env
       @_env ||= ActiveSupport::StringInquirer.new(ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "test")
     end
+
+    def root; end;
   end
 end
 
@@ -117,23 +118,36 @@ class ActionDispatch::IntegrationTest < ActiveSupport::TestCase
     get ':controller(/:action)'
   end
 
-  # Stub Rails dispatcher so it does not get controller references and
-  # simply return the controller#action as Rack::Body.
-  class StubDispatcher < ::ActionDispatch::Routing::RouteSet::Dispatcher
-    protected
-    def controller_reference(controller_param)
-      controller_param
+  class DeadEndRoutes < ActionDispatch::Routing::RouteSet
+    # Stub Rails dispatcher so it does not get controller references and
+    # simply return the controller#action as Rack::Body.
+    class NullController < ::ActionController::Metal
+      def initialize(controller_name)
+        @controller = controller_name
+      end
+
+      def make_response!(request)
+        self.class.make_response! request
+      end
+
+      def dispatch(action, req, res)
+        [200, {'Content-Type' => 'text/html'}, ["#{@controller}##{action}"]]
+      end
+    end
+
+    class NullControllerRequest < DelegateClass(ActionDispatch::Request)
+      def controller_class
+        NullController.new params[:controller]
+      end
     end
 
-    def dispatch(controller, action, env)
-      [200, {'Content-Type' => 'text/html'}, ["#{controller}##{action}"]]
+    def make_request env
+      NullControllerRequest.new super
     end
   end
 
-  def self.stub_controllers(config = nil)
-    route_set = ActionDispatch::Routing::RouteSet.new(*[config].compact)
-    route_set.dispatcher_class = StubDispatcher
-    yield route_set
+  def self.stub_controllers(config = ActionDispatch::Routing::RouteSet::DEFAULT_CONFIG)
+    yield DeadEndRoutes.new(config)
   end
 
   def with_routing(&block)
@@ -323,39 +337,37 @@ module RoutingTestHelpers
   end
 
   class TestSet < ActionDispatch::Routing::RouteSet
-    attr_reader :strict
-
-    def initialize(block, strict = false)
-      @block = block
-      @strict = strict
-      super()
-    end
-
-    class Dispatcher < ActionDispatch::Routing::RouteSet::Dispatcher
-      def initialize(defaults, set, block)
-        super(defaults)
+    class Request < DelegateClass(ActionDispatch::Request)
+      def initialize(target, helpers, block, strict)
+        super(target)
+        @helpers = helpers
         @block = block
-        @set = set
-      end
-
-      def controller(params, default_controller=true)
-        super(params, @set.strict)
+        @strict = strict
       end
 
-      def controller_reference(controller_param)
+      def controller_class
+        helpers = @helpers
         block = @block
-        set = @set
-        super if @set.strict
-        Class.new(ActionController::Base) {
-          include set.url_helpers
+        Class.new(@strict ? super : ActionController::Base) {
+          include helpers
           define_method(:process) { |name| block.call(self) }
           def to_a; [200, {}, []]; end
         }
       end
     end
 
-    def dispatcher defaults
-      TestSet::Dispatcher.new defaults, self, @block
+    attr_reader :strict
+
+    def initialize(block, strict = false)
+      @block = block
+      @strict = strict
+      super()
+    end
+
+    private
+
+    def make_request(env)
+      Request.new super, url_helpers, @block, strict
     end
   end
 end
@@ -369,13 +381,11 @@ class ThreadsController  < ResourcesController; end
 class MessagesController < ResourcesController; end
 class CommentsController < ResourcesController; end
 class ReviewsController < 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
@@ -397,6 +407,7 @@ def jruby_skip(message = '')
 end
 
 require 'mocha/setup' # FIXME: stop using mocha
+require 'active_support/testing/method_call_assertions'
 
 class ForkingExecutor
   class Server
@@ -468,3 +479,7 @@ if RUBY_ENGINE == "ruby" && PROCESS_COUNT > 0
   # Use N processes (N defaults to 4)
   Minitest.parallel_executor = ForkingExecutor.new(PROCESS_COUNT)
 end
+
+class ActiveSupport::TestCase
+  include ActiveSupport::Testing::MethodCallAssertions
+end