kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #21689 from y-yagi/fix_application_controller_require_dependency_path

Browse source 
fix application_controller require_dependency path generated by the scaffold generator
This commit is contained in:
Andrew White 2015-09-20 16:51:34 +01:00
commit 06ac63b4c6
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
View file

@ -1,5 +1,5 @@
<% if namespaced? -%>
require_dependency "<%= namespaced_file_path %>/application_controller"
require_dependency "<%= namespaced_path %>/application_controller"
<% end -%>
<% module_namespacing do -%>

1
railties/test/generators/namespaced_generators_test.rb
View file

@ -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",