Fix namespaced redirects [#4389 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>

2 files changed, 15 insertions, 1 deletions

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index e001d10c0f..67a629036b 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -55,7 +55,7 @@ module ActionDispatch
               path = args.first
             end
 
-            if @scope[:module] && options[:to]
+            if @scope[:module] && options[:to] && !options[:to].is_a?(Proc)
               if options[:to].to_s.include?("#")
                 options[:to] = "#{@scope[:module]}/#{options[:to]}"
               elsif @scope[:controller].nil?
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index 58a1fa0518..8f43b5f934 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -300,6 +300,11 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
         match '/' => 'mes#index'
       end
 
+      namespace :private do
+        root :to => redirect('/private/index')
+        match "index", :to => 'private#index'
+      end
+
       match "whatever/:controller(/:action(/:id))"
 
       resource :profile do
@@ -421,6 +426,15 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     end
   end
 
+  def test_namespace_redirect
+    with_test_routes do
+      get '/private'
+      assert_equal 301, @response.status
+      assert_equal 'http://www.example.com/private/index', @response.headers['Location']
+      assert_equal 'Moved Permanently', @response.body
+    end
+  end
+
   def test_session_singleton_resource
     with_test_routes do
       get '/session'