From 69f28a7d8dfc018b948d9f70fc65a8a1b7735b8f Mon Sep 17 00:00:00 2001
From: Yves Senn <yves.senn@gmail.com>
Date: Wed, 23 Jan 2013 09:31:16 +0100
Subject: ruby constant syntax is not supported as routing `:controller`
 option.

The current implementation only works correctly if you supply the `:controller`
with directory notation (eg. `:controller => 'admin/posts'`).

The ruby constant notation (eg. `:controller => 'Admin::Posts`) leads to unexpected problems with `url_for`.

This patch prints a warning for every non supported `:controller` option. I also added documentation how
to work with namespaced controllers. The warning links to that documentation in the rails guide.
---
 actionpack/test/dispatch/routing_test.rb | 49 ++++++++++++++++++++++++++------
 1 file changed, 40 insertions(+), 9 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index 9f31ce8127..fb1b8526d0 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -2833,21 +2833,52 @@ class TestNamespaceWithControllerOption < ActionDispatch::IntegrationTest
     end
   end
 
-  DefaultScopeRoutes = ActionDispatch::Routing::RouteSet.new
-  DefaultScopeRoutes.draw do
-    namespace :admin do
-      resources :storage_files, :controller => "StorageFiles"
-    end
+  def draw(&block)
+    @app = ActionDispatch::Routing::RouteSet.new
+    @app.draw(&block)
   end
 
-  def app
-    DefaultScopeRoutes
-  end
+  def test_valid_controller_options_inside_namespace
+    draw do
+      namespace :admin do
+        resources :storage_files, :controller => "storage_files"
+      end
+    end
 
-  def test_controller_options
     get '/admin/storage_files'
     assert_equal "admin/storage_files#index", @response.body
   end
+
+  def test_resources_with_valid_namespaced_controller_option
+    draw do
+      resources :storage_files, :controller => 'admin/storage_files'
+    end
+
+    get 'storage_files'
+    assert_equal "admin/storage_files#index", @response.body
+  end
+
+  def test_warn_with_ruby_constant_syntax_controller_option
+    e = assert_raise(ArgumentError) do
+      draw do
+        namespace :admin do
+          resources :storage_files, :controller => "StorageFiles"
+        end
+      end
+    end
+
+    assert_match "'admin/StorageFiles' is not a supported controller name", e.message
+  end
+
+  def test_warn_with_ruby_constant_syntax_namespaced_controller_option
+    e = assert_raise(ArgumentError) do
+      draw do
+        resources :storage_files, :controller => 'Admin::StorageFiles'
+      end
+    end
+
+    assert_match "'Admin::StorageFiles' is not a supported controller name", e.message
+  end
 end
 
 class TestDefaultScope < ActionDispatch::IntegrationTest
-- 
cgit v1.2.3