kemko/liquid
1
0
Fork 0
mirror of https://github.com/kemko/liquid.git synced 2026-01-06 10:15:40 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve disabled tag error output

Browse Source
This commit is contained in:
Mike Angell
2019-09-24 09:05:22 +10:00
parent 695378d8a4
commit 5e9b0bd3e9
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/liquid/locales/en.yml
View File

@@ -26,4 +26,4 @@
argument:
include: "Argument error in tag 'include' - Illegal template name"
disabled:
tag: "usage has been disabled in this context."
tag: "usage is not allowed in this context"

2
lib/liquid/tags/render.rb
View File

@@ -3,7 +3,7 @@
module Liquid
class Render < Tag
SYNTAX = /(#{QuotedString})#{QuotedFragment}*/o
DISABLED_TAGS = %w(include)
DISABLED_TAGS = %w(include).freeze
attr_reader :template_name_expr, :attributes

4
test/integration/registers/disabled_tags_test.rb
View File

@@ -23,13 +23,13 @@ class DisabledTagsTest < Minitest::Test
def test_disables_raw
with_custom_tag('disable', DisableRaw) do
assert_template_result 'raw usage has been disabled in this context.foo', '{% disable %}{% raw %}Foobar{% endraw %}{% echo "foo" %}{% enddisable %}'
assert_template_result 'raw usage is not allowed in this contextfoo', '{% disable %}{% raw %}Foobar{% endraw %}{% echo "foo" %}{% enddisable %}'
end
end
def test_disables_echo_and_raw
with_custom_tag('disable', DisableRawEcho) do
assert_template_result 'raw usage has been disabled in this context.echo usage has been disabled in this context.', '{% disable %}{% raw %}Foobar{% endraw %}{% echo "foo" %}{% enddisable %}'
assert_template_result 'raw usage is not allowed in this contextecho usage is not allowed in this context', '{% disable %}{% raw %}Foobar{% endraw %}{% echo "foo" %}{% enddisable %}'
end
end
end

4
test/integration/tags/render_tag_test.rb
View File

@@ -153,7 +153,7 @@ class RenderTagTest < Minitest::Test
'test_include' => '{% include "foo" %}'
)
assert_template_result 'include usage has been disabled in this context.', '{% render "test_include" %}'
assert_template_result 'include usage is not allowed in this context', '{% render "test_include" %}'
end
def test_includes_will_not_render_inside_nested_sibling_tags
@@ -163,6 +163,6 @@ class RenderTagTest < Minitest::Test
'test_include' => '{% include "foo" %}'
)
assert_template_result 'include usage has been disabled in this context.include usage has been disabled in this context.', '{% render "nested_render_with_sibling_include" %}'
assert_template_result 'include usage is not allowed in this contextinclude usage is not allowed in this context', '{% render "nested_render_with_sibling_include" %}'
end
end