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

Use require_dependency in generated controllers

Browse source 
Using require in development mode will prevent required files from
reloading, even if they're changed. In order to keep namespaced
application_controller reloadable, we need to use require_dependency
instead of require.
This commit is contained in:
Piotr Sarnacki 2012-05-22 01:40:51 -07:00
parent d22859ed97
commit 29d17d3ab6
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

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

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

@ -21,7 +21,7 @@ class NamespacedControllerGeneratorTest < NamespacedGeneratorTestCase
def test_namespaced_controller_skeleton_is_created def test_namespaced_controller_skeleton_is_created
run_generator run_generator
assert_file "app/controllers/test_app/account_controller.rb", assert_file "app/controllers/test_app/account_controller.rb",
/require "test_app\/application_controller"/, /require_dependency "test_app\/application_controller"/,
/module TestApp/, /module TestApp/,
/ class AccountController < ApplicationController/ / class AccountController < ApplicationController/
@ -234,7 +234,7 @@ class NamespacedScaffoldGeneratorTest < NamespacedGeneratorTestCase
# Controller # Controller
assert_file "app/controllers/test_app/product_lines_controller.rb", assert_file "app/controllers/test_app/product_lines_controller.rb",
/require "test_app\/application_controller"/, /require_dependency "test_app\/application_controller"/,
/module TestApp/, /module TestApp/,
/class ProductLinesController < ApplicationController/ /class ProductLinesController < ApplicationController/