提交 feac3e97 编写于 作者: E Eugene Kenny

Trigger load hooks with require in configuration tests

I introduced this pattern of referencing a constant to trigger lazy load
hooks in 458a5502, and it arrived at its
current form via c98a641f and
c24be369.

I now realise autoloading doesn't need to be involved at all; we can
require the files that trigger the lazy load hooks directly.
上级 b5f47f75
......@@ -1363,8 +1363,8 @@ def create
app "development"
force_lazy_load_hooks { ActionController::Base }
force_lazy_load_hooks { ActionController::API }
require "action_controller/base"
require "action_controller/api"
assert_equal :raise, ActionController::Parameters.action_on_unpermitted_parameters
......@@ -1375,8 +1375,8 @@ def create
test "config.action_controller.always_permitted_parameters are: controller, action by default" do
app "development"
force_lazy_load_hooks { ActionController::Base }
force_lazy_load_hooks { ActionController::API }
require "action_controller/base"
require "action_controller/api"
assert_equal %w(controller action), ActionController::Parameters.always_permitted_parameters
end
......@@ -1388,8 +1388,8 @@ def create
app "development"
force_lazy_load_hooks { ActionController::Base }
force_lazy_load_hooks { ActionController::API }
require "action_controller/base"
require "action_controller/api"
assert_equal %w( controller action format ), ActionController::Parameters.always_permitted_parameters
end
......@@ -1413,8 +1413,8 @@ def create
app "development"
force_lazy_load_hooks { ActionController::Base }
force_lazy_load_hooks { ActionController::API }
require "action_controller/base"
require "action_controller/api"
assert_equal :raise, ActionController::Parameters.action_on_unpermitted_parameters
......@@ -1425,8 +1425,8 @@ def create
test "config.action_controller.action_on_unpermitted_parameters is :log by default in development" do
app "development"
force_lazy_load_hooks { ActionController::Base }
force_lazy_load_hooks { ActionController::API }
require "action_controller/base"
require "action_controller/api"
assert_equal :log, ActionController::Parameters.action_on_unpermitted_parameters
end
......@@ -1434,8 +1434,8 @@ def create
test "config.action_controller.action_on_unpermitted_parameters is :log by default in test" do
app "test"
force_lazy_load_hooks { ActionController::Base }
force_lazy_load_hooks { ActionController::API }
require "action_controller/base"
require "action_controller/api"
assert_equal :log, ActionController::Parameters.action_on_unpermitted_parameters
end
......@@ -1443,8 +1443,8 @@ def create
test "config.action_controller.action_on_unpermitted_parameters is false by default in production" do
app "production"
force_lazy_load_hooks { ActionController::Base }
force_lazy_load_hooks { ActionController::API }
require "action_controller/base"
require "action_controller/api"
assert_equal false, ActionController::Parameters.action_on_unpermitted_parameters
end
......@@ -1463,8 +1463,9 @@ def create
app "development"
force_lazy_load_hooks { ActionController::Base }
force_lazy_load_hooks { ActionController::API }
require "action_controller/base"
require "action_controller/api"
assert_equal true, ActionController::Parameters.permit_all_parameters
end
......@@ -1475,8 +1476,9 @@ def create
app "development"
force_lazy_load_hooks { ActionController::Base }
force_lazy_load_hooks { ActionController::API }
require "action_controller/base"
require "action_controller/api"
assert_equal [], ActionController::Parameters.always_permitted_parameters
end
......@@ -1487,8 +1489,9 @@ def create
app "development"
force_lazy_load_hooks { ActionController::Base }
force_lazy_load_hooks { ActionController::API }
require "action_controller/base"
require "action_controller/api"
assert_equal :raise, ActionController::Parameters.action_on_unpermitted_parameters
end
......@@ -2535,10 +2538,6 @@ class MyLogger < ::Logger
end
private
def force_lazy_load_hooks
yield # Tasty clarifying sugar, homie! We only need to reference a constant to load it.
end
def set_custom_config(contents, config_source = "custom".inspect)
app_file "config/custom.yml", contents
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册