mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Remove require_dependency from controller templates
This commit is contained in:
parent
f4c51e8660
commit
38715aaf9b
4 changed files with 1 additions and 19 deletions
|
@ -1,7 +1,3 @@
|
||||||
<% if namespaced? -%>
|
|
||||||
require_dependency "<%= namespaced_path %>/application_controller"
|
|
||||||
|
|
||||||
<% end -%>
|
|
||||||
<% module_namespacing do -%>
|
<% module_namespacing do -%>
|
||||||
class <%= class_name %>Controller < ApplicationController
|
class <%= class_name %>Controller < ApplicationController
|
||||||
<% actions.each do |action| -%>
|
<% actions.each do |action| -%>
|
||||||
|
|
|
@ -1,7 +1,3 @@
|
||||||
<% if namespaced? -%>
|
|
||||||
require_dependency "<%= namespaced_path %>/application_controller"
|
|
||||||
|
|
||||||
<% end -%>
|
|
||||||
<% module_namespacing do -%>
|
<% module_namespacing do -%>
|
||||||
class <%= controller_class_name %>Controller < ApplicationController
|
class <%= controller_class_name %>Controller < ApplicationController
|
||||||
before_action :set_<%= singular_table_name %>, only: %i[ show update destroy ]
|
before_action :set_<%= singular_table_name %>, only: %i[ show update destroy ]
|
||||||
|
|
|
@ -1,7 +1,3 @@
|
||||||
<% if namespaced? -%>
|
|
||||||
require_dependency "<%= namespaced_path %>/application_controller"
|
|
||||||
|
|
||||||
<% end -%>
|
|
||||||
<% module_namespacing do -%>
|
<% module_namespacing do -%>
|
||||||
class <%= controller_class_name %>Controller < ApplicationController
|
class <%= controller_class_name %>Controller < ApplicationController
|
||||||
before_action :set_<%= singular_table_name %>, only: %i[ show edit update destroy ]
|
before_action :set_<%= singular_table_name %>, only: %i[ show edit update destroy ]
|
||||||
|
|
|
@ -25,7 +25,6 @@ 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_dependency "test_app\/application_controller"/,
|
|
||||||
/module TestApp/,
|
/module TestApp/,
|
||||||
/ class AccountController < ApplicationController/
|
/ class AccountController < ApplicationController/
|
||||||
|
|
||||||
|
@ -42,9 +41,7 @@ class NamespacedControllerGeneratorTest < NamespacedGeneratorTestCase
|
||||||
|
|
||||||
def test_namespaced_controller_with_additional_namespace
|
def test_namespaced_controller_with_additional_namespace
|
||||||
run_generator ["admin/account"]
|
run_generator ["admin/account"]
|
||||||
assert_file "app/controllers/test_app/admin/account_controller.rb", /module TestApp/, / class Admin::AccountController < ApplicationController/ do |contents|
|
assert_file "app/controllers/test_app/admin/account_controller.rb", /module TestApp/, / class Admin::AccountController < ApplicationController/
|
||||||
assert_match %r(require_dependency "test_app/application_controller"), contents
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_helper_is_also_namespaced
|
def test_helper_is_also_namespaced
|
||||||
|
@ -216,7 +213,6 @@ 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_dependency "test_app\/application_controller"/,
|
|
||||||
/module TestApp/,
|
/module TestApp/,
|
||||||
/class ProductLinesController < ApplicationController/
|
/class ProductLinesController < ApplicationController/
|
||||||
|
|
||||||
|
@ -284,7 +280,6 @@ class NamespacedScaffoldGeneratorTest < NamespacedGeneratorTestCase
|
||||||
# Controller
|
# Controller
|
||||||
assert_file "app/controllers/test_app/admin/roles_controller.rb" do |content|
|
assert_file "app/controllers/test_app/admin/roles_controller.rb" do |content|
|
||||||
assert_match(/module TestApp\n class Admin::RolesController < ApplicationController/, content)
|
assert_match(/module TestApp\n class Admin::RolesController < ApplicationController/, content)
|
||||||
assert_match(%r(require_dependency "test_app/application_controller"), content)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
assert_file "test/controllers/test_app/admin/roles_controller_test.rb",
|
assert_file "test/controllers/test_app/admin/roles_controller_test.rb",
|
||||||
|
@ -418,7 +413,6 @@ class NamespacedScaffoldGeneratorTest < NamespacedGeneratorTestCase
|
||||||
# Controller
|
# Controller
|
||||||
assert_file "app/controllers/test_app/admin/roles_controller.rb" do |content|
|
assert_file "app/controllers/test_app/admin/roles_controller.rb" do |content|
|
||||||
assert_match(/module TestApp\n class Admin::RolesController < ApplicationController/, content)
|
assert_match(/module TestApp\n class Admin::RolesController < ApplicationController/, content)
|
||||||
assert_match(%r(require_dependency "test_app/application_controller"), content)
|
|
||||||
end
|
end
|
||||||
assert_file "test/controllers/test_app/admin/roles_controller_test.rb",
|
assert_file "test/controllers/test_app/admin/roles_controller_test.rb",
|
||||||
/module TestApp\n class Admin::RolesControllerTest < ActionDispatch::IntegrationTest/
|
/module TestApp\n class Admin::RolesControllerTest < ActionDispatch::IntegrationTest/
|
||||||
|
|
Loading…
Reference in a new issue