提交 e15583c3 编写于 作者: A Alberto Almagro

Pass missing name attribute to execute_hook

Fixes commit 10bf93ef created to solve issue #30025
上级 00a47d58
......@@ -40,7 +40,7 @@ def self.extended(base) # :nodoc:
# * <tt>:run_once</tt> - Given +block+ will run only once.
def on_load(name, options = {}, &block)
@loaded[name].each do |base|
execute_hook(base, options, block)
execute_hook(name, base, options, block)
end
@load_hooks[name] << [block, options]
......@@ -49,7 +49,7 @@ def on_load(name, options = {}, &block)
def run_load_hooks(name, base = Object)
@loaded[name] << base
@load_hooks[name].each do |hook, options|
execute_hook(base, options, hook)
execute_hook(name, base, options, hook)
end
end
......@@ -63,7 +63,7 @@ def with_execution_control(name, block, once)
end
end
def execute_hook(base, options, block)
def execute_hook(name, base, options, block)
with_execution_control(name, block, options[:run_once]) do
if options[:yield]
block.call(base)
......
......@@ -22,14 +22,19 @@ def test_basic_hook_with_two_registrations
def test_basic_hook_with_two_registrations_only_once
i = 0
ActiveSupport.on_load(:basic_hook_with_two_once, run_once: true) do
block = proc { i += incr }
ActiveSupport.on_load(:basic_hook_with_two_once, run_once: true, &block)
ActiveSupport.on_load(:basic_hook_with_two_once) do
i += incr
end
assert_equal 0, i
ActiveSupport.run_load_hooks(:basic_hook_with_two_once, FakeContext.new(2))
ActiveSupport.on_load(:different_hook, run_once: true, &block)
ActiveSupport.run_load_hooks(:different_hook, FakeContext.new(2))
assert_equal 2, i
ActiveSupport.run_load_hooks(:basic_hook_with_two_once, FakeContext.new(2))
assert_equal 6, i
ActiveSupport.run_load_hooks(:basic_hook_with_two_once, FakeContext.new(5))
assert_equal 2, i
assert_equal 11, i
end
def test_hook_registered_after_run
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册