Route to the full namespaced resource when generating a controller.

For example: rails generate controller foo/bar index should generate: get 'foo/bar/index' previously it generated: get 'bar/index'
parndt · Aug 22, 2012 · 2fa841a · 2fa841a
1 parent d5fe242
commit 2fa841a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/railties/lib/rails/generators/rails/controller/controller_generator.rb b/railties/lib/rails/generators/rails/controller/controller_generator.rb
@@ -9,8 +9,9 @@ def create_controller_files
       end
 
       def add_routes
+        route_path = (class_path | [file_name]).join '/'
         actions.reverse.each do |action|
-          route %{get "#{file_name}/#{action}"}
+          route %{get "#{route_path}/#{action}"}
         end
       end
 

diff --git a/railties/test/generators/namespaced_generators_test.rb b/railties/test/generators/namespaced_generators_test.rb
@@ -60,7 +60,8 @@ def test_invokes_default_template_engine
 
   def test_routes_should_not_be_namespaced
     run_generator
-    assert_file "config/routes.rb", /get "account\/foo"/, /get "account\/bar"/
+    assert_file "config/routes.rb", /get "test_app\/account\/foo"/,
+                                    /get "test_app\/account\/bar"/
   end
 #
   def test_invokes_default_template_engine_even_with_no_action