Merge pull request #22222 from y-yagi/fix_application_controller_require_dependency_path_in_api

fix application_controller require_dependency path generated by api scaffold generator

2 files changed, 25 insertions, 1 deletions

diff --git a/railties/lib/rails/generators/rails/scaffold_controller/templates/api_controller.rb b/railties/lib/rails/generators/rails/scaffold_controller/templates/api_controller.rb
index bc3c9b3f6b..17a86f376b 100644
--- a/railties/lib/rails/generators/rails/scaffold_controller/templates/api_controller.rb
+++ b/railties/lib/rails/generators/rails/scaffold_controller/templates/api_controller.rb
@@ -1,5 +1,5 @@
 <% if namespaced? -%>
-require_dependency "<%= namespaced_file_path %>/application_controller"
+require_dependency "<%= namespaced_path %>/application_controller"
 
 <% end -%>
 <% module_namespacing do -%>
diff --git a/railties/test/generators/namespaced_generators_test.rb b/railties/test/generators/namespaced_generators_test.rb
index c4ee6602c5..590f06e19a 100644
--- a/railties/test/generators/namespaced_generators_test.rb
+++ b/railties/test/generators/namespaced_generators_test.rb
@@ -396,4 +396,28 @@ class NamespacedScaffoldGeneratorTest < NamespacedGeneratorTestCase
     # Stylesheets (should not be removed)
     assert_file "app/assets/stylesheets/scaffold.css"
   end
+
+  def test_api_scaffold_with_namespace_on_invoke
+    run_generator [ "admin/role", "name:string", "description:string", "--api" ]
+
+    # Model
+    assert_file "app/models/test_app/admin.rb", /module TestApp\n  module Admin/
+    assert_file "app/models/test_app/admin/role.rb", /module TestApp\n  class Admin::Role < ActiveRecord::Base/
+    assert_file "test/models/test_app/admin/role_test.rb", /module TestApp\n  class Admin::RoleTest < ActiveSupport::TestCase/
+    assert_file "test/fixtures/test_app/admin/roles.yml"
+    assert_migration "db/migrate/create_test_app_admin_roles.rb"
+
+    # Route
+    assert_file "config/routes.rb" do |route|
+      assert_match(/^  namespace :admin do\n    resources :roles\n  end$/, route)
+    end
+
+    # Controller
+    assert_file "app/controllers/test_app/admin/roles_controller.rb" do |content|
+      assert_match(/module TestApp\n  class Admin::RolesController < ApplicationController/, content)
+      assert_match(%r(require_dependency "test_app/application_controller"), content)
+    end
+    assert_file "test/controllers/test_app/admin/roles_controller_test.rb",
+                /module TestApp\n  class Admin::RolesControllerTest < ActionController::TestCase/
+  end
 end