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

Revert "Merge pull request #466 from Shopify/remove-expression-cache"

Browse Source 
This reverts commit d9ae36ec40, reversing
changes made to 2da9d49478.
This commit is contained in:
Florian Weingarten
2014-11-07 01:48:51 +00:00
parent 9c33e9601b
commit 475ea51f1f
12 changed files with 123 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/integration/render_profiling_test.rb
+5 -5
View File
@@ -89,7 +89,7 @@ class RenderProfilingTest < Minitest::Test
include_node = t.profiler[1]
include_node.children.each do |child|
assert_equal "a_template", child.partial
assert_equal "'a_template'", child.partial
end
end
@@ -99,12 +99,12 @@ class RenderProfilingTest < Minitest::Test
a_template = t.profiler[1]
a_template.children.each do |child|
assert_equal "a_template", child.partial
assert_equal "'a_template'", child.partial
end
b_template = t.profiler[2]
b_template.children.each do |child|
assert_equal "b_template", child.partial
assert_equal "'b_template'", child.partial
end
end
@@ -114,12 +114,12 @@ class RenderProfilingTest < Minitest::Test
a_template1 = t.profiler[1]
a_template1.children.each do |child|
assert_equal "a_template", child.partial
assert_equal "'a_template'", child.partial
end
a_template2 = t.profiler[2]
a_template2.children.each do |child|
assert_equal "a_template", child.partial
assert_equal "'a_template'", child.partial
end
end
test/unit/condition_unit_test.rb
+60 -60
View File
@@ -4,111 +4,110 @@ class ConditionUnitTest < Minitest::Test
include Liquid
def test_basic_condition
assert_equal false, Condition.new(1, '==', 2).evaluate
assert_equal true, Condition.new(1, '==', 1).evaluate
assert_equal false, Condition.new('1', '==', '2').evaluate
assert_equal true, Condition.new('1', '==', '1').evaluate
end
def test_default_operators_evalute_true
assert_evalutes_true 1, '==', 1
assert_evalutes_true 1, '!=', 2
assert_evalutes_true 1, '<>', 2
assert_evalutes_true 1, '<', 2
assert_evalutes_true 2, '>', 1
assert_evalutes_true 1, '>=', 1
assert_evalutes_true 2, '>=', 1
assert_evalutes_true 1, '<=', 2
assert_evalutes_true 1, '<=', 1
assert_evalutes_true '1', '==', '1'
assert_evalutes_true '1', '!=', '2'
assert_evalutes_true '1', '<>', '2'
assert_evalutes_true '1', '<', '2'
assert_evalutes_true '2', '>', '1'
assert_evalutes_true '1', '>=', '1'
assert_evalutes_true '2', '>=', '1'
assert_evalutes_true '1', '<=', '2'
assert_evalutes_true '1', '<=', '1'
# negative numbers
assert_evalutes_true 1, '>', -1
assert_evalutes_true -1, '<', 1
assert_evalutes_true 1.0, '>', -1.0
assert_evalutes_true -1.0, '<', 1.0
assert_evalutes_true '1', '>', '-1'
assert_evalutes_true '-1', '<', '1'
assert_evalutes_true '1.0', '>', '-1.0'
assert_evalutes_true '-1.0', '<', '1.0'
end
def test_default_operators_evalute_false
assert_evalutes_false 1, '==', 2
assert_evalutes_false 1, '!=', 1
assert_evalutes_false 1, '<>', 1
assert_evalutes_false 1, '<', 0
assert_evalutes_false 2, '>', 4
assert_evalutes_false 1, '>=', 3
assert_evalutes_false 2, '>=', 4
assert_evalutes_false 1, '<=', 0
assert_evalutes_false 1, '<=', 0
assert_evalutes_false '1', '==', '2'
assert_evalutes_false '1', '!=', '1'
assert_evalutes_false '1', '<>', '1'
assert_evalutes_false '1', '<', '0'
assert_evalutes_false '2', '>', '4'
assert_evalutes_false '1', '>=', '3'
assert_evalutes_false '2', '>=', '4'
assert_evalutes_false '1', '<=', '0'
assert_evalutes_false '1', '<=', '0'
end
def test_contains_works_on_strings
assert_evalutes_true 'bob', 'contains', 'o'
assert_evalutes_true 'bob', 'contains', 'b'
assert_evalutes_true 'bob', 'contains', 'bo'
assert_evalutes_true 'bob', 'contains', 'ob'
assert_evalutes_true 'bob', 'contains', 'bob'
assert_evalutes_true "'bob'", 'contains', "'o'"
assert_evalutes_true "'bob'", 'contains', "'b'"
assert_evalutes_true "'bob'", 'contains', "'bo'"
assert_evalutes_true "'bob'", 'contains', "'ob'"
assert_evalutes_true "'bob'", 'contains', "'bob'"
assert_evalutes_false 'bob', 'contains', 'bob2'
assert_evalutes_false 'bob', 'contains', 'a'
assert_evalutes_false 'bob', 'contains', '---'
assert_evalutes_false "'bob'", 'contains', "'bob2'"
assert_evalutes_false "'bob'", 'contains', "'a'"
assert_evalutes_false "'bob'", 'contains', "'---'"
end
def test_invalid_comparation_operator
assert_evaluates_argument_error 1, '~~', 0
assert_evaluates_argument_error "1", '~~', '0'
end
def test_comparation_of_int_and_str
assert_evaluates_argument_error '1', '>', 0
assert_evaluates_argument_error '1', '<', 0
assert_evaluates_argument_error '1', '>=', 0
assert_evaluates_argument_error '1', '<=', 0
assert_evaluates_argument_error "'1'", '>', '0'
assert_evaluates_argument_error "'1'", '<', '0'
assert_evaluates_argument_error "'1'", '>=', '0'
assert_evaluates_argument_error "'1'", '<=', '0'
end
def test_contains_works_on_arrays
@context = Liquid::Context.new
@context['array'] = [1,2,3,4,5]
array_expr = VariableLookup.new("array")
assert_evalutes_false array_expr, 'contains', 0
assert_evalutes_true array_expr, 'contains', 1
assert_evalutes_true array_expr, 'contains', 2
assert_evalutes_true array_expr, 'contains', 3
assert_evalutes_true array_expr, 'contains', 4
assert_evalutes_true array_expr, 'contains', 5
assert_evalutes_false array_expr, 'contains', 6
assert_evalutes_false array_expr, 'contains', "1"
assert_evalutes_false "array", 'contains', '0'
assert_evalutes_true "array", 'contains', '1'
assert_evalutes_true "array", 'contains', '2'
assert_evalutes_true "array", 'contains', '3'
assert_evalutes_true "array", 'contains', '4'
assert_evalutes_true "array", 'contains', '5'
assert_evalutes_false "array", 'contains', '6'
assert_evalutes_false "array", 'contains', '"1"'
end
def test_contains_returns_false_for_nil_operands
@context = Liquid::Context.new
assert_evalutes_false VariableLookup.new('not_assigned'), 'contains', '0'
assert_evalutes_false 0, 'contains', VariableLookup.new('not_assigned')
assert_evalutes_false "not_assigned", 'contains', '0'
assert_evalutes_false "0", 'contains', 'not_assigned'
end
def test_contains_return_false_on_wrong_data_type
assert_evalutes_false 1, 'contains', 0
assert_evalutes_false "1", 'contains', '0'
end
def test_or_condition
condition = Condition.new(1, '==', 2)
condition = Condition.new('1', '==', '2')
assert_equal false, condition.evaluate
condition.or Condition.new(2, '==', 1)
condition.or Condition.new('2', '==', '1')
assert_equal false, condition.evaluate
condition.or Condition.new(1, '==', 1)
condition.or Condition.new('1', '==', '1')
assert_equal true, condition.evaluate
end
def test_and_condition
condition = Condition.new(1, '==', 1)
condition = Condition.new('1', '==', '1')
assert_equal true, condition.evaluate
condition.and Condition.new(2, '==', 2)
condition.and Condition.new('2', '==', '2')
assert_equal true, condition.evaluate
condition.and Condition.new(2, '==', 1)
condition.and Condition.new('2', '==', '1')
assert_equal false, condition.evaluate
end
@@ -116,17 +115,18 @@ class ConditionUnitTest < Minitest::Test
def test_should_allow_custom_proc_operator
Condition.operators['starts_with'] = Proc.new { |cond, left, right| left =~ %r{^#{right}} }
assert_evalutes_true 'bob', 'starts_with', 'b'
assert_evalutes_false 'bob', 'starts_with', 'o'
ensure
Condition.operators.delete 'starts_with'
assert_evalutes_true "'bob'", 'starts_with', "'b'"
assert_evalutes_false "'bob'", 'starts_with', "'o'"
ensure
Condition.operators.delete 'starts_with'
end
def test_left_or_right_may_contain_operators
@context = Liquid::Context.new
@context['one'] = @context['another'] = "gnomeslab-and-or-liquid"
assert_evalutes_true VariableLookup.new("one"), '==', VariableLookup.new("another")
assert_evalutes_true "one", '==', "another"
end
private
test/unit/context_unit_test.rb
+10
View File
@@ -469,6 +469,16 @@ class ContextUnitTest < Minitest::Test
refute mock_any.has_been_called?
assert mock_empty.has_been_called?
end
def test_variable_lookup_caches_markup
mock_scan = Spy.on_instance_method(String, :scan).and_return(["string"])
@context['string'] = 'string'
@context['string']
@context['string']
assert_equal 1, mock_scan.calls.size
end
def test_context_initialization_with_a_proc_in_environment