Shorten pre and post usage

This commit is contained in:
Michael Miller 2019-01-23 14:46:15 -07:00
parent ed8fad2c97
commit 37c45eb285
2 changed files with 14 additions and 14 deletions

View file

@ -1,34 +1,34 @@
require "./spec_helper"
describe Spectator::ExampleConditions do
{% for condition in %i[pre_condition post_condition] %}
describe "#run_{{condition.id}}s" do
{% for condition in %i[pre post] %}
describe "#run_{{condition.id}}_conditions" do
it "calls a proc" do
called = false
conditions = new_conditions({{condition.id}}: ->{ called = true; nil })
conditions.run_{{condition.id}}s
conditions.run_{{condition.id}}_conditions
called.should be_true
end
it "calls multiple procs" do
call_count = 0
conditions = new_conditions({{condition.id}}s: [
conditions = new_conditions({{condition.id}}: [
->{ call_count += 1; nil },
->{ call_count += 2; nil },
->{ call_count += 3; nil },
])
conditions.run_{{condition.id}}s
conditions.run_{{condition.id}}_conditions
call_count.should eq(6)
end
it "calls procs in the correct order" do
calls = [] of Symbol
conditions = new_conditions({{condition.id}}s: [
conditions = new_conditions({{condition.id}}: [
->{ calls << :a; nil },
->{ calls << :b; nil },
->{ calls << :c; nil },
])
conditions.run_{{condition.id}}s
conditions.run_{{condition.id}}_conditions
calls.should eq(\%i[a b c])
end
end

View file

@ -38,10 +38,10 @@ end
# only specify the sets of conditions that are needed.
# The conditions that aren't specified will be left empty.
def new_conditions(
pre_conditions = [] of ->,
post_conditions = [] of ->
pre = [] of ->,
post = [] of ->
)
Spectator::ExampleConditions.new(pre_conditions, post_conditions)
Spectator::ExampleConditions.new(pre, post)
end
# Creates a new `Spectator::ExampleConditions` instance.
@ -49,11 +49,11 @@ end
# only specify a condition for the types that are needed.
# The conditions that aren't specified will be left empty.
def new_conditions(
pre_condition : Proc(Nil)? = nil,
post_condition : Proc(Nil)? = nil
pre : Proc(Nil)? = nil,
post : Proc(Nil)? = nil
)
new_conditions(
pre_condition ? [pre_condition] : [] of ->,
post_condition ? [post_condition] : [] of ->
pre ? [pre] : [] of ->,
post ? [post] : [] of ->
)
end