Labyricorn/liquid
1
0
Fork 0
mirror of https://github.com/Shopify/liquid.git synced 2026-09-19 10:52:48 -07:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge pull request #458 from Shopify/block-body"

Browse Source 
This reverts commit 12d526a05c, reversing
changes made to 263e90e772.

Conflicts:
	lib/liquid/block_body.rb
This commit is contained in:
Florian Weingarten
2014-11-07 01:47:47 +00:00
parent 2fe3a21a5d
commit 4b1835e3c0
16 changed files with 154 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/unit/tags/case_tag_unit_test.rb
+1 -1
View File
@@ -5,6 +5,6 @@ class CaseTagUnitTest < Minitest::Test
def test_case_nodelist
template = Liquid::Template.parse('{% case var %}{% when true %}WHEN{% else %}ELSE{% endcase %}')
assert_equal ['WHEN', 'ELSE'], template.root.nodelist[0].nodelist.map(&:nodelist).flatten
assert_equal ['WHEN', 'ELSE'], template.root.nodelist[0].nodelist
end
end
test/unit/tags/for_tag_unit_test.rb
+2 -2
View File
@@ -3,11 +3,11 @@ require 'test_helper'
class ForTagUnitTest < Minitest::Test
def test_for_nodelist
template = Liquid::Template.parse('{% for item in items %}FOR{% endfor %}')
assert_equal ['FOR'], template.root.nodelist[0].nodelist.map(&:nodelist).flatten
assert_equal ['FOR'], template.root.nodelist[0].nodelist
end
def test_for_else_nodelist
template = Liquid::Template.parse('{% for item in items %}FOR{% else %}ELSE{% endfor %}')
assert_equal ['FOR', 'ELSE'], template.root.nodelist[0].nodelist.map(&:nodelist).flatten
assert_equal ['FOR', 'ELSE'], template.root.nodelist[0].nodelist
end
end
test/unit/tags/if_tag_unit_test.rb
+1 -1
View File
@@ -3,6 +3,6 @@ require 'test_helper'
class IfTagUnitTest < Minitest::Test
def test_if_nodelist
template = Liquid::Template.parse('{% if true %}IF{% else %}ELSE{% endif %}')
assert_equal ['IF', 'ELSE'], template.root.nodelist[0].nodelist.map(&:nodelist).flatten
assert_equal ['IF', 'ELSE'], template.root.nodelist[0].nodelist
end
end
test/unit/template_unit_test.rb
+5 -6
View File
@@ -5,17 +5,16 @@ class TemplateUnitTest < Minitest::Test
def test_sets_default_localization_in_document
t = Template.new
t.parse('{%comment%}{%endcomment%}')
assert_instance_of I18n, t.root.nodelist[0].options[:locale]
t.parse('')
assert_instance_of I18n, t.root.options[:locale]
end
def test_sets_default_localization_in_context_with_quick_initialization
t = Template.new
t.parse('{%comment%}{%endcomment%}', :locale => I18n.new(fixture("en_locale.yml")))
t.parse('{{foo}}', :locale => I18n.new(fixture("en_locale.yml")))
locale = t.root.nodelist[0].options[:locale]
assert_instance_of I18n, locale
assert_equal fixture("en_locale.yml"), locale.path
assert_instance_of I18n, t.root.options[:locale]
assert_equal fixture("en_locale.yml"), t.root.options[:locale].path
end
def test_with_cache_classes_tags_returns_the_same_class