Skip to content
This repository was archived by the owner on Nov 30, 2024. It is now read-only.

Commit 1079555

Browse files
committed
Declare explicit scope and meta arguments.
This will make it easier to use these bits individually.
1 parent 25821d9 commit 1079555

File tree

1 file changed

+14
-15
lines changed

1 file changed

+14
-15
lines changed

lib/rspec/core/configuration.rb

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1569,9 +1569,9 @@ def apply_derived_metadata_to(metadata)
15691569
# @see #prepend_before
15701570
# @see #after
15711571
# @see #append_after
1572-
def before(*args, &block)
1573-
handle_suite_hook(args, @before_suite_hooks, :push,
1574-
Hooks::BeforeHook, block) || super(*args, &block)
1572+
def before(scope=nil, *meta, &block)
1573+
handle_suite_hook(scope, meta, @before_suite_hooks, :push,
1574+
Hooks::BeforeHook, block) || super(scope, *meta, &block)
15751575
end
15761576
alias_method :append_before, :before
15771577

@@ -1588,9 +1588,9 @@ def before(*args, &block)
15881588
# @see #before
15891589
# @see #after
15901590
# @see #append_after
1591-
def prepend_before(*args, &block)
1592-
handle_suite_hook(args, @before_suite_hooks, :unshift,
1593-
Hooks::BeforeHook, block) || super(*args, &block)
1591+
def prepend_before(scope=nil, *meta, &block)
1592+
handle_suite_hook(scope, meta, @before_suite_hooks, :unshift,
1593+
Hooks::BeforeHook, block) || super(scope, *meta, &block)
15941594
end
15951595

15961596
# Defines a `after` hook. See {Hooks#after} for full docs.
@@ -1602,9 +1602,9 @@ def prepend_before(*args, &block)
16021602
# @see #append_after
16031603
# @see #before
16041604
# @see #prepend_before
1605-
def after(*args, &block)
1606-
handle_suite_hook(args, @after_suite_hooks, :unshift,
1607-
Hooks::AfterHook, block) || super(*args, &block)
1605+
def after(scope=nil, *meta, &block)
1606+
handle_suite_hook(scope, meta, @after_suite_hooks, :unshift,
1607+
Hooks::AfterHook, block) || super(scope, *meta, &block)
16081608
end
16091609
alias_method :prepend_after, :after
16101610

@@ -1621,9 +1621,9 @@ def after(*args, &block)
16211621
# @see #append_after
16221622
# @see #before
16231623
# @see #prepend_before
1624-
def append_after(*args, &block)
1625-
handle_suite_hook(args, @after_suite_hooks, :push,
1626-
Hooks::AfterHook, block) || super(*args, &block)
1624+
def append_after(scope=nil, *meta, &block)
1625+
handle_suite_hook(scope, meta, @after_suite_hooks, :push,
1626+
Hooks::AfterHook, block) || super(scope, *meta, &block)
16271627
end
16281628

16291629
# @private
@@ -1660,11 +1660,10 @@ def on_example_group_definition_callbacks
16601660

16611661
private
16621662

1663-
def handle_suite_hook(args, collection, append_or_prepend, hook_type, block)
1664-
scope, meta = *args
1663+
def handle_suite_hook(scope, meta, collection, append_or_prepend, hook_type, block)
16651664
return nil unless scope == :suite
16661665

1667-
if meta
1666+
unless meta.empty?
16681667
# TODO: in RSpec 4, consider raising an error here.
16691668
# We warn only for backwards compatibility.
16701669
RSpec.warn_with "WARNING: `:suite` hooks do not support metadata since " \

0 commit comments

Comments
 (0)