Parsing for if statements

test/liquid/error_handling_test.rb

@@ -63,11 +63,8 @@ class ErrorHandlingTest < Test::Unit::TestCase
   end
 
   def test_unrecognized_operator
-    assert_nothing_raised do
-      template = Liquid::Template.parse(' {% if 1 =! 2 %}ok{% endif %} ')
-      assert_equal ' Liquid error: Unknown operator =! ', template.render
-      assert_equal 1, template.errors.size
-      assert_equal Liquid::ArgumentError, template.errors.first.class
+    assert_raise(SyntaxError) do
+      Liquid::Template.parse(' {% if 1 =! 2 %}ok{% endif %} ')
     end
   end
 

test/liquid/parsing_quirks_test.rb

@@ -40,15 +40,20 @@ class ParsingQuirksTest < Test::Unit::TestCase
   end
 
   def test_meaningless_parens
-    assigns = {'b' => 'bar', 'c' => 'baz'}
-    markup = "a == 'foo' or (b == 'bar' and c == 'baz') or false"
-    assert_template_result(' YES ',"{% if #{markup} %} YES {% endif %}", assigns)
+    assert_raise(SyntaxError) do
+      markup = "a == 'foo' or (b == 'bar' and c == 'baz') or false"
+      Template.parse("{% if #{markup} %} YES {% endif %}")
+    end
   end
 
   def test_unexpected_characters_silently_eat_logic
-    markup = "true && false"
-    assert_template_result(' YES ',"{% if #{markup} %} YES {% endif %}")
-    markup = "false || true"
-    assert_template_result('',"{% if #{markup} %} YES {% endif %}")
+    assert_raise(SyntaxError) do
+      markup = "true && false"
+      Template.parse("{% if #{markup} %} YES {% endif %}")
+    end
+    assert_raise(SyntaxError) do
+      markup = "false || true"
+      Template.parse("{% if #{markup} %} YES {% endif %}")
+    end
   end
 end # ParsingQuirksTest