mirror of
https://github.com/Shopify/liquid.git
synced 2026-09-15 08:50:45 -07:00
Shopify stye guide fixes (#1160)
This commit is contained in:
@@ -211,7 +211,10 @@ class ErrorHandlingTest < Minitest::Test
|
||||
def test_setting_default_exception_renderer
|
||||
old_exception_renderer = Liquid::Template.default_exception_renderer
|
||||
exceptions = []
|
||||
Liquid::Template.default_exception_renderer = ->(e) { exceptions << e; '' }
|
||||
Liquid::Template.default_exception_renderer = ->(e) {
|
||||
exceptions << e
|
||||
''
|
||||
}
|
||||
template = Liquid::Template.parse('This is a runtime error: {{ errors.argument_error }}')
|
||||
|
||||
output = template.render('errors' => ErrorDrop.new)
|
||||
@@ -225,7 +228,10 @@ class ErrorHandlingTest < Minitest::Test
|
||||
def test_exception_renderer_exposing_non_liquid_error
|
||||
template = Liquid::Template.parse('This is a runtime error: {{ errors.runtime_error }}', line_numbers: true)
|
||||
exceptions = []
|
||||
handler = ->(e) { exceptions << e; e.cause }
|
||||
handler = ->(e) {
|
||||
exceptions << e
|
||||
e.cause
|
||||
}
|
||||
|
||||
output = template.render({ 'errors' => ErrorDrop.new }, exception_renderer: handler)
|
||||
|
||||
|
||||
@@ -81,7 +81,10 @@ class TemplateTest < Minitest::Test
|
||||
|
||||
def test_lambda_is_called_once_from_persistent_assigns_over_multiple_parses_and_renders
|
||||
t = Template.new
|
||||
t.assigns['number'] = -> { @global ||= 0; @global += 1 }
|
||||
t.assigns['number'] = -> {
|
||||
@global ||= 0
|
||||
@global += 1
|
||||
}
|
||||
assert_equal '1', t.parse("{{number}}").render!
|
||||
assert_equal '1', t.parse("{{number}}").render!
|
||||
assert_equal '1', t.render!
|
||||
@@ -90,7 +93,10 @@ class TemplateTest < Minitest::Test
|
||||
|
||||
def test_lambda_is_called_once_from_custom_assigns_over_multiple_parses_and_renders
|
||||
t = Template.new
|
||||
assigns = { 'number' => -> { @global ||= 0; @global += 1 } }
|
||||
assigns = { 'number' => -> {
|
||||
@global ||= 0
|
||||
@global += 1
|
||||
} }
|
||||
assert_equal '1', t.parse("{{number}}").render!(assigns)
|
||||
assert_equal '1', t.parse("{{number}}").render!(assigns)
|
||||
assert_equal '1', t.render!(assigns)
|
||||
@@ -237,7 +243,10 @@ class TemplateTest < Minitest::Test
|
||||
|
||||
def test_exception_renderer_that_returns_string
|
||||
exception = nil
|
||||
handler = ->(e) { exception = e; '<!-- error -->' }
|
||||
handler = ->(e) {
|
||||
exception = e
|
||||
'<!-- error -->'
|
||||
}
|
||||
|
||||
output = Template.parse("{{ 1 | divided_by: 0 }}").render({}, exception_renderer: handler)
|
||||
|
||||
@@ -248,7 +257,10 @@ class TemplateTest < Minitest::Test
|
||||
def test_exception_renderer_that_raises
|
||||
exception = nil
|
||||
assert_raises(Liquid::ZeroDivisionError) do
|
||||
Template.parse("{{ 1 | divided_by: 0 }}").render({}, exception_renderer: ->(e) { exception = e; raise })
|
||||
Template.parse("{{ 1 | divided_by: 0 }}").render({}, exception_renderer: ->(e) {
|
||||
exception = e
|
||||
raise
|
||||
})
|
||||
end
|
||||
assert exception.is_a?(Liquid::ZeroDivisionError)
|
||||
end
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@ require 'liquid.rb'
|
||||
require 'liquid/profiler'
|
||||
|
||||
mode = :strict
|
||||
if env_mode = ENV['LIQUID_PARSER_MODE']
|
||||
if (env_mode = ENV['LIQUID_PARSER_MODE'])
|
||||
puts "-- #{env_mode.upcase} ERROR MODE"
|
||||
mode = env_mode.to_sym
|
||||
end
|
||||
|
||||
@@ -26,9 +26,9 @@ class ConditionUnitTest < Minitest::Test
|
||||
assert_evaluates_true 1, '<=', 1
|
||||
# negative numbers
|
||||
assert_evaluates_true 1, '>', -1
|
||||
assert_evaluates_true -1, '<', 1
|
||||
assert_evaluates_true(-1, '<', 1)
|
||||
assert_evaluates_true 1.0, '>', -1.0
|
||||
assert_evaluates_true -1.0, '<', 1.0
|
||||
assert_evaluates_true(-1.0, '<', 1.0)
|
||||
end
|
||||
|
||||
def test_default_operators_evalute_false
|
||||
|
||||
@@ -85,7 +85,7 @@ class ContextUnitTest < Minitest::Test
|
||||
@context['date'] = Date.today
|
||||
assert_equal Date.today, @context['date']
|
||||
|
||||
now = DateTime.now
|
||||
now = Time.now
|
||||
@context['datetime'] = now
|
||||
assert_equal now, @context['datetime']
|
||||
|
||||
@@ -405,7 +405,11 @@ class ContextUnitTest < Minitest::Test
|
||||
end
|
||||
|
||||
def test_lambda_is_called_once
|
||||
@context['callcount'] = proc { @global ||= 0; @global += 1; @global.to_s }
|
||||
@context['callcount'] = proc {
|
||||
@global ||= 0
|
||||
@global += 1
|
||||
@global.to_s
|
||||
}
|
||||
|
||||
assert_equal '1', @context['callcount']
|
||||
assert_equal '1', @context['callcount']
|
||||
@@ -415,7 +419,11 @@ class ContextUnitTest < Minitest::Test
|
||||
end
|
||||
|
||||
def test_nested_lambda_is_called_once
|
||||
@context['callcount'] = { "lambda" => proc { @global ||= 0; @global += 1; @global.to_s } }
|
||||
@context['callcount'] = { "lambda" => proc {
|
||||
@global ||= 0
|
||||
@global += 1
|
||||
@global.to_s
|
||||
} }
|
||||
|
||||
assert_equal '1', @context['callcount.lambda']
|
||||
assert_equal '1', @context['callcount.lambda']
|
||||
@@ -425,7 +433,11 @@ class ContextUnitTest < Minitest::Test
|
||||
end
|
||||
|
||||
def test_lambda_in_array_is_called_once
|
||||
@context['callcount'] = [1, 2, proc { @global ||= 0; @global += 1; @global.to_s }, 4, 5]
|
||||
@context['callcount'] = [1, 2, proc {
|
||||
@global ||= 0
|
||||
@global += 1
|
||||
@global.to_s
|
||||
}, 4, 5]
|
||||
|
||||
assert_equal '1', @context['callcount[2]']
|
||||
assert_equal '1', @context['callcount[2]']
|
||||
|
||||
@@ -35,7 +35,7 @@ class TokenizerTest < Minitest::Test
|
||||
def tokenize(source)
|
||||
tokenizer = Liquid::Tokenizer.new(source)
|
||||
tokens = []
|
||||
while t = tokenizer.shift
|
||||
while (t = tokenizer.shift)
|
||||
tokens << t
|
||||
end
|
||||
tokens
|
||||
|
||||
Reference in New Issue
Block a user