From 86ba2f4174c9a9225a2cac45d84d3ae6319e6d5f Mon Sep 17 00:00:00 2001 From: Tristan Hume Date: Thu, 22 Aug 2013 13:23:44 -0400 Subject: [PATCH] Fix error message 1.8 compatibility --- lib/liquid/parser.rb | 2 +- test/liquid/error_handling_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/liquid/parser.rb b/lib/liquid/parser.rb index 0c499d1c..96260018 100644 --- a/lib/liquid/parser.rb +++ b/lib/liquid/parser.rb @@ -13,7 +13,7 @@ module Liquid def consume(type = nil) token = @tokens[@p] if type && token[0] != type - raise SyntaxError, "Expected #{type} but found #{@tokens[@p]}" + raise SyntaxError, "Expected #{type} but found #{@tokens[@p].first}" end @p += 1 token[1] diff --git a/test/liquid/error_handling_test.rb b/test/liquid/error_handling_test.rb index 94c321e4..192285db 100644 --- a/test/liquid/error_handling_test.rb +++ b/test/liquid/error_handling_test.rb @@ -96,7 +96,7 @@ class ErrorHandlingTest < Test::Unit::TestCase assert_equal 3, template.warnings.size assert_equal 'Unexpected character ~ in "~~~"', template.warnings[0].message assert_equal 'Unexpected character % in "{{%%%}}"', template.warnings[1].message - assert_equal 'Expected id but found [:end_of_string] in "{{ hello. }}"', template.warnings[2].message + assert_equal 'Expected id but found end_of_string in "{{ hello. }}"', template.warnings[2].message assert_equal '', template.render end