Compare commits

..

4 Commits

Author SHA1 Message Date
Dylan Thacker-Smith
cc08579185 CI: Test with ruby 3.0 as the latest ruby version 2021-02-10 08:37:16 -05:00
Peter Zhu
3c499d0241 Merge pull request #1387 from Shopify/pz-serialize-benchmark-refactor
Refactor render_layout method for serialization
2021-01-11 15:51:00 -05:00
Peter Zhu
e71e53ffb5 Refactor render_layout method for serialization 2021-01-11 14:00:39 -05:00
Dylan Thacker-Smith
260c863e23 Build the tokenizer through the parse context for liquid-c (#1386) 2021-01-07 14:51:41 -05:00
3 changed files with 10 additions and 6 deletions

View File

@@ -6,9 +6,8 @@ jobs:
strategy: strategy:
matrix: matrix:
entry: entry:
- { ruby: 2.5, allowed-failure: false } - { ruby: 2.5, allowed-failure: false } # minimum supported
- { ruby: 2.6, allowed-failure: false } - { ruby: 3.0, allowed-failure: false } # latest
- { ruby: 2.7, allowed-failure: false }
- { ruby: ruby-head, allowed-failure: true } - { ruby: ruby-head, allowed-failure: true }
name: test (${{ matrix.entry.ruby }}) name: test (${{ matrix.entry.ruby }})
steps: steps:

View File

@@ -73,10 +73,14 @@ class ThemeRunner
private private
def render_layout(template, layout, assigns)
assigns['content_for_layout'] = template.render!(assigns)
layout&.render!(assigns)
end
def compile_and_render(template, layout, assigns, page_template, template_file) def compile_and_render(template, layout, assigns, page_template, template_file)
compiled_test = compile_test(template, layout, assigns, page_template, template_file) compiled_test = compile_test(template, layout, assigns, page_template, template_file)
assigns['content_for_layout'] = compiled_test[:tmpl].render!(assigns) render_layout(compiled_test[:tmpl], compiled_test[:layout], compiled_test[:assigns])
compiled_test[:layout].render!(assigns) if layout
end end
def compile_all_tests def compile_all_tests

View File

@@ -461,6 +461,7 @@ class ContextTest < Minitest::Test
end end
def test_interrupt_avoids_object_allocations def test_interrupt_avoids_object_allocations
@context.interrupt? # ruby 3.0.0 allocates on the first call
assert_no_object_allocations do assert_no_object_allocations do
@context.interrupt? @context.interrupt?
end end