mirror of
https://github.com/Shopify/liquid.git
synced 2026-10-03 09:05:13 -07:00
tests passing
This commit is contained in:
@@ -69,15 +69,16 @@ module Liquid
|
|||||||
# Inline snippets take precedence over external snippets
|
# Inline snippets take precedence over external snippets
|
||||||
if (inline_snippet = context.registers[:inline_snippet][template_name])
|
if (inline_snippet = context.registers[:inline_snippet][template_name])
|
||||||
inner_context = context.new_isolated_subcontext
|
inner_context = context.new_isolated_subcontext
|
||||||
# binding.irb
|
|
||||||
snippet_body = inline_snippet[:body]
|
snippet_body = inline_snippet[:body]
|
||||||
snippet_args = inline_snippet[:args]
|
snippet_args = inline_snippet[:args]
|
||||||
|
|
||||||
# Validate and set the arguments in the inner context
|
# Validate and set the arguments in the inner context
|
||||||
@attributes.each do |key, value|
|
@attributes.each do |key, value|
|
||||||
if snippet_args.include?(key)
|
unless snippet_args.include?(key)
|
||||||
inner_context[key] = context.evaluate(value)
|
raise Liquid::ArgumentError, "Invalid argument `#{key}` for snippet `#{template_name}`"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
inner_context[key] = context.evaluate(value)
|
||||||
end
|
end
|
||||||
|
|
||||||
return output << snippet_body.render(inner_context)
|
return output << snippet_body.render(inner_context)
|
||||||
|
|||||||
@@ -104,6 +104,31 @@ class SnippetTest < Minitest::Test
|
|||||||
assert_template_result(expected, template)
|
assert_template_result(expected, template)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def test_render_inline_snippets_using_same_argument_name
|
||||||
|
template = <<~LIQUID.strip
|
||||||
|
{% snippet "input" |type| %}
|
||||||
|
<input type="{{ type }}" />
|
||||||
|
{% endsnippet %}
|
||||||
|
|
||||||
|
{% snippet "inputs" |type, value| %}
|
||||||
|
<input type="{{ type }}" value="{{ value }}" />
|
||||||
|
{% endsnippet %}
|
||||||
|
|
||||||
|
{%- render "input", type: "text" -%}
|
||||||
|
{%- render "inputs", type: "password", value: "pass" -%}
|
||||||
|
LIQUID
|
||||||
|
expected = <<~OUTPUT
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<input type="text" />
|
||||||
|
|
||||||
|
<input type="password" value="pass" />
|
||||||
|
OUTPUT
|
||||||
|
|
||||||
|
assert_template_result(expected, template)
|
||||||
|
end
|
||||||
|
|
||||||
def test_render_inline_snippet_empty_string_when_missing_argument
|
def test_render_inline_snippet_empty_string_when_missing_argument
|
||||||
template = <<~LIQUID.strip
|
template = <<~LIQUID.strip
|
||||||
{% snippet "input" |type| %}
|
{% snippet "input" |type| %}
|
||||||
@@ -145,19 +170,19 @@ class SnippetTest < Minitest::Test
|
|||||||
{% snippet "input" |type| %}
|
{% snippet "input" |type| %}
|
||||||
<input type="{{ type }}" />
|
<input type="{{ type }}" />
|
||||||
{% endsnippet %}
|
{% endsnippet %}
|
||||||
|
{% snippet "no_leak" %}
|
||||||
{% snippet "banner"%}
|
<input type="{{ type }}" />
|
||||||
{{ type }}
|
|
||||||
{% endsnippet %}
|
{% endsnippet %}
|
||||||
|
|
||||||
{%- render "input", type: "text" -%}
|
{%- render "input", type: "text" -%}
|
||||||
{%- render "banner" -%}
|
{%- render "no_leak" -%}
|
||||||
LIQUID
|
LIQUID
|
||||||
expected = <<~OUTPUT.strip
|
expected = <<~OUTPUT
|
||||||
|
|
||||||
|
|
||||||
<input type="text" />
|
<input type="text" />
|
||||||
|
|
||||||
|
<input type="" />
|
||||||
OUTPUT
|
OUTPUT
|
||||||
|
|
||||||
assert_template_result(expected, template)
|
assert_template_result(expected, template)
|
||||||
|
|||||||
Reference in New Issue
Block a user