Fix routes with :controller segment when namespaced [#5034 state:resolved]

1 files changed, 19 insertions, 5 deletions

diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index 26bd641cd6..1bfc92aa3d 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -310,11 +310,6 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
         match '/' => 'mes#index'
       end
 
-      namespace :private do
-        root :to => redirect('/private/index')
-        match "index", :to => 'private#index'
-      end
-
       get "(/:username)/followers" => "followers#index"
       get "/groups(/user/:username)" => "groups#index"
       get "(/user/:username)/photos" => "photos#index"
@@ -348,6 +343,12 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
         end
       end
 
+      namespace :private do
+        root :to => redirect('/private/index')
+        match "index", :to => 'private#index'
+        match ":controller(/:action(/:id))"
+      end
+
       match '/:locale/*file.:format', :to => 'files#show', :file => /path\/to\/existing\/file/
     end
   end
@@ -470,6 +471,19 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     end
   end
 
+  def test_namespace_with_controller_segment
+    with_test_routes do
+      get '/private/foo'
+      assert_equal 'private/foo#index', @response.body
+
+      get '/private/foo/bar'
+      assert_equal 'private/foo#bar', @response.body
+
+      get '/private/foo/bar/1'
+      assert_equal 'private/foo#bar', @response.body
+    end
+  end
+
   def test_session_singleton_resource
     with_test_routes do
       get '/session'