From 49f2af4209785b86ccd01fbeb469963f402da3ff Mon Sep 17 00:00:00 2001
From: Justin Li <jli.justinli@gmail.com>
Date: Thu, 28 May 2015 16:33:54 -0400
Subject: [PATCH] Merge pull request #570 from Shopify/fix-strict-conditions

Fix condition parse order in strict mode
---
 lib/liquid/tags/if.rb                     | 16 ++++++++--------
 test/integration/tags/if_else_tag_test.rb | 21 +++++++++++++++++++++
 test/test_helper.rb                       |  4 ++--
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/lib/liquid/tags/if.rb b/lib/liquid/tags/if.rb
index 4bb4733..3c06f73 100644
--- a/lib/liquid/tags/if.rb
+++ b/lib/liquid/tags/if.rb
@@ -78,16 +78,16 @@ module Liquid
 
       def strict_parse(markup)
         p = Parser.new(markup)
-
-        condition = parse_comparison(p)
-
-        while op = (p.id?('and'.freeze) || p.id?('or'.freeze))
-          new_cond = parse_comparison(p)
-          new_cond.send(op, condition)
-          condition = new_cond
-        end
+        condition = parse_binary_comparison(p)
         p.consume(:end_of_string)
+        condition
+      end
 
+      def parse_binary_comparison(p)
+        condition = parse_comparison(p)
+        if op = (p.id?('and'.freeze) || p.id?('or'.freeze))
+          condition.send(op, parse_binary_comparison(p))
+        end
         condition
       end
 
diff --git a/test/integration/tags/if_else_tag_test.rb b/test/integration/tags/if_else_tag_test.rb
index 3e1797e..694e8f8 100644
--- a/test/integration/tags/if_else_tag_test.rb
+++ b/test/integration/tags/if_else_tag_test.rb
@@ -166,4 +166,25 @@ class IfElseTagTest < Minitest::Test
       assert_template_result('', %({% if 1 or throw or or 1 %}yes{% endif %}))
     end
   end
+
+  def test_multiple_conditions
+    tpl = "{% if a or b and c %}true{% else %}false{% endif %}"
+
+    tests = {
+      [true, true, true] => true,
+      [true, true, false] => true,
+      [true, false, true] => true,
+      [true, false, false] => true,
+      [false, true, true] => true,
+      [false, true, false] => false,
+      [false, false, true] => false,
+      [false, false, false] => false,
+    }
+
+    tests.each do |vals, expected|
+      a, b, c = vals
+      assigns = { 'a' => a, 'b' => b, 'c' => c }
+      assert_template_result expected.to_s, tpl, assigns, assigns.to_s
+    end
+  end
 end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index ac01390..53a7d4e 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -32,13 +32,13 @@ module Minitest
     include Liquid
 
     def assert_template_result(expected, template, assigns = {}, message = nil)
-      assert_equal expected, Template.parse(template).render!(assigns)
+      assert_equal expected, Template.parse(template).render!(assigns), message
     end
 
     def assert_template_result_matches(expected, template, assigns = {}, message = nil)
       return assert_template_result(expected, template, assigns, message) unless expected.is_a? Regexp
 
-      assert_match expected, Template.parse(template).render!(assigns)
+      assert_match expected, Template.parse(template).render!(assigns), message
     end
 
     def assert_match_syntax_error(match, template, registers = {})