@@ -56,7 +56,7 @@ module Liquid if strainer.respond_to?(method) strainer.__send__(method, *args) else - args.first + raise FilterNotFound, "Filter '#{method}' not found" end end lib/liquid/context.rb @@ -156,7 +156,9 @@ class ContextTest < Test::Unit::TestCase assert_equal 'hi? hi!', context.invoke(:hi, 'hi?') context = Context.new(@template) - assert_equal 'hi?', context.invoke(:hi, 'hi?') + assert_raises(FilterNotFound) { + context.invoke(:hi, 'hi?') + } context.add_filters(filter) assert_equal 'hi? hi!', context.invoke(:hi, 'hi?') test/context_test.rb @@ -11,14 +11,14 @@ class SecurityTest < Test::Unit::TestCase def test_no_instance_eval text = %( {{ '1+1' | instance_eval }} ) - expected = %| 1+1 | + expected = %! Liquid error: Error - filter 'instance_eval' in ''1+1' | instance_eval' could not be found. ! assert_equal expected, Template.parse(text).render(@assigns) end def test_no_existing_instance_eval text = %( {{ '1+1' | __instance_eval__ }} ) - expected = %| 1+1 | + expected = %! Liquid error: Error - filter '__instance_eval__' in ''1+1' | __instance_eval__' could not be found. ! assert_equal expected, Template.parse(text).render(@assigns) end @@ -26,7 +26,7 @@ class SecurityTest < Test::Unit::TestCase def test_no_instance_eval_after_mixing_in_new_filter text = %( {{ '1+1' | instance_eval }} ) - expected = %| 1+1 | + expected = %! Liquid error: Error - filter 'instance_eval' in ''1+1' | instance_eval' could not be found. ! assert_equal expected, Template.parse(text).render(@assigns) end @@ -34,7 +34,7 @@ class SecurityTest < Test::Unit::TestCase def test_no_instance_eval_later_in_chain text = %( {{ '1+1' | add_one | instance_eval }} ) - expected = %| 1+1 + 1 | + expected = %! Liquid error: Error - filter 'instance_eval' in ''1+1' | add_one | instance_eval' could not be found. ! assert_equal expected, Template.parse(text).render(@assigns, :filters => SecurityFilter) end test/security_test.rb f29b9335c51a30b98fadc412983c8ab09766d69f Brian Candler b.candler@pobox.com http://github.com/tobi/liquid/commit/01c25a11a3923d9f3a8a00b821c0aba2b586da23 01c25a11a3923d9f3a8a00b821c0aba2b586da23 2009-06-06T08:32:20-07:00 2009-06-06T08:32:20-07:00 Raise FilterNotFound on use of non-existent filter 58abc799a00ed9fd81800745f0f39a0491c14527 Brian Candler b.candler@pobox.com