1 files changed, 29 insertions, 22 deletions

diff --git a/actionpack/test/journey/router_test.rb b/actionpack/test/journey/router_test.rb
index 9a8d644f7b..1a2106a3c5 100644
--- a/actionpack/test/journey/router_test.rb
+++ b/actionpack/test/journey/router_test.rb
@@ -5,23 +5,22 @@ module ActionDispatch
   module Journey
     class TestRouter < ActiveSupport::TestCase
       # TODO : clean up routing tests so we don't need this hack
-      class StubDispatcher < Routing::RouteSet::Dispatcher; end
+      class StubDispatcher < Routing::RouteSet::Dispatcher
+        def initialize
+          super({})
+        end
+        def dispatcher?; true; end
+      end
 
       attr_reader :routes
 
       def setup
         @app       = StubDispatcher.new
         @routes    = Routes.new
-        @router    = Router.new(@routes, {})
+        @router    = Router.new(@routes)
         @formatter = Formatter.new(@routes)
       end
 
-      def test_request_class_reader
-        klass = Object.new
-        router = Router.new(routes, :request_class => klass)
-        assert_equal klass, router.request_class
-      end
-
       class FakeRequestFeeler < Struct.new(:env, :called)
         def new env
           self.env = env
@@ -39,7 +38,7 @@ module ActionDispatch
       end
 
       def test_dashes
-        router = Router.new(routes, {})
+        router = Router.new(routes)
 
         exp = Router::Strexp.new '/foo-bar-baz', {}, ['/.?']
         path  = Path::Pattern.new exp
@@ -55,7 +54,7 @@ module ActionDispatch
       end
 
       def test_unicode
-        router = Router.new(routes, {})
+        router = Router.new(routes)
 
         #match the escaped version of /ほげ
         exp = Router::Strexp.new '/%E3%81%BB%E3%81%92', {}, ['/.?']
@@ -73,7 +72,7 @@ module ActionDispatch
 
       def test_request_class_and_requirements_success
         klass  = FakeRequestFeeler.new nil
-        router = Router.new(routes, {:request_class => klass })
+        router = Router.new(routes)
 
         requirements = { :hello => /world/ }
 
@@ -82,7 +81,7 @@ module ActionDispatch
 
         routes.add_route nil, path, requirements, {:id => nil}, {}
 
-        env = rails_env 'PATH_INFO' => '/foo/10'
+        env = rails_env({'PATH_INFO' => '/foo/10'}, klass)
         router.recognize(env) do |r, params|
           assert_equal({:id => '10'}, params)
         end
@@ -93,7 +92,7 @@ module ActionDispatch
 
       def test_request_class_and_requirements_fail
         klass  = FakeRequestFeeler.new nil
-        router = Router.new(routes, {:request_class => klass })
+        router = Router.new(routes)
 
         requirements = { :hello => /mom/ }
 
@@ -102,7 +101,7 @@ module ActionDispatch
 
         router.routes.add_route nil, path, requirements, {:id => nil}, {}
 
-        env = rails_env 'PATH_INFO' => '/foo/10'
+        env = rails_env({'PATH_INFO' => '/foo/10'}, klass)
         router.recognize(env) do |r, params|
           flunk 'route should not be found'
         end
@@ -111,21 +110,26 @@ module ActionDispatch
         assert_equal env.env, klass.env
       end
 
-      class CustomPathRequest < Router::NullReq
+      class CustomPathRequest < ActionDispatch::Request
         def path_info
           env['custom.path_info']
         end
+
+        def path_info=(x)
+          env['custom.path_info'] = x
+        end
       end
 
       def test_request_class_overrides_path_info
-        router = Router.new(routes, {:request_class => CustomPathRequest })
+        router = Router.new(routes)
 
         exp = Router::Strexp.new '/bar', {}, ['/.?']
         path = Path::Pattern.new exp
 
         routes.add_route nil, path, {}, {}, {}
 
-        env = rails_env 'PATH_INFO' => '/foo', 'custom.path_info' => '/bar'
+        env = rails_env({'PATH_INFO' => '/foo',
+                         'custom.path_info' => '/bar'}, CustomPathRequest)
 
         recognized = false
         router.recognize(env) do |r, params|
@@ -207,20 +211,23 @@ module ActionDispatch
 
       def test_X_Cascade
         add_routes @router, [ "/messages(.:format)" ]
-        resp = @router.call({ 'REQUEST_METHOD' => 'GET', 'PATH_INFO' => '/lol' })
+        resp = @router.serve(rails_env({ 'REQUEST_METHOD' => 'GET', 'PATH_INFO' => '/lol' }))
         assert_equal ['Not Found'], resp.last
         assert_equal 'pass', resp[1]['X-Cascade']
         assert_equal 404, resp.first
       end
 
       def test_clear_trailing_slash_from_script_name_on_root_unanchored_routes
+        route_set = Routing::RouteSet.new
+        mapper = Routing::Mapper.new route_set
+
         strexp = Router::Strexp.new("/", {}, ['/', '.', '?'], false)
         path   = Path::Pattern.new strexp
         app    = lambda { |env| [200, {}, ['success!']] }
-        @router.routes.add_route(app, path, {}, {}, {})
+        mapper.get '/weblog', :to => app
 
         env  = rack_env('SCRIPT_NAME' => '', 'PATH_INFO' => '/weblog')
-        resp = @router.call(env)
+        resp = route_set.call env
         assert_equal ['success!'], resp.last
         assert_equal '', env['SCRIPT_NAME']
       end
@@ -561,8 +568,8 @@ module ActionDispatch
 
       RailsEnv = Struct.new(:env)
 
-      def rails_env env
-        RailsEnv.new rack_env env
+      def rails_env env, klass = ActionDispatch::Request
+        klass.new env
       end
 
       def rack_env env