diff options
| author | Andrew White <pixeltrix@users.noreply.github.com> | 2015-09-20 16:51:34 +0100 |
|---|---|---|
| committer | Andrew White <pixeltrix@users.noreply.github.com> | 2015-09-20 16:51:34 +0100 |
| commit | 06ac63b4c602e4b26cb3bfbf0dfd2bed8b00e786 (patch) | |
| tree | 1ae763b69121bcec2ada22bc13143a77e1713100 | |
| parent | 11807877fa597f40866dbe74219c0093586d19f2 (diff) | |
| parent | 2e8146909a08d802f6fb138e666593d7a0887d18 (diff) | |
| download | rails-06ac63b4c602e4b26cb3bfbf0dfd2bed8b00e786.tar.gz rails-06ac63b4c602e4b26cb3bfbf0dfd2bed8b00e786.tar.bz2 rails-06ac63b4c602e4b26cb3bfbf0dfd2bed8b00e786.zip | |
Merge pull request #21689 from y-yagi/fix_application_controller_require_dependency_path
fix application_controller require_dependency path generated by the scaffold generator
| -rw-r--r-- | railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb | 2 | ||||
| -rw-r--r-- | railties/test/generators/namespaced_generators_test.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb b/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb index 2c3b04043f..f73e9a96ba 100644 --- a/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb +++ b/railties/lib/rails/generators/rails/scaffold_controller/templates/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 e839b67960..c4ee6602c5 100644 --- a/railties/test/generators/namespaced_generators_test.rb +++ b/railties/test/generators/namespaced_generators_test.rb @@ -281,6 +281,7 @@ class NamespacedScaffoldGeneratorTest < NamespacedGeneratorTestCase # 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", |