Cleanup contextual arguments

This commit is contained in:
Michael Miller 2018-09-07 18:20:54 -06:00
parent 27e3f00d70
commit aa1764d972
2 changed files with 5 additions and 5 deletions

View file

@ -9,7 +9,7 @@ module Spectator
macro describe(what, source_file = __FILE__, source_line = __LINE__, &block) macro describe(what, source_file = __FILE__, source_line = __LINE__, &block)
module Spectator module Spectator
module Examples module Examples
DSL.describe({{what}}, {{source_file}}, {{source_line}}) {{block}} DSL.describe({{what}}) {{block}}
end end
end end
end end

View file

@ -2,11 +2,11 @@ require "./example_group"
module Spectator module Spectator
module DSL module DSL
macro describe(what, source_file = __FILE__, source_line = __LINE__, type = "Describe", &block) macro describe(what, type = "Describe", source_file = __FILE__, source_line = __LINE__, &block)
context({{what}}, {{source_file}}, {{source_line}}, {{type}}) {{block}} context({{what}}, {{type}}) {{block}}
end end
macro context(what, source_file = __FILE__, source_line = __LINE__, type = "Context", &block) macro context(what, type = "Context", source_file = __FILE__, source_line = __LINE__, &block)
{% safe_name = what.id.stringify.gsub(/\W+/, "_") %} {% safe_name = what.id.stringify.gsub(/\W+/, "_") %}
{% module_name = (type.id + safe_name.camelcase).id %} {% module_name = (type.id + safe_name.camelcase).id %}
{% context_module = CONTEXT_MODULE %} {% context_module = CONTEXT_MODULE %}
@ -108,7 +108,7 @@ module Spectator
end end
macro given(collection, source_file = __FILE__, source_line = __LINE__, &block) macro given(collection, source_file = __FILE__, source_line = __LINE__, &block)
context({{collection}}, {{source_file}}, {{source_line}}, "Given") do context({{collection}}, "Given") do
{% var_name = block.args.empty? ? "value" : block.args.first %} {% var_name = block.args.empty? ? "value" : block.args.first %}
{% if GIVEN_VARIABLES.find { |v| v[0].id == var_name.id } %} {% if GIVEN_VARIABLES.find { |v| v[0].id == var_name.id } %}
{% raise "Duplicate given variable name \"#{var_name.id}\"" %} {% raise "Duplicate given variable name \"#{var_name.id}\"" %}