From 337684fa28a3e8d55874d5740585710d0fa99ead Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 24 Aug 2015 12:06:22 -0700
Subject: use a custom request class to determine the controller class

controller class resolution has been moved to the request object, so we
should override that method instead of relying on the RouteSet to
generate the controller class.
---
 actionpack/test/abstract_unit.rb | 44 +++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 23 deletions(-)

(limited to 'actionpack/test/abstract_unit.rb')

diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 7ea4249e7e..c8f4c68ed0 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -323,39 +323,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
-- 
cgit v1.2.3