From 2beb93092151fd7cea0eaadecef6b6aac2d6bb26 Mon Sep 17 00:00:00 2001 From: Dylan Thacker-Smith Date: Thu, 1 Sep 2022 11:46:50 -0400 Subject: [PATCH] Reserve keyword arguments for new options in assert_template_result --- test/integration/tags/if_else_tag_test.rb | 2 +- test/test_helper.rb | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/test/integration/tags/if_else_tag_test.rb b/test/integration/tags/if_else_tag_test.rb index c0faf6bda..b550ea9e0 100644 --- a/test/integration/tags/if_else_tag_test.rb +++ b/test/integration/tags/if_else_tag_test.rb @@ -184,7 +184,7 @@ def test_multiple_conditions 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) + assert_template_result(expected.to_s, tpl, assigns, message: assigns.to_s) end end end diff --git a/test/test_helper.rb b/test/test_helper.rb index 874dd8f47..3afc80579 100755 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -37,19 +37,13 @@ def fixture(name) module Assertions include Liquid - def assert_template_result(expected, template, assigns = {}, message = nil) + def assert_template_result(expected, template, assigns = {}, message: nil) assert_equal(expected, Template.parse(template, line_numbers: true).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, line_numbers: true).render!(assigns), message) - end - - def assert_match_syntax_error(match, template, assigns = {}) + def assert_match_syntax_error(match, template) exception = assert_raises(Liquid::SyntaxError) do - Template.parse(template, line_numbers: true).render(assigns) + Template.parse(template, line_numbers: true).render end assert_match(match, exception.message) end