test

2026-09-13 07:50:43 -07:00 · 2022-09-30 11:00:07 -04:00
66 changed files with 524 additions and 1384 deletions
@@ -1,10 +1,5 @@
 name: Liquid
 on: [push, pull_request]
-
-env:
-  BUNDLE_JOBS: 4
-  BUNDLE_RETRY: 3
-
 jobs:
  test:
    runs-on: ubuntu-latest
@@ -12,18 +7,22 @@ jobs:
      matrix:
        entry:
          - { ruby: 2.7, allowed-failure: false } # minimum supported
-          - { ruby: 3.2, allowed-failure: false } # latest
+          - { ruby: 3.1, allowed-failure: false } # latest
          - { ruby: ruby-head, allowed-failure: true }
-    name: Test Ruby ${{ matrix.entry.ruby }}
+    name: test (${{ matrix.entry.ruby }})
    steps:
      - uses: actions/checkout@v3
      - uses: ruby/setup-ruby@v1
        with:
          ruby-version: ${{ matrix.entry.ruby }}
-          bundler-cache: true
+      - uses: actions/cache@v1
+        with:
+          path: vendor/bundle
+          key: ${{ runner.os }}-gems-${{ hashFiles('Gemfile') }}
+          restore-keys: ${{ runner.os }}-gems-
+      - run: bundle install --jobs=3 --retry=3 --path=vendor/bundle
      - run: bundle exec rake
        continue-on-error: ${{ matrix.entry.allowed-failure }}
-
  memory_profile:
    runs-on: ubuntu-latest
    steps:
@@ -31,5 +30,10 @@ jobs:
      - uses: ruby/setup-ruby@v1
        with:
          ruby-version: 2.7
-          bundler-cache: true
+      - uses: actions/cache@v1
+        with:
+          path: vendor/bundle
+          key: ${{ runner.os }}-gems-${{ hashFiles('Gemfile') }}
+          restore-keys: ${{ runner.os }}-gems-
+      - run: bundle install --jobs=3 --retry=3 --path=vendor/bundle
      - run: bundle exec rake memory_profile:run
@@ -12,7 +12,6 @@ Performance:
 AllCops:
  TargetRubyVersion: 2.7
  NewCops: disable
-  SuggestExtensions: false
  Exclude:
    - 'vendor/bundle/**/*'

@@ -20,10 +19,6 @@ Naming/MethodName:
  Exclude:
    - 'example/server/liquid_servlet.rb'

-Style/ClassMethodsDefinitions:
-  Enabled: false
-
-# liquid filter calls were being mistaken to be calls on arrays
-Style/ConcatArrayLiterals:
-  Exclude:
-    - 'test/integration/standard_filter_test.rb'
+# Backport https://github.com/Shopify/ruby-style-guide/pull/258
+Layout/BeginEndAlignment:
+  Enabled: true
@@ -18,8 +18,7 @@ group :benchmark, :test do
 end

 group :test do
-  gem 'rubocop', '~> 1.44.0'
-  gem 'rubocop-shopify', '~> 2.12.0', require: false
+  gem 'rubocop-shopify', '~> 2.7.0', require: false
  gem 'rubocop-performance', require: false

  platform :mri, :truffleruby do
@@ -5,7 +5,7 @@

 * [Contributing guidelines](CONTRIBUTING.md)
 * [Version history](History.md)
-* [Liquid documentation from Shopify](https://shopify.dev/docs/api/liquid)
+* [Liquid documentation from Shopify](https://shopify.dev/api/liquid)
 * [Liquid Wiki at GitHub](https://github.com/Shopify/liquid/wiki)
 * [Website](http://liquidmarkup.org/)

@@ -111,4 +111,4 @@ template.render!({ 'x' => 1}, { strict_variables: true })

 To help track usages of a feature or code path in production, we have released opt-in usage tracking. To enable this, we provide an empty `Liquid:: Usage.increment` method which you can customize to your needs. The feature is well suited to https://github.com/Shopify/statsd-instrument. However, the choice of implementation is up to you.

-Once you have enabled usage tracking, we recommend reporting any events through Github Issues that your system may be logging. It is highly likely this event has been added to consider deprecating or improving code specific to this event, so please raise any concerns.
+Once you have enabled usage tracking, we recommend reporting any events through Github Issues that your system may be logging. It is highly likely this event has been added to consider deprecating or improving code specific to this event, so please raise any concerns.
@@ -30,18 +30,14 @@ class Servlet < LiquidServlet
  private

  def products_list
-    [
-      { 'name' => 'Arbor Draft', 'price' => 39900, 'description' => 'the *arbor draft* is a excellent product' },
-      { 'name' => 'Arbor Element', 'price' => 40000, 'description' => 'the *arbor element* rocks for freestyling' },
-      { 'name' => 'Arbor Diamond', 'price' => 59900, 'description' => 'the *arbor diamond* is a made up product because im obsessed with arbor and have no creativity' }
-    ]
+    [{ 'name' => 'Arbor Draft', 'price' => 39900, 'description' => 'the *arbor draft* is a excellent product' },
+     { 'name' => 'Arbor Element', 'price' => 40000, 'description' => 'the *arbor element* rocks for freestyling' },
+     { 'name' => 'Arbor Diamond', 'price' => 59900, 'description' => 'the *arbor diamond* is a made up product because im obsessed with arbor and have no creativity' }]
  end

  def more_products_list
-    [
-      { 'name' => 'Arbor Catalyst', 'price' => 39900, 'description' => 'the *arbor catalyst* is an advanced drop-through for freestyle and flatground performance and versatility' },
-      { 'name' => 'Arbor Fish', 'price' => 40000, 'description' => 'the *arbor fish* is a compact pin that features an extended wheelbase and time-honored teardrop shape' }
-    ]
+    [{ 'name' => 'Arbor Catalyst', 'price' => 39900, 'description' => 'the *arbor catalyst* is an advanced drop-through for freestyle and flatground performance and versatility' },
+     { 'name' => 'Arbor Fish', 'price' => 40000, 'description' => 'the *arbor fish* is a compact pin that features an extended wheelbase and time-honored teardrop shape' }]
  end

  def description
@@ -41,7 +41,7 @@ module Liquid
  AnyStartingTag              = /#{TagStart}|#{VariableStart}/o
  PartialTemplateParser       = /#{TagStart}.*?#{TagEnd}|#{VariableStart}.*?#{VariableIncompleteEnd}/om
  TemplateParser              = /(#{PartialTemplateParser}|#{AnyStartingTag})/om
-  VariableParser              = /\[(?>[^\[\]]+|\g<0>)*\]|#{VariableSegment}+\??/o
+  VariableParser              = /\[[^\]]+\]|#{VariableSegment}+\??/o

  RAISE_EXCEPTION_LAMBDA = ->(_e) { raise }

@@ -36,17 +36,13 @@ module Liquid
    # @api private
    def self.raise_unknown_tag(tag, block_name, block_delimiter, parse_context)
      if tag == 'else'
-        raise SyntaxError, parse_context.locale.t(
-          "errors.syntax.unexpected_else",
-          block_name: block_name,
-        )
+        raise SyntaxError, parse_context.locale.t("errors.syntax.unexpected_else",
+          block_name: block_name)
      elsif tag.start_with?('end')
-        raise SyntaxError, parse_context.locale.t(
-          "errors.syntax.invalid_delimiter",
+        raise SyntaxError, parse_context.locale.t("errors.syntax.invalid_delimiter",
          tag: tag,
          block_name: block_name,
-          block_delimiter: block_delimiter,
-        )
+          block_delimiter: block_delimiter)
      else
        raise SyntaxError, parse_context.locale.t("errors.syntax.unknown_tag", tag: tag)
      end
@@ -45,12 +45,6 @@ module Liquid
          end
          tag_name = Regexp.last_match(1)
          markup   = Regexp.last_match(2)
-
-          if tag_name == 'liquid'
-            parse_context.line_number -= 1
-            next parse_liquid_tag(markup, parse_context)
-          end
-
          unless (tag = registered_tags[tag_name])
            # end parsing if we reach an unknown tag and let the caller decide
            # determine how to proceed
@@ -115,22 +109,14 @@ module Liquid
      end
    end

-    private def handle_invalid_tag_token(token, parse_context)
-      if token.end_with?('%}')
-        yield token, token
-      else
-        BlockBody.raise_missing_tag_terminator(token, parse_context)
-      end
-    end
-
-    private def parse_for_document(tokenizer, parse_context, &block)
+    private def parse_for_document(tokenizer, parse_context)
      while (token = tokenizer.shift)
        next if token.empty?
        case
        when token.start_with?(TAGSTART)
          whitespace_handler(token, parse_context)
          unless token =~ FullToken
-            return handle_invalid_tag_token(token, parse_context, &block)
+            BlockBody.raise_missing_tag_terminator(token, parse_context)
          end
          tag_name = Regexp.last_match(2)
          markup   = Regexp.last_match(4)
@@ -69,9 +69,9 @@ module Liquid

        case condition.child_relation
        when :or
-          break if Liquid::Utils.to_liquid_value(result)
+          break if result
        when :and
-          break unless Liquid::Utils.to_liquid_value(result)
+          break unless result
        else
          break
        end
@@ -159,10 +159,8 @@ module Liquid
    class ParseTreeVisitor < Liquid::ParseTreeVisitor
      def children
        [
-          @node.left,
-          @node.right,
-          @node.child_condition,
-          @node.attachment
+          @node.left, @node.right,
+          @node.child_condition, @node.attachment
        ].compact
      end
    end
@@ -144,7 +144,7 @@ module Liquid
      self.class.build(
        resource_limits: resource_limits,
        static_environments: static_environments,
-        registers: Registers.new(registers),
+        registers: Registers.new(registers)
      ).tap do |subcontext|
        subcontext.base_scope_depth   = base_scope_depth + 1
        subcontext.exception_renderer = exception_renderer
@@ -25,10 +25,6 @@ module Liquid
  class Drop
    attr_writer :context

-    def initialize
-      @context = nil
-    end
-
    # Catch all for the method
    def liquid_method_missing(method)
      return nil unless @context&.strict_variables
@@ -3,10 +3,7 @@
 module Liquid
  class Expression
    LITERALS = {
-      nil => nil,
-      'nil' => nil,
-      'null' => nil,
-      '' => nil,
+      nil => nil, 'nil' => nil, 'null' => nil, '' => nil,
      'true' => true,
      'false' => false,
      'blank' => '',
@@ -5,7 +5,7 @@ module Liquid
  # @liquid_type object
  # @liquid_name forloop
  # @liquid_summary
-  #   Information about a parent [`for` loop](/docs/api/liquid/tags/for).
+  #   Information about a parent [`for` loop](/api/liquid/tags#for).
  class ForloopDrop < Drop
    def initialize(name, length, parentloop)
      @name       = name
@@ -30,7 +30,10 @@ module Liquid
    # @liquid_return [forloop]
    attr_reader :parentloop

-    attr_reader :name
+    def name
+      Usage.increment('forloop_drop_name')
+      @name
+    end

    # @liquid_public_docs
    # @liquid_summary
@@ -4,8 +4,7 @@ module Liquid
  class PartialCache
    def self.load(template_name, context:, parse_context:)
      cached_partials = context.registers[:cached_partials]
-      cache_key = "#{template_name}:#{parse_context.error_mode}"
-      cached = cached_partials[cache_key]
+      cached = cached_partials[template_name]
      return cached if cached

      file_system = context.registers[:file_system]
@@ -16,16 +15,8 @@ module Liquid
      template_factory = context.registers[:template_factory]
      template = template_factory.for(template_name)

-      begin
-        partial = template.parse(source, parse_context)
-      rescue Liquid::Error => e
-        e.template_name = template&.name || template_name
-        raise e
-      end
-
-      partial.name ||= template_name
-
-      cached_partials[cache_key] = partial
+      partial = template.parse(source, parse_context)
+      cached_partials[template_name] = partial
    ensure
      parse_context.partial = false
    end
@@ -6,14 +6,7 @@ require 'bigdecimal'

 module Liquid
  module StandardFilters
-    MAX_I32 = (1 << 31) - 1
-    private_constant :MAX_I32
-
-    MIN_I64 = -(1 << 63)
-    MAX_I64 = (1 << 63) - 1
-    I64_RANGE = MIN_I64..MAX_I64
-    private_constant :MIN_I64, :MAX_I64, :I64_RANGE
-
+    MAX_INT = (1 << 31) - 1
    HTML_ESCAPE = {
      '&' => '&amp;',
      '>' => '&gt;',
@@ -25,7 +18,7 @@ module Liquid
    STRIP_HTML_BLOCKS       = Regexp.union(
      %r{<script.*?</script>}m,
      /<!--.*?-->/m,
-      %r{<style.*?</style>}m,
+      %r{<style.*?</style>}m
    )
    STRIP_HTML_TAGS = /<.*?>/m

@@ -69,7 +62,7 @@ module Liquid
    # @liquid_type filter
    # @liquid_category string
    # @liquid_summary
-    #   Capitalizes the first word in a string and downcases the remaining characters.
+    #   Capitalizes the first word in a string.
    # @liquid_syntax string | capitalize
    # @liquid_return [string]
    def capitalize(input)
@@ -193,19 +186,10 @@ module Liquid
      offset = Utils.to_integer(offset)
      length = length ? Utils.to_integer(length) : 1

-      begin
-        if input.is_a?(Array)
-          input.slice(offset, length) || []
-        else
-          input.to_s.slice(offset, length) || ''
-        end
-      rescue RangeError
-        if I64_RANGE.cover?(length) && I64_RANGE.cover?(offset)
-          raise # unexpected error
-        end
-        offset = offset.clamp(I64_RANGE)
-        length = length.clamp(I64_RANGE)
-        retry
+      if input.is_a?(Array)
+        input.slice(offset, length) || []
+      else
+        input.to_s.slice(offset, length) || ''
      end
    end

@@ -255,9 +239,9 @@ module Liquid
      wordlist = begin
        input.split(" ", words + 1)
      rescue RangeError
-        # integer too big for String#split, but we can semantically assume no truncation is needed
-        return input if words + 1 > MAX_I32
-        raise # unexpected error
+        raise if words + 1 < MAX_INT
+        # e.g. integer #{words} too big to convert to `int'
+        raise Liquid::ArgumentError, "integer #{words} too big for truncatewords"
      end
      return input if wordlist.length <= words

@@ -615,7 +599,7 @@ module Liquid
    # @liquid_description
    #   > Note:
    #   > The `concat` filter won't filter out duplicates. If you want to remove duplicates, then you need to use the
-    #   > [`uniq` filter](/docs/api/liquid/filters/uniq).
+    #   > [`uniq` filter](/api/liquid/filters#uniq).
    # @liquid_syntax array | concat: array
    # @liquid_return [array[untyped]]
    def concat(input, array)
@@ -757,7 +741,7 @@ module Liquid
    # @liquid_type filter
    # @liquid_category math
    # @liquid_summary
-    #   Divides a number by a given number. The `divided_by` filter produces a result of the same type as the divisor. This means if you divide by an integer, the result will be an integer, and if you divide by a float, the result will be a float.
+    #   Divides a number by a given number.
    # @liquid_syntax number | divided_by: number
    # @liquid_return [number]
    def divided_by(input, operand)
@@ -857,9 +841,9 @@ module Liquid
    # @liquid_summary
    #   Sets a default value for any variable whose value is one of the following:
    #
-    #   - [`empty`](/docs/api/liquid/basics#empty)
-    #   - [`false`](/docs/api/liquid/basics#truthy-and-falsy)
-    #   - [`nil`](/docs/api/liquid/basics#nil)
+    #   - [`empty`](/api/liquid/basics#empty)
+    #   - [`false`](/api/liquid/basics#truthy-and-falsy)
+    #   - [`nil`](/api/liquid/basics#nil)
    # @liquid_syntax variable | default: variable
    # @liquid_return [untyped]
    # @liquid_optional_param allow_false [boolean] Whether to use false values instead of the default.
@@ -869,34 +853,6 @@ module Liquid
      false_check || (input.respond_to?(:empty?) && input.empty?) ? default_value : input
    end

-    # @liquid_public_docs
-    # @liquid_type filter
-    # @liquid_category array
-    # @liquid_summary
-    #   Returns the sum of all elements in an array.
-    # @liquid_syntax array | sum
-    # @liquid_return [number]
-    def sum(input, property = nil)
-      ary = InputIterator.new(input, context)
-      return 0 if ary.empty?
-
-      values_for_sum = ary.map do |item|
-        if property.nil?
-          item
-        elsif item.respond_to?(:[])
-          item[property]
-        else
-          0
-        end
-      rescue TypeError
-        raise_property_error(property)
-      end
-
-      InputIterator.new(values_for_sum, context).sum do |item|
-        Utils.to_number(item)
-      end
-    end
-
    private

    attr_reader :context
@@ -5,7 +5,7 @@ module Liquid
  # @liquid_type object
  # @liquid_name tablerowloop
  # @liquid_summary
-  #   Information about a parent [`tablerow` loop](/docs/api/liquid/tags/tablerow).
+  #   Information about a parent [`tablerow` loop](/api/liquid/tags#tablerow).
  class TablerowloopDrop < Drop
    def initialize(length, cols)
      @length = length
@@ -14,18 +14,12 @@ module Liquid
      end

      def disable_tags(*tag_names)
-        tag_names += disabled_tags
-        define_singleton_method(:disabled_tags) { tag_names }
+        @disabled_tags ||= []
+        @disabled_tags.concat(tag_names)
        prepend(Disabler)
      end

      private :new
-
-      protected
-
-      def disabled_tags
-        []
-      end
    end

    def initialize(tag_name, markup, parse_context)
@@ -3,6 +3,14 @@
 module Liquid
  class Tag
    module Disabler
+      module ClassMethods
+        attr_reader :disabled_tags
+      end
+
+      def self.prepended(base)
+        base.extend(ClassMethods)
+      end
+
      def render_to_output_buffer(context, output)
        context.with_disabled_tags(self.class.disabled_tags) do
          super
@@ -8,7 +8,7 @@ module Liquid
  # @liquid_summary
  #   Creates a new variable.
  # @liquid_description
-  #   You can create variables of any [basic type](/docs/api/liquid/basics#types), [object](/docs/api/liquid/objects), or object property.
+  #   You can create variables of any [basic type](/api/liquid/basics#types), [object](/api/liquid/objects), or object property.
  # @liquid_syntax
  #   {% assign variable_name = value %}
  # @liquid_syntax_keyword variable_name The name of the variable being created.
@@ -15,7 +15,7 @@ module Liquid
  # @liquid_category iteration
  # @liquid_name break
  # @liquid_summary
-  #   Stops a [`for` loop](/docs/api/liquid/tags/for) from iterating.
+  #   Stops a [`for` loop](/api/liquid/tags#for) from iterating.
  # @liquid_syntax
  #   {% break %}
  class Break < Tag
@@ -77,7 +77,7 @@ module Liquid
        end

        result = Liquid::Utils.to_liquid_value(
-          block.evaluate(context),
+          block.evaluate(context)
        )

        if result
@@ -8,7 +8,7 @@ module Liquid
  # @liquid_summary
  #   Prevents an expression from being rendered or output.
  # @liquid_description
-  #   Any text inside `comment` tags won't be output, and any Liquid code will be parsed, but not executed.
+  #   Any text inside `comment` tags won't be output, and any Liquid code won't be rendered.
  # @liquid_syntax
  #   {% comment %}
  #     content
@@ -6,7 +6,7 @@ module Liquid
  # @liquid_category iteration
  # @liquid_name continue
  # @liquid_summary
-  #   Causes a [`for` loop](/docs/api/liquid/tags/for) to skip to the next iteration.
+  #   TESTING TESTING Causes a [`for` loop](/api/liquid/tags#for) to skip to the next iteration.
  # @liquid_syntax
  #   {% continue %}
  class Continue < Tag
@@ -6,7 +6,7 @@ module Liquid
  # @liquid_category iteration
  # @liquid_name cycle
  # @liquid_summary
-  #   Loops through a group of strings and outputs them one at a time for each iteration of a [`for` loop](/docs/api/liquid/tags/for).
+  #   Loops through a group of strings and outputs them one at a time for each iteration of a [`for` loop](/api/liquid/tags#for).
  # @liquid_description
  #   The `cycle` tag must be used inside a `for` loop.
  #
@@ -12,8 +12,8 @@ module Liquid
  #   or [section](/themes/architecture/sections) file that they're created in. However, the variable is shared across
  #   [snippets](/themes/architecture#snippets) included in the file.
  #
-  #   Similarly, variables that are created with `decrement` are independent from those created with [`assign`](/docs/api/liquid/tags/assign)
-  #   and [`capture`](/docs/api/liquid/tags/capture). However, `decrement` and [`increment`](/docs/api/liquid/tags/increment) share
+  #   Similarly, variables that are created with `decrement` are independent from those created with [`assign`](/api/liquid/tags#assign)
+  #   and [`capture`](/api/liquid/tags#capture). However, `decrement` and [`increment`](/api/liquid/tags#increment) share
  #   variables.
  # @liquid_syntax
  #   {% decrement variable_name %}
@@ -9,10 +9,10 @@ module Liquid
  #   Outputs an expression.
  # @liquid_description
  #   Using the `echo` tag is the same as wrapping an expression in curly brackets (`{{` and `}}`). However, unlike the curly
-  #   bracket method, you can use the `echo` tag inside [`liquid` tags](/docs/api/liquid/tags/liquid).
+  #   bracket method, you can use the `echo` tag inside [`liquid` tags](/api/liquid/tags#liquid).
  #
  #   > Tip:
-  #   > You can use [filters](/docs/api/liquid/filters) on expressions inside `echo` tags.
+  #   > You can use [filters](/api/liquid/filters) on expressions inside `echo` tags.
  # @liquid_syntax
  #   {% liquid
  #     echo expression
@@ -9,10 +9,10 @@ module Liquid
  #   Renders an expression for every item in an array.
  # @liquid_description
  #   You can do a maximum of 50 iterations with a `for` loop. If you need to iterate over more than 50 items, then use the
-  #   [`paginate` tag](/docs/api/liquid/tags/paginate) to split the items over multiple pages.
+  #   [`paginate` tag](/api/liquid/tags#paginate) to split the items over multiple pages.
  #
  #   > Tip:
-  #   > Every `for` loop has an associated [`forloop` object](/docs/api/liquid/objects/forloop) with information about the loop.
+  #   > Every `for` loop has an associated [`forloop` object](/api/liquid/objects#forloop) with information about the loop.
  # @liquid_syntax
  #   {% for variable in array %}
  #     expression
@@ -98,12 +98,11 @@ module Liquid
      @name     = "#{@variable_name}-#{collection_name}"
      @reversed = p.id?('reversed')

-      while p.look(:comma) || p.look(:id)
-        p.consume?(:comma)
+      while p.look(:id) && p.look(:colon, 1)
        unless (attribute = p.id?('limit') || p.id?('offset'))
          raise SyntaxError, options[:locale].t("errors.syntax.for_invalid_attribute")
        end
-        p.consume(:colon)
+        p.consume
        set_attribute(attribute, p.expression)
      end
      p.consume(:end_of_string)
@@ -178,6 +177,7 @@ module Liquid
      case key
      when 'offset'
        @from = if expr == 'continue'
+          Usage.increment('for_offset_continue')
          :continue
        else
          parse_expression(expr)
@@ -53,7 +53,7 @@ module Liquid
    def render_to_output_buffer(context, output)
      @blocks.each do |block|
        result = Liquid::Utils.to_liquid_value(
-          block.evaluate(context),
+          block.evaluate(context)
        )

        if result
@@ -8,7 +8,7 @@ module Liquid
  # @liquid_summary
  #   Renders a [snippet](/themes/architecture#snippets).
  # @liquid_description
-  #   Inside the snippet, you can access and alter variables that are [created](/docs/api/liquid/tags/variable-tags) outside of the
+  #   Inside the snippet, you can access and alter variables that are [created](/api/liquid/tags#variable-tags) outside of the
  #   snippet.
  # @liquid_syntax
  #   {% include 'filename' %}
@@ -16,7 +16,7 @@ module Liquid
  # @liquid_deprecated
  #   Deprecated because the way that variables are handled reduces performance and makes code harder to both read and maintain.
  #
-  #   The `include` tag has been replaced by [`render`](/docs/api/liquid/tags/render).
+  #   The `include` tag has been replaced by [`render`](/api/liquid/tags#render).
  class Include < Tag
    prepend Tag::Disableable

@@ -52,12 +52,12 @@ module Liquid

    def render_to_output_buffer(context, output)
      template_name = context.evaluate(@template_name_expr)
-      raise ArgumentError, options[:locale].t("errors.argument.include") unless template_name.is_a?(String)
+      raise ArgumentError, options[:locale].t("errors.argument.include") unless template_name

      partial = PartialCache.load(
        template_name,
        context: context,
-        parse_context: parse_context,
+        parse_context: parse_context
      )

      context_variable_name = @alias_name || template_name.split('/').last
@@ -70,11 +70,9 @@ module Liquid

      old_template_name = context.template_name
      old_partial       = context.partial
-
      begin
-        context.template_name = partial.name
-        context.partial = true
-
+        context.template_name = template_name
+        context.partial       = true
        context.stack do
          @attributes.each do |key, value|
            context[key] = context.evaluate(value)
@@ -12,8 +12,8 @@ module Liquid
  #   or [section](/themes/architecture/sections) file that they're created in. However, the variable is shared across
  #   [snippets](/themes/architecture#snippets) included in the file.
  #
-  #   Similarly, variables that are created with `increment` are independent from those created with [`assign`](/docs/api/liquid/tags/assign)
-  #   and [`capture`](/docs/api/liquid/tags/capture). However, `increment` and [`decrement`](/docs/api/liquid/tags/decrement) share
+  #   Similarly, variables that are created with `increment` are independent from those created with [`assign`](/api/liquid/tags#assign)
+  #   and [`capture`](/api/liquid/tags#capture). However, `increment` and [`decrement`](/api/liquid/tags#decrement) share
  #   variables.
  # @liquid_syntax
  #   {% increment variable_name %}
@@ -1,6 +1,19 @@
 # frozen_string_literal: true

 module Liquid
+  # @liquid_public_docs
+  # @liquid_type tag
+  # @liquid_category syntax
+  # @liquid_name inline_comment
+  # @liquid_summary
+  #   Prevents an expression from being rendered or output.
+  # @liquid_description
+  #   Any text inside an `inline_comment` tag won't be rendered or output.
+  #
+  #   You can create multi-line inline comments. However, each line must begin with a `#`.
+  # @liquid_syntax
+  #   {% # content %}
+  # @liquid_syntax_keyword content The content of the comment.
  class InlineComment < Tag
    def initialize(tag_name, markup, options)
      super
@@ -14,7 +14,7 @@ module Liquid
  # @liquid_syntax_keyword expression The expression to be output without being rendered.
  class Raw < Block
    Syntax = /\A\s*\z/
-    FullTokenPossiblyInvalid = /\A(.*)#{TagStart}#{WhitespaceControl}?\s*(\w+)\s*(.*)?#{WhitespaceControl}?#{TagEnd}\z/om
+    FullTokenPossiblyInvalid = /\A(.*)#{TagStart}\s*(\w+)\s*(.*)?#{TagEnd}\z/om

    def initialize(tag_name, markup, parse_context)
      super
@@ -26,7 +26,6 @@ module Liquid
      @body = +''
      while (token = tokens.shift)
        if token =~ FullTokenPossiblyInvalid && block_delimiter == Regexp.last_match(2)
-          parse_context.trim_whitespace = (token[-3] == WhitespaceControl)
          @body << Regexp.last_match(1) if Regexp.last_match(1) != ""
          return
        end
@@ -8,19 +8,19 @@ module Liquid
  # @liquid_summary
  #   Renders a [snippet](/themes/architecture#snippets) or [app block](/themes/architecture/sections/section-schema#render-app-blocks).
  # @liquid_description
-  #   Inside snippets and app blocks, you can't directly access variables that are [created](/docs/api/liquid/tags/variable-tags) outside
-  #   of the snippet or app block. However, you can [specify variables as parameters](/docs/api/liquid/tags/render#render-passing-variables-to-a-snippet)
+  #   Inside snippets and app blocks, you can't directly access variables that are [created](/api/liquid/tags#variable-tags) outside
+  #   of the snippet or app block. However, you can [specify variables as parameters](/api/liquid/tags#render-passing-variables-to-snippets)
  #   to pass outside variables to snippets.
  #
  #   While you can't directly access created variables, you can access global objects, as well as any objects that are
  #   directly accessible outside the snippet or app block. For example, a snippet or app block inside the [product template](/themes/architecture/templates/product)
-  #   can access the [`product` object](/docs/api/liquid/objects/product), and a snippet or app block inside a [section](/themes/architecture/sections)
-  #   can access the [`section` object](/docs/api/liquid/objects/section).
+  #   can access the [`product` object](/api/liquid/objects#product), and a snippet or app block inside a [section](/themes/architecture/sections)
+  #   can access the [`section` object](/api/liquid/objects#section).
  #
  #   Outside a snippet or app block, you can't access variables created inside the snippet or app block.
  #
  #   > Note:
-  #   > When you render a snippet using the `render` tag, you can't use the [`include` tag](/docs/api/liquid/tags/include)
+  #   > When you render a snippet using the `render` tag, you can't use the [`include` tag](/api/liquid/tags#include)
  #   > inside the snippet.
  # @liquid_syntax
  #   {% render 'filename' %}
@@ -69,14 +69,14 @@ module Liquid
      partial = PartialCache.load(
        template_name,
        context: context,
-        parse_context: parse_context,
+        parse_context: parse_context
      )

      context_variable_name = @alias_name || template_name.split('/').last

      render_partial_func = ->(var, forloop) {
        inner_context               = context.new_isolated_subcontext
-        inner_context.template_name = partial.name
+        inner_context.template_name = template_name
        inner_context.partial       = true
        inner_context['forloop']    = forloop if forloop

@@ -11,7 +11,7 @@ module Liquid
  #   The `tablerow` tag must be wrapped in HTML `<table>` and `</table>` tags.
  #
  #   > Tip:
-  #   > Every `tablerow` loop has an associated [`tablerowloop` object](/docs/api/liquid/objects/tablerowloop) with information about the loop.
+  #   > Every `tablerow` loop has an associated [`tablerowloop` object](/api/liquid/objects#tablerowloop) with information about the loop.
  # @liquid_syntax
  #   {% tablerow variable in array %}
  #     expression
@@ -45,13 +45,13 @@ module Liquid
    def render_to_output_buffer(context, output)
      (collection = context.evaluate(@collection_name)) || (return '')

-      from = @attributes.key?('offset') ? to_integer(context.evaluate(@attributes['offset'])) : 0
-      to = @attributes.key?('limit') ? from + to_integer(context.evaluate(@attributes['limit'])) : nil
+      from = @attributes.key?('offset') ? context.evaluate(@attributes['offset']).to_i : 0
+      to   = @attributes.key?('limit')  ? from + context.evaluate(@attributes['limit']).to_i : nil

      collection = Utils.slice_collection(collection, from, to)
      length     = collection.length

-      cols = @attributes.key?('cols') ? to_integer(context.evaluate(@attributes['cols'])) : length
+      cols = context.evaluate(@attributes['cols']).to_i

      output << "<tr class=\"row1\">\n"
      context.stack do
@@ -82,14 +82,6 @@ module Liquid
        super + @node.attributes.values + [@node.collection_name]
      end
    end
-
-    private
-
-    def to_integer(value)
-      value.to_i
-    rescue NoMethodError
-      raise Liquid::ArgumentError, "invalid integer"
-    end
  end

  Template.register_tag('tablerow', TableRow)
@@ -11,7 +11,7 @@ module Liquid
  #   Renders an expression unless a specific condition is `true`.
  # @liquid_description
  #   > Tip:
-  #   > Similar to the [`if` tag](/docs/api/liquid/tags/if), you can use `elsif` to add more conditions to an `unless` tag.
+  #   > Similar to the [`if` tag](/api/liquid/tags#if), you can use `elsif` to add more conditions to an `unless` tag.
  # @liquid_syntax
  #   {% unless condition %}
  #     expression
@@ -23,7 +23,7 @@ module Liquid
      # First condition is interpreted backwards ( if not )
      first_block = @blocks.first
      result = Liquid::Utils.to_liquid_value(
-        first_block.evaluate(context),
+        first_block.evaluate(context)
      )

      unless result
@@ -33,7 +33,7 @@ module Liquid
      # After the first condition unless works just like if
      @blocks[1..-1].each do |block|
        result = Liquid::Utils.to_liquid_value(
-          block.evaluate(context),
+          block.evaluate(context)
        )

        if result
@@ -15,7 +15,7 @@ module Liquid
  #   template.render('user_name' => 'bob')
  #
  class Template
-    attr_accessor :root, :name
+    attr_accessor :root
    attr_reader :resource_limits, :warnings

    class TagRegistry
@@ -189,8 +189,6 @@ module Liquid
        @profiler = context.profiler = Liquid::Profiler.new
      end

-      context.template_name ||= name
-
      begin
        # render the nodelist.
        @root.render_to_output_buffer(context, output || +'')
@@ -8,15 +8,11 @@ module Liquid
      @source         = source.to_s.to_str
      @line_number    = line_number || (line_numbers ? 1 : nil)
      @for_liquid_tag = for_liquid_tag
-      @offset         = 0
      @tokens         = tokenize
    end

    def shift
-      token = @tokens[@offset]
-      return nil unless token
-
-      @offset += 1
+      (token = @tokens.shift) || return

      if @line_number
        @line_number += @for_liquid_tag ? 1 : token.count("\n")
@@ -35,9 +31,7 @@ module Liquid
      tokens = @source.split(TemplateParser)

      # removes the rogue empty element at the beginning of the array
-      if tokens[0]&.empty?
-        @offset += 1
-      end
+      tokens.shift if tokens[0]&.empty?

      tokens
    end
@@ -49,3 +49,8 @@ module Database
    end
  end
 end
+
+if __FILE__ == $PROGRAM_NAME
+  p(Database.tables['collections']['frontpage'].keys)
+  # p Database.tables['blog']['articles']
+end
@@ -45,8 +45,8 @@ class Paginate < Liquid::Block

      pagination['items']      = collection_size
      pagination['pages']      = page_count - 1
-      pagination['previous']   = link('&laquo; Previous', current_page - 1)  if 1 < current_page
-      pagination['next']       = link('Next &raquo;', current_page + 1)      if page_count > current_page + 1
+      pagination['previous']   = link('&laquo; Previous', current_page - 1)  unless 1 >= current_page
+      pagination['next']       = link('Next &raquo;', current_page + 1)      unless page_count <= current_page + 1
      pagination['parts']      = []

      hellip_break = false
@@ -14,25 +14,19 @@ class AssignTest < Minitest::Test
  end

  def test_assigned_variable
-    assert_template_result(
-      '.foo.',
+    assert_template_result('.foo.',
      '{% assign foo = values %}.{{ foo[0] }}.',
-      { 'values' => %w(foo bar baz) },
-    )
+      { 'values' => %w(foo bar baz) })

-    assert_template_result(
-      '.bar.',
+    assert_template_result('.bar.',
      '{% assign foo = values %}.{{ foo[1] }}.',
-      { 'values' => %w(foo bar baz) },
-    )
+      { 'values' => %w(foo bar baz) })
  end

  def test_assign_with_filter
-    assert_template_result(
-      '.bar.',
+    assert_template_result('.bar.',
      '{% assign foo = values | split: "," %}.{{ foo[1] }}.',
-      { 'values' => "foo,bar,baz" },
-    )
+      { 'values' => "foo,bar,baz" })
  end

  def test_assign_syntax_error
@@ -40,11 +34,8 @@ class AssignTest < Minitest::Test
  end

  def test_assign_uses_error_mode
-    assert_match_syntax_error(
-      "Expected dotdot but found pipe in ",
-      "{% assign foo = ('X' | downcase) %}",
-      error_mode: :strict,
-    )
+    assert_match_syntax_error("Expected dotdot but found pipe in ",
+      "{% assign foo = ('X' | downcase) %}", error_mode: :strict)
    assert_template_result("", "{% assign foo = ('X' | downcase) %}", error_mode: :lax)
  end

@@ -57,11 +57,9 @@ class BlankTest < Minitest::Test

  def test_nested_blocks_are_blank_but_only_if_all_children_are
    assert_template_result("", wrap(wrap(" ")))
-    assert_template_result(
-      "\n       but this is not " * (N + 1),
+    assert_template_result("\n       but this is not " * (N + 1),
      wrap('{% if true %} {% comment %} this is blank {% endcomment %} {% endif %}
-      {% if true %} but this is not {% endif %}'),
-    )
+      {% if true %} but this is not {% endif %}'))
  end

  def test_assigns_are_blank
@@ -91,21 +89,12 @@ class BlankTest < Minitest::Test
  end

  def test_include_is_blank
-    assert_template_result(
-      "foobar" * (N + 1),
-      wrap("{% include 'foobar' %}"),
-      partials: { 'foobar' => 'foobar' },
-    )
-    assert_template_result(
-      " foobar " * (N + 1),
-      wrap("{% include ' foobar ' %}"),
-      partials: { ' foobar ' => ' foobar ' },
-    )
-    assert_template_result(
-      "   " * (N + 1),
-      wrap(" {% include ' ' %} "),
-      partials: { ' ' => ' ' },
-    )
+    assert_template_result("foobar" * (N + 1), wrap("{% include 'foobar' %}"),
+      partials: { 'foobar' => 'foobar' })
+    assert_template_result(" foobar " * (N + 1), wrap("{% include ' foobar ' %}"),
+      partials: { ' foobar ' => ' foobar ' })
+    assert_template_result("   " * (N + 1), wrap(" {% include ' ' %} "),
+      partials: { ' ' => ' ' })
  end

  def test_case_is_blank
@@ -121,23 +121,14 @@ class ContextTest < Minitest::Test
  end

  def test_length_query
-    assert_template_result(
-      "true",
-      "{% if numbers.size == 4 %}true{% endif %}",
-      { "numbers" => [1, 2, 3, 4] },
-    )
+    assert_template_result("true", "{% if numbers.size == 4 %}true{% endif %}",
+      { "numbers" => [1, 2, 3, 4] })

-    assert_template_result(
-      "true",
-      "{% if numbers.size == 4 %}true{% endif %}",
-      { "numbers" => { 1 => 1, 2 => 2, 3 => 3, 4 => 4 } },
-    )
+    assert_template_result("true", "{% if numbers.size == 4 %}true{% endif %}",
+      { "numbers" => { 1 => 1, 2 => 2, 3 => 3, 4 => 4 } })

-    assert_template_result(
-      "true",
-      "{% if numbers.size == 1000 %}true{% endif %}",
-      { "numbers" => { 1 => 1, 2 => 2, 3 => 3, 4 => 4, 'size' => 1000 } },
-    )
+    assert_template_result("true", "{% if numbers.size == 1000 %}true{% endif %}",
+      { "numbers" => { 1 => 1, 2 => 2, 3 => 3, 4 => 4, 'size' => 1000 } })
  end

  def test_hyphenated_variable
@@ -237,14 +228,12 @@ class ContextTest < Minitest::Test
  end

  def test_hash_to_array_transition
-    assigns = {
-      'colors' => {
-        'Blue' => ['003366', '336699', '6699CC', '99CCFF'],
-        'Green' => ['003300', '336633', '669966', '99CC99'],
-        'Yellow' => ['CC9900', 'FFCC00', 'FFFF99', 'FFFFCC'],
-        'Red' => ['660000', '993333', 'CC6666', 'FF9999'],
-      },
-    }
+    assigns = { 'colors' => {
+      'Blue' => ['003366', '336699', '6699CC', '99CCFF'],
+      'Green' => ['003300', '336633', '669966', '99CC99'],
+      'Yellow' => ['CC9900', 'FFCC00', 'FFFF99', 'FFFFCC'],
+      'Red' => ['660000', '993333', 'CC6666', 'FF9999'],
+    } }

    assert_template_result("003366", "{{ colors.Blue[0] }}", assigns)
    assert_template_result("FF9999", "{{ colors.Red[3] }}", assigns)
@@ -273,7 +262,7 @@ class ContextTest < Minitest::Test
    assigns = { 'product' => { 'variants' => [{ 'title' => 'draft151cm' }, { 'title' => 'element151cm' }] } }
    assert_template_result("draft151cm", '{{ product["variants"][0]["title"] }}', assigns)
    assert_template_result("element151cm", '{{ product["variants"][1]["title"] }}', assigns)
-    assert_template_result("draft151cm", '{{ product["variants"].first["title"] }}', assigns)
+    assert_template_result("draft151cm", '{{ product["variants"][0]["title"] }}', assigns)
    assert_template_result("element151cm", '{{ product["variants"].last["title"] }}', assigns)
  end

@@ -421,12 +410,10 @@ class ContextTest < Minitest::Test
  def test_nested_lambda_is_called_once
    @global = 0

-    @context['callcount'] = {
-      "lambda" => proc {
-                    @global += 1
-                    @global.to_s
-                  },
-    }
+    @context['callcount'] = { "lambda" => proc {
+                                            @global += 1
+                                            @global.to_s
+                                          } }

    assert_equal('1', @context['callcount.lambda'])
    assert_equal('1', @context['callcount.lambda'])
@@ -436,11 +423,10 @@ class ContextTest < Minitest::Test
  def test_lambda_in_array_is_called_once
    @global = 0

-    p = proc {
-      @global += 1
-      @global.to_s
-    }
-    @context['callcount'] = [1, 2, p, 4, 5]
+    @context['callcount'] = [1, 2, proc {
+                                     @global += 1
+                                     @global.to_s
+                                   }, 4, 5]

    assert_equal('1', @context['callcount[2]'])
    assert_equal('1', @context['callcount[2]'])
@@ -487,7 +473,7 @@ class ContextTest < Minitest::Test
  def test_static_environments_are_read_with_lower_priority_than_environments
    context = Context.build(
      static_environments: { 'shadowed' => 'static', 'unshadowed' => 'static' },
-      environments: { 'shadowed' => 'dynamic' },
+      environments: { 'shadowed' => 'dynamic' }
    )

    assert_equal('dynamic', context['shadowed'])
@@ -105,8 +105,7 @@ class ErrorHandlingTest < Minitest::Test
  end

  def test_parsing_warn_with_line_numbers_adds_numbers_to_lexer_errors
-    template = Liquid::Template.parse(
-      '
+    template = Liquid::Template.parse('
        foobar

        {% if 1 =! 2 %}ok{% endif %}
@@ -114,19 +113,15 @@ class ErrorHandlingTest < Minitest::Test
        bla
            ',
      error_mode: :warn,
-      line_numbers: true,
-    )
+      line_numbers: true)

-    assert_equal(
-      ['Liquid syntax error (line 4): Unexpected character = in "1 =! 2"'],
-      template.warnings.map(&:message),
-    )
+    assert_equal(['Liquid syntax error (line 4): Unexpected character = in "1 =! 2"'],
+      template.warnings.map(&:message))
  end

  def test_parsing_strict_with_line_numbers_adds_numbers_to_lexer_errors
    err = assert_raises(SyntaxError) do
-      Liquid::Template.parse(
-        '
+      Liquid::Template.parse('
          foobar

          {% if 1 =! 2 %}ok{% endif %}
@@ -134,8 +129,7 @@ class ErrorHandlingTest < Minitest::Test
          bla
                ',
        error_mode: :strict,
-        line_numbers: true,
-      )
+        line_numbers: true)
    end

    assert_equal('Liquid syntax error (line 4): Unexpected character = in "1 =! 2"', err.message)
@@ -263,81 +257,4 @@ class ErrorHandlingTest < Minitest::Test
    output = Liquid::Template.parse("{% assign x = 0 %}{% if 1 < '2' %}{% assign x = 3 %}{% endif %}{{ x }}").render
    assert_equal("0", output)
  end
-
-  def test_syntax_error_is_raised_with_template_name
-    file_system = StubFileSystem.new("snippet" => "1\n2\n{{ 1")
-
-    context = Liquid::Context.build(
-      registers: { file_system: file_system },
-    )
-
-    template = Template.parse(
-      '{% render "snippet" %}',
-      line_numbers: true,
-    )
-    template.name = "template/index"
-
-    assert_equal(
-      "Liquid syntax error (snippet line 3): Variable '{{' was not properly terminated with regexp: /\\}\\}/",
-      template.render(context),
-    )
-  end
-
-  def test_syntax_error_is_raised_with_template_name_from_template_factory
-    file_system = StubFileSystem.new("snippet" => "1\n2\n{{ 1")
-
-    context = Liquid::Context.build(
-      registers: {
-        file_system: file_system,
-        template_factory: StubTemplateFactory.new,
-      },
-    )
-
-    template = Template.parse(
-      '{% render "snippet" %}',
-      line_numbers: true,
-    )
-    template.name = "template/index"
-
-    assert_equal(
-      "Liquid syntax error (some/path/snippet line 3): Variable '{{' was not properly terminated with regexp: /\\}\\}/",
-      template.render(context),
-    )
-  end
-
-  def test_error_is_raised_during_parse_with_template_name
-    depth = Liquid::Block::MAX_DEPTH + 1
-    code = "{% if true %}" * depth + "rendered" + "{% endif %}" * depth
-
-    template = Template.parse("{% render 'snippet' %}", line_numbers: true)
-
-    context = Liquid::Context.build(
-      registers: {
-        file_system: StubFileSystem.new("snippet" => code),
-        template_factory: StubTemplateFactory.new,
-      },
-    )
-
-    assert_equal("Liquid error (some/path/snippet line 1): Nesting too deep", template.render(context))
-  end
-
-  def test_internal_error_is_raised_with_template_name
-    template = Template.new
-    template.parse(
-      "{% render 'snippet' %}",
-      line_numbers: true,
-    )
-    template.name = "template/index"
-
-    context = Liquid::Context.build(
-      registers: {
-        file_system: StubFileSystem.new({}),
-      },
-    )
-
-    assert_equal(
-      "Liquid error (template/index line 1): internal",
-      template.render(context),
-    )
-  end
 end
@@ -32,11 +32,11 @@ class ExpressionTest < Minitest::Test

    assert_match_syntax_error(
      "Liquid syntax error (line 1): Invalid expression type 'false' in range expression",
-      "{{ (false..true) }}",
+      "{{ (false..true) }}"
    )
    assert_match_syntax_error(
      "Liquid syntax error (line 1): Invalid expression type '(1..2)' in range expression",
-      "{{ ((1..2)..3) }}",
+      "{{ ((1..2)..3) }}"
    )
  end

@@ -17,7 +17,7 @@ class FilterKwargTest < Minitest::Test
    with_global_filter(KwargFilter) do
      assert_equal(
        "data-src='src' data-widths='100, 200'",
-        Template.parse("{{ 'img' | html_tag: data-src: 'src', data-widths: '100, 200' }}").render(nil, nil),
+        Template.parse("{{ 'img' | html_tag: data-src: 'src', data-widths: '100, 200' }}").render(nil, nil)
      )
    end
  end
@@ -68,34 +68,22 @@ class FiltersTest < Minitest::Test

  def test_sort
    assert_template_result("1 2 3 4", "{{numbers | sort | join}}", { "numbers" => [2, 1, 4, 3] })
-    assert_template_result(
-      "alphabetic as expected",
-      "{{words | sort | join}}",
-      { "words" => ['expected', 'as', 'alphabetic'] },
-    )
+    assert_template_result("alphabetic as expected", "{{words | sort | join}}",
+      { "words" => ['expected', 'as', 'alphabetic'] })
    assert_template_result("3", "{{value | sort}}", { "value" => 3 })
    assert_template_result('are flower', "{{arrays | sort | join}}", { 'arrays' => ['flower', 'are'] })
-    assert_template_result(
-      "Expected case sensitive",
-      "{{case_sensitive | sort | join}}",
-      { "case_sensitive" => ["sensitive", "Expected", "case"] },
-    )
+    assert_template_result("Expected case sensitive", "{{case_sensitive | sort | join}}",
+      { "case_sensitive" => ["sensitive", "Expected", "case"] })
  end

  def test_sort_natural
    # Test strings
-    assert_template_result(
-      "Assert case Insensitive",
-      "{{words | sort_natural | join}}",
-      { "words" => ["case", "Assert", "Insensitive"] },
-    )
+    assert_template_result("Assert case Insensitive", "{{words | sort_natural | join}}",
+      { "words" => ["case", "Assert", "Insensitive"] })

    # Test hashes
-    assert_template_result(
-      "A b C",
-      "{{hashes | sort_natural: 'a' | map: 'a' | join}}",
-      { "hashes" => [{ "a" => "A" }, { "a" => "b" }, { "a" => "C" }] },
-    )
+    assert_template_result("A b C", "{{hashes | sort_natural: 'a' | map: 'a' | join}}",
+      { "hashes" => [{ "a" => "A" }, { "a" => "b" }, { "a" => "C" }] })

    # Test objects
    @context['objects'] = [TestObject.new('A'), TestObject.new('b'), TestObject.new('C')]
@@ -104,18 +92,12 @@ class FiltersTest < Minitest::Test

  def test_compact
    # Test strings
-    assert_template_result(
-      "a b c",
-      "{{words | compact | join}}",
-      { "words" => ['a', nil, 'b', nil, 'c'] },
-    )
+    assert_template_result("a b c", "{{words | compact | join}}",
+      { "words" => ['a', nil, 'b', nil, 'c'] })

    # Test hashes
-    assert_template_result(
-      "A C",
-      "{{hashes | compact: 'a' | map: 'a' | join}}",
-      { "hashes" => [{ "a" => "A" }, { "a" => nil }, { "a" => "C" }] },
-    )
+    assert_template_result("A C", "{{hashes | compact: 'a' | map: 'a' | join}}",
+      { "hashes" => [{ "a" => "A" }, { "a" => nil }, { "a" => "C" }] })

    # Test objects
    @context['objects'] = [TestObject.new('A'), TestObject.new(nil), TestObject.new('C')]
@@ -127,11 +109,8 @@ class FiltersTest < Minitest::Test
  end

  def test_strip_html_ignore_comments_with_html
-    assert_template_result(
-      "bla blub",
-      "{{ var | strip_html }}",
-      { "var" => "<!-- split and some <ul> tag --><b>bla blub</a>" },
-    )
+    assert_template_result("bla blub", "{{ var | strip_html }}",
+      { "var" => "<!-- split and some <ul> tag --><b>bla blub</a>" })
  end

  def test_capitalize
@@ -109,10 +109,6 @@ class StandardFiltersTest < Minitest::Test
    assert_raises(Liquid::ArgumentError) do
      @filters.slice('foobar', 0, "")
    end
-    assert_equal("", @filters.slice("foobar", 0, -(1 << 64)))
-    assert_equal("foobar", @filters.slice("foobar", 0, 1 << 63))
-    assert_equal("", @filters.slice("foobar", 1 << 63, 6))
-    assert_equal("", @filters.slice("foobar", -(1 << 63), 6))
  end

  def test_slice_on_arrays
@@ -127,10 +123,6 @@ class StandardFiltersTest < Minitest::Test
    assert_equal(%w(r), @filters.slice(input, -1))
    assert_equal(%w(), @filters.slice(input, 100, 10))
    assert_equal(%w(), @filters.slice(input, -100, 10))
-    assert_equal([], @filters.slice(input, 0, -(1 << 64)))
-    assert_equal(input, @filters.slice(input, 0, 1 << 63))
-    assert_equal([], @filters.slice(input, 1 << 63, 6))
-    assert_equal([], @filters.slice(input, -(1 << 63), 6))
  end

  def test_truncate
@@ -140,8 +132,6 @@ class StandardFiltersTest < Minitest::Test
    assert_equal('1234567890', @filters.truncate('1234567890'))
    assert_equal("测试...", @filters.truncate("测试测试测试测试", 5))
    assert_equal('12341', @filters.truncate("1234567890", 5, 1))
-    assert_equal("foobar", @filters.truncate("foobar", 1 << 63))
-    assert_equal("...", @filters.truncate("foobar", -(1 << 63)))
  end

  def test_split
@@ -188,7 +178,7 @@ class StandardFiltersTest < Minitest::Test
  def test_base64_url_safe_encode
    assert_equal(
      'YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXogQUJDREVGR0hJSktMTU5PUFFSU1RVVldYWVogMTIzNDU2Nzg5MCAhQCMkJV4mKigpLT1fKy8_Ljo7W117fVx8',
-      @filters.base64_url_safe_encode('abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ 1234567890 !@#$%^&*()-=_+/?.:;[]{}\|'),
+      @filters.base64_url_safe_encode('abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ 1234567890 !@#$%^&*()-=_+/?.:;[]{}\|')
    )
    assert_equal('', @filters.base64_url_safe_encode(nil))
  end
@@ -196,7 +186,7 @@ class StandardFiltersTest < Minitest::Test
  def test_base64_url_safe_decode
    assert_equal(
      'abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ 1234567890 !@#$%^&*()-=_+/?.:;[]{}\|',
-      @filters.base64_url_safe_decode('YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXogQUJDREVGR0hJSktMTU5PUFFSU1RVVldYWVogMTIzNDU2Nzg5MCAhQCMkJV4mKigpLT1fKy8_Ljo7W117fVx8'),
+      @filters.base64_url_safe_decode('YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXogQUJDREVGR0hJSktMTU5PUFFSU1RVVldYWVogMTIzNDU2Nzg5MCAhQCMkJV4mKigpLT1fKy8_Ljo7W117fVx8')
    )
    exception = assert_raises(Liquid::ArgumentError) do
      @filters.base64_url_safe_decode("invalidbase64")
@@ -230,15 +220,17 @@ class StandardFiltersTest < Minitest::Test
    assert_equal('one two three', @filters.truncatewords('one two three'))
    assert_equal(
      'Two small (13&#8221; x 5.5&#8221; x 10&#8221; high) baskets fit inside one large basket (13&#8221;...',
-      @filters.truncatewords('Two small (13&#8221; x 5.5&#8221; x 10&#8221; high) baskets fit inside one large basket (13&#8221; x 16&#8221; x 10.5&#8221; high) with cover.', 15),
+      @filters.truncatewords('Two small (13&#8221; x 5.5&#8221; x 10&#8221; high) baskets fit inside one large basket (13&#8221; x 16&#8221; x 10.5&#8221; high) with cover.', 15)
    )
    assert_equal("测试测试测试测试", @filters.truncatewords('测试测试测试测试', 5))
    assert_equal('one two1', @filters.truncatewords("one two three", 2, 1))
    assert_equal('one two three...', @filters.truncatewords("one  two\tthree\nfour", 3))
    assert_equal('one two...', @filters.truncatewords("one two three four", 2))
    assert_equal('one...', @filters.truncatewords("one two three four", 0))
-    assert_equal('one two three four', @filters.truncatewords("one two three four", 1 << 31))
-    assert_equal('one...', @filters.truncatewords("one two three four", -(1 << 32)))
+    exception = assert_raises(Liquid::ArgumentError) do
+      @filters.truncatewords("one two three four", 1 << 31)
+    end
+    assert_equal("Liquid error: integer #{1 << 31} too big for truncatewords", exception.message)
  end

  def test_strip_html
@@ -433,11 +425,8 @@ class StandardFiltersTest < Minitest::Test

  def test_map
    assert_equal([1, 2, 3, 4], @filters.map([{ "a" => 1 }, { "a" => 2 }, { "a" => 3 }, { "a" => 4 }], 'a'))
-    assert_template_result(
-      'abc',
-      "{{ ary | map:'foo' | map:'bar' }}",
-      { 'ary' => [{ 'foo' => { 'bar' => 'a' } }, { 'foo' => { 'bar' => 'b' } }, { 'foo' => { 'bar' => 'c' } }] },
-    )
+    assert_template_result('abc', "{{ ary | map:'foo' | map:'bar' }}",
+      { 'ary' => [{ 'foo' => { 'bar' => 'a' } }, { 'foo' => { 'bar' => 'b' } }, { 'foo' => { 'bar' => 'c' } }] })
  end

  def test_map_doesnt_call_arbitrary_stuff
@@ -461,11 +450,8 @@ class StandardFiltersTest < Minitest::Test
  end

  def test_map_on_hashes
-    assert_template_result(
-      "4217",
-      '{{ thing | map: "foo" | map: "bar" }}',
-      { "thing" => { "foo" => [{ "bar" => 42 }, { "bar" => 17 }] } },
-    )
+    assert_template_result("4217", '{{ thing | map: "foo" | map: "bar" }}',
+      { "thing" => { "foo" => [{ "bar" => 42 }, { "bar" => 17 }] } })
  end

  def test_legacy_map_on_hashes_with_dynamic_key
@@ -928,72 +914,6 @@ class StandardFiltersTest < Minitest::Test
    assert_equal([{ "foo" => true }, { "foo" => "for sure" }], @filters.where(input, "foo"))
  end

-  def test_sum_with_all_numbers
-    input = [1, 2]
-
-    assert_equal(3, @filters.sum(input))
-    assert_raises(Liquid::ArgumentError, "cannot select the property 'quantity'") do
-      @filters.sum(input, "quantity")
-    end
-  end
-
-  def test_sum_with_numeric_strings
-    input = [1, 2, "3", "4"]
-
-    assert_equal(10, @filters.sum(input))
-    assert_raises(Liquid::ArgumentError, "cannot select the property 'quantity'") do
-      @filters.sum(input, "quantity")
-    end
-  end
-
-  def test_sum_with_nested_arrays
-    input = [1, [2, [3, 4]]]
-
-    assert_equal(10, @filters.sum(input))
-    assert_raises(Liquid::ArgumentError, "cannot select the property 'quantity'") do
-      @filters.sum(input, "quantity")
-    end
-  end
-
-  def test_sum_with_indexable_map_values
-    input = [{ "quantity" => 1 }, { "quantity" => 2, "weight" => 3 }, { "weight" => 4 }]
-
-    assert_equal(0, @filters.sum(input))
-    assert_equal(3, @filters.sum(input, "quantity"))
-    assert_equal(7, @filters.sum(input, "weight"))
-    assert_equal(0, @filters.sum(input, "subtotal"))
-  end
-
-  def test_sum_with_indexable_non_map_values
-    input = [1, [2], "foo", { "quantity" => 3 }]
-
-    assert_equal(3, @filters.sum(input))
-    assert_raises(Liquid::ArgumentError, "cannot select the property 'quantity'") do
-      @filters.sum(input, "quantity")
-    end
-  end
-
-  def test_sum_with_unindexable_values
-    input = [1, true, nil, { "quantity" => 2 }]
-
-    assert_equal(1, @filters.sum(input))
-    assert_raises(Liquid::ArgumentError, "cannot select the property 'quantity'") do
-      @filters.sum(input, "quantity")
-    end
-  end
-
-  def test_sum_without_property_calls_to_liquid
-    t = TestThing.new
-    Liquid::Template.parse('{{ foo | sum }}').render("foo" => [t])
-    assert(t.foo > 0)
-  end
-
-  def test_sum_with_property_calls_to_liquid_on_property_values
-    t = TestThing.new
-    Liquid::Template.parse('{{ foo | sum: "quantity" }}').render("foo" => [{ "quantity" => t }])
-    assert(t.foo > 0)
-  end
-
  private

  def with_timezone(tz)
@@ -73,11 +73,9 @@ HERE

  def test_for_helpers
    assigns = { 'array' => [1, 2, 3] }
-    assert_template_result(
-      ' 1/3  2/3  3/3 ',
+    assert_template_result(' 1/3  2/3  3/3 ',
      '{%for item in array%} {{forloop.index}}/{{forloop.length}} {%endfor%}',
-      assigns,
-    )
+      assigns)
    assert_template_result(' 1  2  3 ', '{%for item in array%} {{forloop.index}} {%endfor%}', assigns)
    assert_template_result(' 0  1  2 ', '{%for item in array%} {{forloop.index0}} {%endfor%}', assigns)
    assert_template_result(' 2  1  0 ', '{%for item in array%} {{forloop.rindex0}} {%endfor%}', assigns)
@@ -88,11 +86,9 @@ HERE

  def test_for_and_if
    assigns = { 'array' => [1, 2, 3] }
-    assert_template_result(
-      '+--',
+    assert_template_result('+--',
      '{%for item in array%}{% if forloop.first %}+{% else %}-{% endif %}{%endfor%}',
-      assigns,
-    )
+      assigns)
  end

  def test_for_else
@@ -107,7 +103,6 @@ HERE
    assert_template_result('1234', '{%for i in array limit:4 %}{{ i }}{%endfor%}', assigns)
    assert_template_result('3456', '{%for i in array limit:4 offset:2 %}{{ i }}{%endfor%}', assigns)
    assert_template_result('3456', '{%for i in array limit: 4 offset: 2 %}{{ i }}{%endfor%}', assigns)
-    assert_template_result('3456', '{%for i in array, limit: 4, offset: 2 %}{{ i }}{%endfor%}', assigns)
  end

  def test_limiting_with_invalid_limit
@@ -329,20 +324,15 @@ HERE
    # ruby 1.9.3 no longer supports .each on String though we mimic
    # the functionality for backwards compatibility

-    assert_template_result(
-      'test string',
+    assert_template_result('test string',
      '{%for val in string%}{{val}}{%endfor%}',
-      { 'string' => "test string" },
-    )
+      { 'string' => "test string" })

-    assert_template_result(
-      'test string',
+    assert_template_result('test string',
      '{%for val in string limit:1%}{{val}}{%endfor%}',
-      { 'string' => "test string" },
-    )
+      { 'string' => "test string" })

-    assert_template_result(
-      'val-string-1-1-0-1-0-true-true-test string',
+    assert_template_result('val-string-1-1-0-1-0-true-true-test string',
      '{%for val in string%}' \
      '{{forloop.name}}-' \
      '{{forloop.index}}-' \
@@ -353,28 +343,23 @@ HERE
      '{{forloop.first}}-' \
      '{{forloop.last}}-' \
      '{{val}}{%endfor%}',
-      { 'string' => "test string" },
-    )
+      { 'string' => "test string" })
  end

  def test_for_parentloop_references_parent_loop
-    assert_template_result(
-      '1.1 1.2 1.3 2.1 2.2 2.3 ',
+    assert_template_result('1.1 1.2 1.3 2.1 2.2 2.3 ',
      '{% for inner in outer %}{% for k in inner %}' \
      '{{ forloop.parentloop.index }}.{{ forloop.index }} ' \
      '{% endfor %}{% endfor %}',
-      { 'outer' => [[1, 1, 1], [1, 1, 1]] },
-    )
+      { 'outer' => [[1, 1, 1], [1, 1, 1]] })
  end

  def test_for_parentloop_nil_when_not_present
-    assert_template_result(
-      '.1 .2 ',
+    assert_template_result('.1 .2 ',
      '{% for inner in outer %}' \
      '{{ forloop.parentloop.index }}.{{ forloop.index }} ' \
      '{% endfor %}',
-      { 'outer' => [[1, 1, 1], [1, 1, 1]] },
-    )
+      { 'outer' => [[1, 1, 1], [1, 1, 1]] })
  end

  def test_inner_for_over_empty_input
@@ -465,4 +450,30 @@ HERE

    assert(context.registers[:for_stack].empty?)
  end
+
+  def test_instrument_for_offset_continue
+    assert_usage_increment('for_offset_continue') do
+      Template.parse('{% for item in items offset:continue %}{{item}}{% endfor %}')
+    end
+
+    assert_usage_increment('for_offset_continue', times: 0) do
+      Template.parse('{% for item in items offset:2 %}{{item}}{% endfor %}')
+    end
+  end
+
+  def test_instrument_forloop_drop_name
+    assigns = { 'items' => [1, 2, 3, 4, 5] }
+
+    assert_usage_increment('forloop_drop_name', times: 5) do
+      Template.parse('{% for item in items %}{{forloop.name}}{% endfor %}').render!(assigns)
+    end
+
+    assert_usage_increment('forloop_drop_name', times: 0) do
+      Template.parse('{% for item in items %}{{forloop.index}}{% endfor %}').render!(assigns)
+    end
+
+    assert_usage_increment('forloop_drop_name', times: 0) do
+      Template.parse('{% for item in items %}{{item}}{% endfor %}').render!(assigns)
+    end
+  end
 end
@@ -7,10 +7,8 @@ class IfElseTagTest < Minitest::Test

  def test_if
    assert_template_result('  ', ' {% if false %} this text should not go into the output {% endif %} ')
-    assert_template_result(
-      '  this text should go into the output  ',
-      ' {% if true %} this text should go into the output {% endif %} ',
-    )
+    assert_template_result('  this text should go into the output  ',
+      ' {% if true %} this text should go into the output {% endif %} ')
    assert_template_result('  you rock ?', '{% if false %} you suck {% endif %} {% if true %} you rock {% endif %}?')
  end

@@ -53,22 +51,18 @@ class IfElseTagTest < Minitest::Test

  def test_comparison_of_expressions_starting_with_and_or_or
    assigns = { 'order' => { 'items_count' => 0 }, 'android' => { 'name' => 'Roy' } }
-    assert_template_result(
-      "YES",
+    assert_template_result("YES",
      "{% if android.name == 'Roy' %}YES{% endif %}",
-      assigns,
-    )
-    assert_template_result(
-      "YES",
+      assigns)
+    assert_template_result("YES",
      "{% if order.items_count == 0 %}YES{% endif %}",
-      assigns,
-    )
+      assigns)
  end

  def test_if_and
    assert_template_result(' YES ', '{% if true and true %} YES {% endif %}')
    assert_template_result('', '{% if false and true %} YES {% endif %}')
-    assert_template_result('', '{% if true and false %} YES {% endif %}')
+    assert_template_result('', '{% if false and true %} YES {% endif %}')
  end

  def test_hash_miss_generates_false
@@ -161,10 +155,8 @@ class IfElseTagTest < Minitest::Test
    original_op = Condition.operators['contains']
    Condition.operators['contains'] = :[]

-    assert_template_result(
-      'yes',
-      %({% if 'gnomeslab-and-or-liquid' contains 'gnomeslab-and-or-liquid' %}yes{% endif %}),
-    )
+    assert_template_result('yes',
+      %({% if 'gnomeslab-and-or-liquid' contains 'gnomeslab-and-or-liquid' %}yes{% endif %}))
  ensure
    Condition.operators['contains'] = original_op
  end
@@ -58,88 +58,65 @@ class IncludeTagTest < Minitest::Test
  end

  def test_include_tag_looks_for_file_system_in_registers_first
-    assert_equal(
-      'from OtherFileSystem',
-      Template.parse("{% include 'pick_a_source' %}").render!({}, registers: { file_system: OtherFileSystem.new }),
-    )
+    assert_equal('from OtherFileSystem',
+      Template.parse("{% include 'pick_a_source' %}").render!({}, registers: { file_system: OtherFileSystem.new }))
  end

  def test_include_tag_with
-    assert_template_result(
-      "Product: Draft 151cm ",
+    assert_template_result("Product: Draft 151cm ",
      "{% include 'product' with products[0] %}",
      { "products" => [{ 'title' => 'Draft 151cm' }, { 'title' => 'Element 155cm' }] },
-      partials: { "product" => "Product: {{ product.title }} " },
-    )
+      partials: { "product" => "Product: {{ product.title }} " })
  end

  def test_include_tag_with_alias
-    assert_template_result(
-      "Product: Draft 151cm ",
+    assert_template_result("Product: Draft 151cm ",
      "{% include 'product_alias' with products[0] as product %}",
      { "products" => [{ 'title' => 'Draft 151cm' }, { 'title' => 'Element 155cm' }] },
-      partials: { "product_alias" => "Product: {{ product.title }} " },
-    )
+      partials: { "product_alias" => "Product: {{ product.title }} " })
  end

  def test_include_tag_for_alias
-    assert_template_result(
-      "Product: Draft 151cm Product: Element 155cm ",
+    assert_template_result("Product: Draft 151cm Product: Element 155cm ",
      "{% include 'product_alias' for products as product %}",
      { "products" => [{ 'title' => 'Draft 151cm' }, { 'title' => 'Element 155cm' }] },
-      partials: { "product_alias" => "Product: {{ product.title }} " },
-    )
+      partials: { "product_alias" => "Product: {{ product.title }} " })
  end

  def test_include_tag_with_default_name
-    assert_template_result(
-      "Product: Draft 151cm ",
-      "{% include 'product' %}",
-      { "product" => { 'title' => 'Draft 151cm' } },
-      partials: { "product" => "Product: {{ product.title }} " },
-    )
+    assert_template_result("Product: Draft 151cm ",
+      "{% include 'product' %}", { "product" => { 'title' => 'Draft 151cm' } },
+      partials: { "product" => "Product: {{ product.title }} " })
  end

  def test_include_tag_for
-    assert_template_result(
-      "Product: Draft 151cm Product: Element 155cm ",
+    assert_template_result("Product: Draft 151cm Product: Element 155cm ",
      "{% include 'product' for products %}",
      { "products" => [{ 'title' => 'Draft 151cm' }, { 'title' => 'Element 155cm' }] },
-      partials: { "product" => "Product: {{ product.title }} " },
-    )
+      partials: { "product" => "Product: {{ product.title }} " })
  end

  def test_include_tag_with_local_variables
-    assert_template_result(
-      "Locale: test123 ",
-      "{% include 'locale_variables' echo1: 'test123' %}",
-      partials: { "locale_variables" => "Locale: {{echo1}} {{echo2}}" },
-    )
+    assert_template_result("Locale: test123 ", "{% include 'locale_variables' echo1: 'test123' %}",
+      partials: { "locale_variables" => "Locale: {{echo1}} {{echo2}}" })
  end

  def test_include_tag_with_multiple_local_variables
-    assert_template_result(
-      "Locale: test123 test321",
+    assert_template_result("Locale: test123 test321",
      "{% include 'locale_variables' echo1: 'test123', echo2: 'test321' %}",
-      partials: { "locale_variables" => "Locale: {{echo1}} {{echo2}}" },
-    )
+      partials: { "locale_variables" => "Locale: {{echo1}} {{echo2}}" })
  end

  def test_include_tag_with_multiple_local_variables_from_context
-    assert_template_result(
-      "Locale: test123 test321",
+    assert_template_result("Locale: test123 test321",
      "{% include 'locale_variables' echo1: echo1, echo2: more_echos.echo2 %}",
      { 'echo1' => 'test123', 'more_echos' => { "echo2" => 'test321' } },
-      partials: { "locale_variables" => "Locale: {{echo1}} {{echo2}}" },
-    )
+      partials: { "locale_variables" => "Locale: {{echo1}} {{echo2}}" })
  end

  def test_included_templates_assigns_variables
-    assert_template_result(
-      "bar",
-      "{% include 'assignments' %}{{ foo }}",
-      partials: { 'assignments' => "{% assign foo = 'bar' %}" },
-    )
+    assert_template_result("bar", "{% include 'assignments' %}{{ foo }}",
+      partials: { 'assignments' => "{% assign foo = 'bar' %}" })
  end

  def test_nested_include_tag
@@ -160,19 +137,13 @@ class IncludeTagTest < Minitest::Test
      "details" => "details",
    }

-    assert_template_result(
-      "Product: Draft 151cm details ",
-      "{% include 'nested_product_template' with product %}",
-      { "product" => { "title" => 'Draft 151cm' } },
-      partials: partials,
-    )
+    assert_template_result("Product: Draft 151cm details ",
+      "{% include 'nested_product_template' with product %}", { "product" => { "title" => 'Draft 151cm' } },
+      partials: partials)

-    assert_template_result(
-      "Product: Draft 151cm details Product: Element 155cm details ",
-      "{% include 'nested_product_template' for products %}",
-      { "products" => [{ "title" => 'Draft 151cm' }, { "title" => 'Element 155cm' }] },
-      partials: partials,
-    )
+    assert_template_result("Product: Draft 151cm details Product: Element 155cm details ",
+      "{% include 'nested_product_template' for products %}", { "products" => [{ "title" => 'Draft 151cm' }, { "title" => 'Element 155cm' }] },
+      partials: partials)
  end

  def test_recursively_included_template_does_not_produce_endless_loop
@@ -190,68 +161,46 @@ class IncludeTagTest < Minitest::Test
  end

  def test_dynamically_choosen_template
-    assert_template_result(
-      "Test123",
-      "{% include template %}",
-      { "template" => 'Test123' },
-      partials: { "Test123" => "Test123" },
-    )
+    assert_template_result("Test123", "{% include template %}", { "template" => 'Test123' },
+      partials: { "Test123" => "Test123" })

-    assert_template_result(
-      "Test321",
-      "{% include template %}",
-      { "template" => 'Test321' },
-      partials: { "Test321" => "Test321" },
-    )
+    assert_template_result("Test321", "{% include template %}", { "template" => 'Test321' },
+      partials: { "Test321" => "Test321" })

-    assert_template_result(
-      "Product: Draft 151cm ",
-      "{% include template for product %}",
+    assert_template_result("Product: Draft 151cm ", "{% include template for product %}",
      { "template" => 'product', 'product' => { 'title' => 'Draft 151cm' } },
-      partials: { "product" => "Product: {{ product.title }} " },
-    )
+      partials: { "product" => "Product: {{ product.title }} " })
  end

  def test_include_tag_caches_second_read_of_same_partial
    file_system = CountingFileSystem.new
-    assert_equal(
-      'from CountingFileSystemfrom CountingFileSystem',
-      Template.parse("{% include 'pick_a_source' %}{% include 'pick_a_source' %}").render!({}, registers: { file_system: file_system }),
-    )
+    assert_equal('from CountingFileSystemfrom CountingFileSystem',
+      Template.parse("{% include 'pick_a_source' %}{% include 'pick_a_source' %}").render!({}, registers: { file_system: file_system }))
    assert_equal(1, file_system.count)
  end

  def test_include_tag_doesnt_cache_partials_across_renders
    file_system = CountingFileSystem.new
-    assert_equal(
-      'from CountingFileSystem',
-      Template.parse("{% include 'pick_a_source' %}").render!({}, registers: { file_system: file_system }),
-    )
+    assert_equal('from CountingFileSystem',
+      Template.parse("{% include 'pick_a_source' %}").render!({}, registers: { file_system: file_system }))
    assert_equal(1, file_system.count)

-    assert_equal(
-      'from CountingFileSystem',
-      Template.parse("{% include 'pick_a_source' %}").render!({}, registers: { file_system: file_system }),
-    )
+    assert_equal('from CountingFileSystem',
+      Template.parse("{% include 'pick_a_source' %}").render!({}, registers: { file_system: file_system }))
    assert_equal(2, file_system.count)
  end

  def test_include_tag_within_if_statement
-    assert_template_result(
-      "foo_if_true",
-      "{% if true %}{% include 'foo_if_true' %}{% endif %}",
-      partials: { "foo_if_true" => "foo_if_true" },
-    )
+    assert_template_result("foo_if_true", "{% if true %}{% include 'foo_if_true' %}{% endif %}",
+      partials: { "foo_if_true" => "foo_if_true" })
  end

  def test_custom_include_tag
    original_tag = Liquid::Template.tags['include']
    Liquid::Template.tags['include'] = CustomInclude
    begin
-      assert_equal(
-        "custom_foo",
-        Template.parse("{% include 'custom_foo' %}").render!,
-      )
+      assert_equal("custom_foo",
+        Template.parse("{% include 'custom_foo' %}").render!)
    ensure
      Liquid::Template.tags['include'] = original_tag
    end
@@ -261,10 +210,8 @@ class IncludeTagTest < Minitest::Test
    original_tag = Liquid::Template.tags['include']
    Liquid::Template.tags['include'] = CustomInclude
    begin
-      assert_equal(
-        "custom_foo_if_true",
-        Template.parse("{% if true %}{% include 'custom_foo_if_true' %}{% endif %}").render!,
-      )
+      assert_equal("custom_foo_if_true",
+        Template.parse("{% if true %}{% include 'custom_foo_if_true' %}{% endif %}").render!)
    ensure
      Liquid::Template.tags['include'] = original_tag
    end
@@ -295,49 +242,26 @@ class IncludeTagTest < Minitest::Test
  end

  def test_render_raise_argument_error_when_template_is_undefined
-    assert_template_result(
-      "Liquid error (line 1): Argument error in tag 'include' - Illegal template name",
-      "{% include undefined_variable %}",
-      render_errors: true,
-    )
+    assert_template_result("Liquid error (line 1): Argument error in tag 'include' - Illegal template name",
+      "{% include undefined_variable %}", render_errors: true)

-    assert_template_result(
-      "Liquid error (line 1): Argument error in tag 'include' - Illegal template name",
-      "{% include nil %}",
-      render_errors: true,
-    )
-  end
-
-  def test_render_raise_argument_error_when_template_is_not_a_string
-    assert_template_result(
-      "Liquid error (line 1): Argument error in tag 'include' - Illegal template name",
-      "{% include 123 %}",
-      render_errors: true,
-    )
+    assert_template_result("Liquid error (line 1): Argument error in tag 'include' - Illegal template name",
+      "{% include nil %}", render_errors: true)
  end

  def test_including_via_variable_value
-    assert_template_result(
-      "from TestFileSystem",
-      "{% assign page = 'pick_a_source' %}{% include page %}",
-      partials: { "pick_a_source" => "from TestFileSystem" },
-    )
+    assert_template_result("from TestFileSystem", "{% assign page = 'pick_a_source' %}{% include page %}",
+      partials: { "pick_a_source" => "from TestFileSystem" })

    partials = { "product" => "Product: {{ product.title }} " }

-    assert_template_result(
-      "Product: Draft 151cm ",
-      "{% assign page = 'product' %}{% include page %}",
+    assert_template_result("Product: Draft 151cm ", "{% assign page = 'product' %}{% include page %}",
      { "product" => { 'title' => 'Draft 151cm' } },
-      partials: partials,
-    )
+      partials: partials)

-    assert_template_result(
-      "Product: Draft 151cm ",
-      "{% assign page = 'product' %}{% include page for foo %}",
+    assert_template_result("Product: Draft 151cm ", "{% assign page = 'product' %}{% include page for foo %}",
      { "foo" => { 'title' => 'Draft 151cm' } },
-      partials: partials,
-    )
+      partials: partials)
  end

  def test_including_with_strict_variables
@@ -350,31 +274,7 @@ class IncludeTagTest < Minitest::Test

  def test_break_through_include
    assert_template_result("1", "{% for i in (1..3) %}{{ i }}{% break %}{{ i }}{% endfor %}")
-    assert_template_result(
-      "1",
-      "{% for i in (1..3) %}{{ i }}{% include 'break' %}{{ i }}{% endfor %}",
-      partials: { 'break' => "{% break %}" },
-    )
-  end
-
-  def test_render_tag_renders_error_with_template_name
-    assert_template_result(
-      'Liquid error (foo line 1): standard error',
-      "{% include 'foo' with errors %}",
-      { 'errors' => ErrorDrop.new },
-      partials: { 'foo' => '{{ foo.standard_error }}' },
-      render_errors: true,
-    )
-  end
-
-  def test_render_tag_renders_error_with_template_name_from_template_factory
-    assert_template_result(
-      'Liquid error (some/path/foo line 1): standard error',
-      "{% include 'foo' with errors %}",
-      { 'errors' => ErrorDrop.new },
-      partials: { 'foo' => '{{ foo.standard_error }}' },
-      template_factory: StubTemplateFactory.new,
-      render_errors: true,
-    )
+    assert_template_result("1", "{% for i in (1..3) %}{{ i }}{% include 'break' %}{{ i }}{% endfor %}",
+      partials: { 'break' => "{% break %}" })
  end
 end # IncludeTagTest
@@ -6,25 +6,20 @@ class IncrementTagTest < Minitest::Test
  include Liquid

  def test_inc
-    assert_template_result('0 1', '{%increment port %} {{ port }}')
-    assert_template_result(' 0 1 2', '{{port}} {%increment port %} {%increment port%} {{port}}')
-    assert_template_result(
-      '0 0 1 2 1',
+    assert_template_result('0', '{%increment port %}', {})
+    assert_template_result('0 1', '{%increment port %} {%increment port%}', {})
+    assert_template_result('0 0 1 2 1',
      '{%increment port %} {%increment starboard%} ' \
      '{%increment port %} {%increment port%} ' \
-      '{%increment starboard %}',
-    )
+      '{%increment starboard %}', {})
  end

  def test_dec
-    assert_template_result('-1 -1', '{%decrement port %} {{ port }}', { 'port' => 10 })
-    assert_template_result(' -1 -2 -2', '{{port}} {%decrement port %} {%decrement port%} {{port}}')
-    assert_template_result(
-      '0 1 2 0 3 1 1 3',
-      '{%increment starboard %} {%increment starboard%} {%increment starboard%} ' \
+    assert_template_result('9', '{%decrement port %}', { 'port' => 10 })
+    assert_template_result('-1 -2', '{%decrement port %} {%decrement port%}', {})
+    assert_template_result('1 5 2 2 5',
      '{%increment port %} {%increment starboard%} ' \
      '{%increment port %} {%decrement port%} ' \
-      '{%decrement starboard %}',
-    )
+      '{%decrement starboard %}', { 'port' => 1, 'starboard' => 5 })
  end
 end
@@ -113,37 +113,4 @@ class LiquidTagTest < Minitest::Test
      {% raw %}{% liquid echo 'test' %}{% endraw %}
    LIQUID
  end
-
-  def test_nested_liquid_tags
-    assert_template_result('good', <<~LIQUID)
-      {%- liquid
-        liquid
-          if true
-            echo "good"
-          endif
-      -%}
-    LIQUID
-  end
-
-  def test_nested_liquid_tags_on_same_line
-    assert_template_result('good', <<~LIQUID)
-      {%- liquid liquid liquid echo "good" -%}
-    LIQUID
-  end
-
-  def test_nested_liquid_liquid_is_not_skipped_if_used_in_non_tag_position
-    assert_template_result('liquid', <<~LIQUID, { 'liquid' => 'liquid' })
-      {%- liquid liquid liquid echo liquid -%}
-    LIQUID
-  end
-
-  def test_next_liquid_with_unclosed_if_tag
-    assert_match_syntax_error("Liquid syntax error (line 2): 'if' tag was never closed", <<~LIQUID)
-      {%- liquid
-        liquid if true
-          echo "good"
-        endif
-      -%}
-    LIQUID
-  end
 end
@@ -6,16 +6,12 @@ class RawTagTest < Minitest::Test
  include Liquid

  def test_tag_in_raw
-    assert_template_result(
-      '{% comment %} test {% endcomment %}',
-      '{% raw %}{% comment %} test {% endcomment %}{% endraw %}',
-    )
+    assert_template_result('{% comment %} test {% endcomment %}',
+      '{% raw %}{% comment %} test {% endcomment %}{% endraw %}')
  end

  def test_output_in_raw
-    assert_template_result('>{{ test }}<', '> {%- raw -%}{{ test }}{%- endraw -%} <')
-    assert_template_result("> inner  <", "> {%- raw -%} inner {%- endraw %} <")
-    assert_template_result("> inner <", "> {%- raw -%} inner {%- endraw -%} <")
+    assert_template_result('{{ test }}', '{% raw %}{{ test }}{% endraw %}')
  end

  def test_open_tag_in_raw
@@ -6,79 +6,52 @@ class RenderTagTest < Minitest::Test
  include Liquid

  def test_render_with_no_arguments
-    assert_template_result(
-      'rendered content',
-      '{% render "source" %}',
-      partials: { 'source' => 'rendered content' },
-    )
+    assert_template_result('rendered content', '{% render "source" %}',
+      partials: { 'source' => 'rendered content' })
  end

  def test_render_tag_looks_for_file_system_in_registers_first
-    assert_template_result(
-      'from register file system',
-      '{% render "pick_a_source" %}',
-      partials: { 'pick_a_source' => 'from register file system' },
-    )
+    assert_template_result('from register file system', '{% render "pick_a_source" %}',
+      partials: { 'pick_a_source' => 'from register file system' })
  end

  def test_render_passes_named_arguments_into_inner_scope
-    assert_template_result(
-      'My Product',
-      '{% render "product", inner_product: outer_product %}',
+    assert_template_result('My Product', '{% render "product", inner_product: outer_product %}',
      { 'outer_product' => { 'title' => 'My Product' } },
-      partials: { 'product' => '{{ inner_product.title }}' },
-    )
+      partials: { 'product' => '{{ inner_product.title }}' })
  end

  def test_render_accepts_literals_as_arguments
-    assert_template_result(
-      '123',
-      '{% render "snippet", price: 123 %}',
-      partials: { 'snippet' => '{{ price }}' },
-    )
+    assert_template_result('123', '{% render "snippet", price: 123 %}',
+      partials: { 'snippet' => '{{ price }}' })
  end

  def test_render_accepts_multiple_named_arguments
-    assert_template_result(
-      '1 2',
-      '{% render "snippet", one: 1, two: 2 %}',
-      partials: { 'snippet' => '{{ one }} {{ two }}' },
-    )
+    assert_template_result('1 2', '{% render "snippet", one: 1, two: 2 %}',
+      partials: { 'snippet' => '{{ one }} {{ two }}' })
  end

  def test_render_does_not_inherit_parent_scope_variables
-    assert_template_result(
-      '',
-      '{% assign outer_variable = "should not be visible" %}{% render "snippet" %}',
-      partials: { 'snippet' => '{{ outer_variable }}' },
-    )
+    assert_template_result('', '{% assign outer_variable = "should not be visible" %}{% render "snippet" %}',
+      partials: { 'snippet' => '{{ outer_variable }}' })
  end

  def test_render_does_not_inherit_variable_with_same_name_as_snippet
-    assert_template_result(
-      '',
-      "{% assign snippet = 'should not be visible' %}{% render 'snippet' %}",
-      partials: { 'snippet' => '{{ snippet }}' },
-    )
+    assert_template_result('', "{% assign snippet = 'should not be visible' %}{% render 'snippet' %}",
+      partials: { 'snippet' => '{{ snippet }}' })
  end

  def test_render_does_not_mutate_parent_scope
-    assert_template_result(
-      '',
-      "{% render 'snippet' %}{{ inner }}",
-      partials: { 'snippet' => '{% assign inner = 1 %}' },
-    )
+    assert_template_result('', "{% render 'snippet' %}{{ inner }}",
+      partials: { 'snippet' => '{% assign inner = 1 %}' })
  end

  def test_nested_render_tag
-    assert_template_result(
-      'one two',
-      "{% render 'one' %}",
+    assert_template_result('one two', "{% render 'one' %}",
      partials: {
        'one' => "one {% render 'two' %}",
        'two' => 'two',
-      },
-    )
+      })
  end

  def test_recursively_rendered_template_does_not_produce_endless_loop
@@ -104,36 +77,27 @@ class RenderTagTest < Minitest::Test

  def test_include_tag_caches_second_read_of_same_partial
    file_system = StubFileSystem.new('snippet' => 'echo')
-    assert_equal(
-      'echoecho',
+    assert_equal('echoecho',
      Template.parse('{% render "snippet" %}{% render "snippet" %}')
-      .render!({}, registers: { file_system: file_system }),
-    )
+      .render!({}, registers: { file_system: file_system }))
    assert_equal(1, file_system.file_read_count)
  end

  def test_render_tag_doesnt_cache_partials_across_renders
    file_system = StubFileSystem.new('snippet' => 'my message')

-    assert_equal(
-      'my message',
-      Template.parse('{% include "snippet" %}').render!({}, registers: { file_system: file_system }),
-    )
+    assert_equal('my message',
+      Template.parse('{% include "snippet" %}').render!({}, registers: { file_system: file_system }))
    assert_equal(1, file_system.file_read_count)

-    assert_equal(
-      'my message',
-      Template.parse('{% include "snippet" %}').render!({}, registers: { file_system: file_system }),
-    )
+    assert_equal('my message',
+      Template.parse('{% include "snippet" %}').render!({}, registers: { file_system: file_system }))
    assert_equal(2, file_system.file_read_count)
  end

  def test_render_tag_within_if_statement
-    assert_template_result(
-      'my message',
-      '{% if true %}{% render "snippet" %}{% endif %}',
-      partials: { 'snippet' => 'my message' },
-    )
+    assert_template_result('my message', '{% if true %}{% render "snippet" %}{% endif %}',
+      partials: { 'snippet' => 'my message' })
  end

  def test_break_through_render
@@ -143,19 +107,13 @@ class RenderTagTest < Minitest::Test
  end

  def test_increment_is_isolated_between_renders
-    assert_template_result(
-      '010',
-      '{% increment %}{% increment %}{% render "incr" %}',
-      partials: { 'incr' => '{% increment %}' },
-    )
+    assert_template_result('010', '{% increment %}{% increment %}{% render "incr" %}',
+      partials: { 'incr' => '{% increment %}' })
  end

  def test_decrement_is_isolated_between_renders
-    assert_template_result(
-      '-1-2-1',
-      '{% decrement %}{% decrement %}{% render "decr" %}',
-      partials: { 'decr' => '{% decrement %}' },
-    )
+    assert_template_result('-1-2-1', '{% decrement %}{% decrement %}{% render "decr" %}',
+      partials: { 'decr' => '{% decrement %}' })
  end

  def test_includes_will_not_render_inside_render_tag
@@ -166,7 +124,7 @@ class RenderTagTest < Minitest::Test
      partials: {
        'foo' => 'bar',
        'test_include' => '{% include "foo" %}',
-      },
+      }
    )
  end

@@ -180,109 +138,72 @@ class RenderTagTest < Minitest::Test
        'nested_render_with_sibling_include' => '{% render "test_include" %}{% include "foo" %}',
        'test_include' => '{% include "foo" %}',
      },
-      render_errors: true,
+      render_errors: true
    )
  end

  def test_render_tag_with
-    assert_template_result(
-      "Product: Draft 151cm ",
+    assert_template_result("Product: Draft 151cm ",
      "{% render 'product' with products[0] %}",
      { "products" => [{ 'title' => 'Draft 151cm' }, { 'title' => 'Element 155cm' }] },
      partials: {
        'product' => "Product: {{ product.title }} ",
        'product_alias' => "Product: {{ product.title }} ",
-      },
-    )
+      })
  end

  def test_render_tag_with_alias
-    assert_template_result(
-      "Product: Draft 151cm ",
+    assert_template_result("Product: Draft 151cm ",
      "{% render 'product_alias' with products[0] as product %}",
      { "products" => [{ 'title' => 'Draft 151cm' }, { 'title' => 'Element 155cm' }] },
      partials: {
        'product' => "Product: {{ product.title }} ",
        'product_alias' => "Product: {{ product.title }} ",
-      },
-    )
+      })
  end

  def test_render_tag_for_alias
-    assert_template_result(
-      "Product: Draft 151cm Product: Element 155cm ",
+    assert_template_result("Product: Draft 151cm Product: Element 155cm ",
      "{% render 'product_alias' for products as product %}",
      { "products" => [{ 'title' => 'Draft 151cm' }, { 'title' => 'Element 155cm' }] },
      partials: {
        'product' => "Product: {{ product.title }} ",
        'product_alias' => "Product: {{ product.title }} ",
-      },
-    )
+      })
  end

  def test_render_tag_for
-    assert_template_result(
-      "Product: Draft 151cm Product: Element 155cm ",
+    assert_template_result("Product: Draft 151cm Product: Element 155cm ",
      "{% render 'product' for products %}",
      { "products" => [{ 'title' => 'Draft 151cm' }, { 'title' => 'Element 155cm' }] },
      partials: {
        'product' => "Product: {{ product.title }} ",
        'product_alias' => "Product: {{ product.title }} ",
-      },
-    )
+      })
  end

  def test_render_tag_forloop
-    assert_template_result(
-      "Product: Draft 151cm first  index:1 Product: Element 155cm  last index:2 ",
+    assert_template_result("Product: Draft 151cm first  index:1 Product: Element 155cm  last index:2 ",
      "{% render 'product' for products %}",
      { "products" => [{ 'title' => 'Draft 151cm' }, { 'title' => 'Element 155cm' }] },
      partials: {
        'product' => "Product: {{ product.title }} {% if forloop.first %}first{% endif %} {% if forloop.last %}last{% endif %} index:{{ forloop.index }} ",
-      },
-    )
+      })
  end

  def test_render_tag_for_drop
-    assert_template_result(
-      "123",
-      "{% render 'loop' for loop as value %}",
-      { "loop" => TestEnumerable.new },
+    assert_template_result("123",
+      "{% render 'loop' for loop as value %}", { "loop" => TestEnumerable.new },
      partials: {
        'loop' => "{{ value.foo }}",
-      },
-    )
+      })
  end

  def test_render_tag_with_drop
-    assert_template_result(
-      "TestEnumerable",
-      "{% render 'loop' with loop as value %}",
-      { "loop" => TestEnumerable.new },
+    assert_template_result("TestEnumerable",
+      "{% render 'loop' with loop as value %}", { "loop" => TestEnumerable.new },
      partials: {
        'loop' => "{{ value }}",
-      },
-    )
-  end
-
-  def test_render_tag_renders_error_with_template_name
-    assert_template_result(
-      'Liquid error (foo line 1): standard error',
-      "{% render 'foo' with errors %}",
-      { 'errors' => ErrorDrop.new },
-      partials: { 'foo' => '{{ foo.standard_error }}' },
-      render_errors: true,
-    )
-  end
-
-  def test_render_tag_renders_error_with_template_name_from_template_factory
-    assert_template_result(
-      'Liquid error (some/path/foo line 1): standard error',
-      "{% render 'foo' with errors %}",
-      { 'errors' => ErrorDrop.new },
-      partials: { 'foo' => '{{ foo.standard_error }}' },
-      template_factory: StubTemplateFactory.new,
-      render_errors: true,
-    )
+      })
  end
 end
@@ -6,10 +6,8 @@ class StandardTagTest < Minitest::Test
  include Liquid

  def test_no_transform
-    assert_template_result(
-      'this text should come out of the template without change...',
-      'this text should come out of the template without change...',
-    )
+    assert_template_result('this text should come out of the template without change...',
+      'this text should come out of the template without change...')

    assert_template_result('blah', 'blah')
    assert_template_result('<blah>', '<blah>')
@@ -22,10 +20,8 @@ class StandardTagTest < Minitest::Test
  end

  def test_has_a_block_which_does_nothing
-    assert_template_result(
-      %(the comment block should be removed  .. right?),
-      %(the comment block should be removed {%comment%} be gone.. {%endcomment%} .. right?),
-    )
+    assert_template_result(%(the comment block should be removed  .. right?),
+      %(the comment block should be removed {%comment%} be gone.. {%endcomment%} .. right?))

    assert_template_result('', '{%comment%}{%endcomment%}')
    assert_template_result('', '{%comment%}{% endcomment %}')
@@ -40,8 +36,6 @@ class StandardTagTest < Minitest::Test
    assert_template_result('', '{%comment%}{% endif %}{%endcomment%}')
    assert_template_result('', '{% comment %}{% endwhatever %}{% endcomment %}')
    assert_template_result('', '{% comment %}{% raw %} {{%%%%}}  }} { {% endcomment %} {% comment {% endraw %} {% endcomment %}')
-    assert_template_result('', '{% comment %}{% " %}{% endcomment %}')
-    assert_template_result('', '{% comment %}{%%}{% endcomment %}')

    assert_template_result('foobar', 'foo{%comment%}comment{%endcomment%}bar')
    assert_template_result('foobar', 'foo{% comment %}comment{% endcomment %}bar')
@@ -68,81 +62,61 @@ class StandardTagTest < Minitest::Test

  def test_capture
    assigns = { 'var' => 'content' }
-    assert_template_result(
-      'content foo content foo ',
+    assert_template_result('content foo content foo ',
      '{{ var2 }}{% capture var2 %}{{ var }} foo {% endcapture %}{{ var2 }}{{ var2 }}',
-      assigns,
-    )
+      assigns)
  end

  def test_capture_detects_bad_syntax
    assert_raises(SyntaxError) do
-      assert_template_result(
-        'content foo content foo ',
+      assert_template_result('content foo content foo ',
        '{{ var2 }}{% capture %}{{ var }} foo {% endcapture %}{{ var2 }}{{ var2 }}',
-        { 'var' => 'content' },
-      )
+        { 'var' => 'content' })
    end
  end

  def test_case
    assigns = { 'condition' => 2 }
-    assert_template_result(
-      ' its 2 ',
+    assert_template_result(' its 2 ',
      '{% case condition %}{% when 1 %} its 1 {% when 2 %} its 2 {% endcase %}',
-      assigns,
-    )
+      assigns)

    assigns = { 'condition' => 1 }
-    assert_template_result(
-      ' its 1 ',
+    assert_template_result(' its 1 ',
      '{% case condition %}{% when 1 %} its 1 {% when 2 %} its 2 {% endcase %}',
-      assigns,
-    )
+      assigns)

    assigns = { 'condition' => 3 }
-    assert_template_result(
-      '',
+    assert_template_result('',
      '{% case condition %}{% when 1 %} its 1 {% when 2 %} its 2 {% endcase %}',
-      assigns,
-    )
+      assigns)

    assigns = { 'condition' => "string here" }
-    assert_template_result(
-      ' hit ',
+    assert_template_result(' hit ',
      '{% case condition %}{% when "string here" %} hit {% endcase %}',
-      assigns,
-    )
+      assigns)

    assigns = { 'condition' => "bad string here" }
-    assert_template_result(
-      '',
+    assert_template_result('',
      '{% case condition %}{% when "string here" %} hit {% endcase %}',\
-      assigns,
-    )
+      assigns)
  end

  def test_case_with_else
    assigns = { 'condition' => 5 }
-    assert_template_result(
-      ' hit ',
+    assert_template_result(' hit ',
      '{% case condition %}{% when 5 %} hit {% else %} else {% endcase %}',
-      assigns,
-    )
+      assigns)

    assigns = { 'condition' => 6 }
-    assert_template_result(
-      ' else ',
+    assert_template_result(' else ',
      '{% case condition %}{% when 5 %} hit {% else %} else {% endcase %}',
-      assigns,
-    )
+      assigns)

    assigns = { 'condition' => 6 }
-    assert_template_result(
-      ' else ',
+    assert_template_result(' else ',
      '{% case condition %} {% when 5 %} hit {% else %} else {% endcase %}',
-      assigns,
-    )
+      assigns)
  end

  def test_case_on_size
@@ -155,67 +129,47 @@ class StandardTagTest < Minitest::Test
  end

  def test_case_on_size_with_else
-    assert_template_result(
-      'else',
+    assert_template_result('else',
      '{% case a.size %}{% when 1 %}1{% when 2 %}2{% else %}else{% endcase %}',
-      { 'a' => [] },
-    )
+      { 'a' => [] })

-    assert_template_result(
-      '1',
+    assert_template_result('1',
      '{% case a.size %}{% when 1 %}1{% when 2 %}2{% else %}else{% endcase %}',
-      { 'a' => [1] },
-    )
+      { 'a' => [1] })

-    assert_template_result(
-      '2',
+    assert_template_result('2',
      '{% case a.size %}{% when 1 %}1{% when 2 %}2{% else %}else{% endcase %}',
-      { 'a' => [1, 1] },
-    )
+      { 'a' => [1, 1] })

-    assert_template_result(
-      'else',
+    assert_template_result('else',
      '{% case a.size %}{% when 1 %}1{% when 2 %}2{% else %}else{% endcase %}',
-      { 'a' => [1, 1, 1] },
-    )
+      { 'a' => [1, 1, 1] })

-    assert_template_result(
-      'else',
+    assert_template_result('else',
      '{% case a.size %}{% when 1 %}1{% when 2 %}2{% else %}else{% endcase %}',
-      { 'a' => [1, 1, 1, 1] },
-    )
+      { 'a' => [1, 1, 1, 1] })

-    assert_template_result(
-      'else',
+    assert_template_result('else',
      '{% case a.size %}{% when 1 %}1{% when 2 %}2{% else %}else{% endcase %}',
-      { 'a' => [1, 1, 1, 1, 1] },
-    )
+      { 'a' => [1, 1, 1, 1, 1] })
  end

  def test_case_on_length_with_else
-    assert_template_result(
-      'else',
+    assert_template_result('else',
      '{% case a.empty? %}{% when true %}true{% when false %}false{% else %}else{% endcase %}',
-      {},
-    )
+      {})

-    assert_template_result(
-      'false',
+    assert_template_result('false',
      '{% case false %}{% when true %}true{% when false %}false{% else %}else{% endcase %}',
-      {},
-    )
+      {})

-    assert_template_result(
-      'true',
+    assert_template_result('true',
      '{% case true %}{% when true %}true{% when false %}false{% else %}else{% endcase %}',
-      {},
-    )
+      {})

-    assert_template_result(
-      'else',
+    assert_template_result('else',
      '{% case NULL %}{% when true %}true{% when false %}false{% else %}else{% endcase %}',
-      {},
-    )
+      {})
  end

  def test_assign_from_case
@@ -297,33 +251,24 @@ class StandardTagTest < Minitest::Test

    assert_template_result('one two one', '{%cycle "one", "two"%} {%cycle "one", "two"%} {%cycle "one", "two"%}')

-    assert_template_result(
-      'text-align: left text-align: right',
-      '{%cycle "text-align: left", "text-align: right" %} {%cycle "text-align: left", "text-align: right"%}',
-    )
+    assert_template_result('text-align: left text-align: right',
+      '{%cycle "text-align: left", "text-align: right" %} {%cycle "text-align: left", "text-align: right"%}')
  end

  def test_multiple_cycles
-    assert_template_result(
-      '1 2 1 1 2 3 1',
-      '{%cycle 1,2%} {%cycle 1,2%} {%cycle 1,2%} {%cycle 1,2,3%} {%cycle 1,2,3%} {%cycle 1,2,3%} {%cycle 1,2,3%}',
-    )
+    assert_template_result('1 2 1 1 2 3 1',
+      '{%cycle 1,2%} {%cycle 1,2%} {%cycle 1,2%} {%cycle 1,2,3%} {%cycle 1,2,3%} {%cycle 1,2,3%} {%cycle 1,2,3%}')
  end

  def test_multiple_named_cycles
-    assert_template_result(
-      'one one two two one one',
-      '{%cycle 1: "one", "two" %} {%cycle 2: "one", "two" %} {%cycle 1: "one", "two" %} {%cycle 2: "one", "two" %} {%cycle 1: "one", "two" %} {%cycle 2: "one", "two" %}',
-    )
+    assert_template_result('one one two two one one',
+      '{%cycle 1: "one", "two" %} {%cycle 2: "one", "two" %} {%cycle 1: "one", "two" %} {%cycle 2: "one", "two" %} {%cycle 1: "one", "two" %} {%cycle 2: "one", "two" %}')
  end

  def test_multiple_named_cycles_with_names_from_context
    assigns = { "var1" => 1, "var2" => 2 }
-    assert_template_result(
-      'one one two two one one',
-      '{%cycle var1: "one", "two" %} {%cycle var2: "one", "two" %} {%cycle var1: "one", "two" %} {%cycle var2: "one", "two" %} {%cycle var1: "one", "two" %} {%cycle var2: "one", "two" %}',
-      assigns,
-    )
+    assert_template_result('one one two two one one',
+      '{%cycle var1: "one", "two" %} {%cycle var2: "one", "two" %} {%cycle var1: "one", "two" %} {%cycle var2: "one", "two" %} {%cycle var1: "one", "two" %} {%cycle var2: "one", "two" %}', assigns)
  end

  def test_size_of_array
@@ -18,193 +18,51 @@ class TableRowTest < Minitest::Test
  end

  def test_table_row
-    assert_template_result(
-      "<tr class=\"row1\">\n<td class=\"col1\"> 1 </td><td class=\"col2\"> 2 </td><td class=\"col3\"> 3 </td></tr>\n<tr class=\"row2\"><td class=\"col1\"> 4 </td><td class=\"col2\"> 5 </td><td class=\"col3\"> 6 </td></tr>\n",
+    assert_template_result("<tr class=\"row1\">\n<td class=\"col1\"> 1 </td><td class=\"col2\"> 2 </td><td class=\"col3\"> 3 </td></tr>\n<tr class=\"row2\"><td class=\"col1\"> 4 </td><td class=\"col2\"> 5 </td><td class=\"col3\"> 6 </td></tr>\n",
      '{% tablerow n in numbers cols:3%} {{n}} {% endtablerow %}',
-      { 'numbers' => [1, 2, 3, 4, 5, 6] },
-    )
+      { 'numbers' => [1, 2, 3, 4, 5, 6] })

-    assert_template_result(
-      "<tr class=\"row1\">\n</tr>\n",
+    assert_template_result("<tr class=\"row1\">\n</tr>\n",
      '{% tablerow n in numbers cols:3%} {{n}} {% endtablerow %}',
-      { 'numbers' => [] },
-    )
+      { 'numbers' => [] })
  end

  def test_table_row_with_different_cols
-    assert_template_result(
-      "<tr class=\"row1\">\n<td class=\"col1\"> 1 </td><td class=\"col2\"> 2 </td><td class=\"col3\"> 3 </td><td class=\"col4\"> 4 </td><td class=\"col5\"> 5 </td></tr>\n<tr class=\"row2\"><td class=\"col1\"> 6 </td></tr>\n",
+    assert_template_result("<tr class=\"row1\">\n<td class=\"col1\"> 1 </td><td class=\"col2\"> 2 </td><td class=\"col3\"> 3 </td><td class=\"col4\"> 4 </td><td class=\"col5\"> 5 </td></tr>\n<tr class=\"row2\"><td class=\"col1\"> 6 </td></tr>\n",
      '{% tablerow n in numbers cols:5%} {{n}} {% endtablerow %}',
-      { 'numbers' => [1, 2, 3, 4, 5, 6] },
-    )
+      { 'numbers' => [1, 2, 3, 4, 5, 6] })
  end

  def test_table_col_counter
-    assert_template_result(
-      "<tr class=\"row1\">\n<td class=\"col1\">1</td><td class=\"col2\">2</td></tr>\n<tr class=\"row2\"><td class=\"col1\">1</td><td class=\"col2\">2</td></tr>\n<tr class=\"row3\"><td class=\"col1\">1</td><td class=\"col2\">2</td></tr>\n",
+    assert_template_result("<tr class=\"row1\">\n<td class=\"col1\">1</td><td class=\"col2\">2</td></tr>\n<tr class=\"row2\"><td class=\"col1\">1</td><td class=\"col2\">2</td></tr>\n<tr class=\"row3\"><td class=\"col1\">1</td><td class=\"col2\">2</td></tr>\n",
      '{% tablerow n in numbers cols:2%}{{tablerowloop.col}}{% endtablerow %}',
-      { 'numbers' => [1, 2, 3, 4, 5, 6] },
-    )
+      { 'numbers' => [1, 2, 3, 4, 5, 6] })
  end

  def test_quoted_fragment
-    assert_template_result(
-      "<tr class=\"row1\">\n<td class=\"col1\"> 1 </td><td class=\"col2\"> 2 </td><td class=\"col3\"> 3 </td></tr>\n<tr class=\"row2\"><td class=\"col1\"> 4 </td><td class=\"col2\"> 5 </td><td class=\"col3\"> 6 </td></tr>\n",
+    assert_template_result("<tr class=\"row1\">\n<td class=\"col1\"> 1 </td><td class=\"col2\"> 2 </td><td class=\"col3\"> 3 </td></tr>\n<tr class=\"row2\"><td class=\"col1\"> 4 </td><td class=\"col2\"> 5 </td><td class=\"col3\"> 6 </td></tr>\n",
      "{% tablerow n in collections.frontpage cols:3%} {{n}} {% endtablerow %}",
-      { 'collections' => { 'frontpage' => [1, 2, 3, 4, 5, 6] } },
-    )
-    assert_template_result(
-      "<tr class=\"row1\">\n<td class=\"col1\"> 1 </td><td class=\"col2\"> 2 </td><td class=\"col3\"> 3 </td></tr>\n<tr class=\"row2\"><td class=\"col1\"> 4 </td><td class=\"col2\"> 5 </td><td class=\"col3\"> 6 </td></tr>\n",
+      { 'collections' => { 'frontpage' => [1, 2, 3, 4, 5, 6] } })
+    assert_template_result("<tr class=\"row1\">\n<td class=\"col1\"> 1 </td><td class=\"col2\"> 2 </td><td class=\"col3\"> 3 </td></tr>\n<tr class=\"row2\"><td class=\"col1\"> 4 </td><td class=\"col2\"> 5 </td><td class=\"col3\"> 6 </td></tr>\n",
      "{% tablerow n in collections['frontpage'] cols:3%} {{n}} {% endtablerow %}",
-      { 'collections' => { 'frontpage' => [1, 2, 3, 4, 5, 6] } },
-    )
+      { 'collections' => { 'frontpage' => [1, 2, 3, 4, 5, 6] } })
  end

  def test_enumerable_drop
-    assert_template_result(
-      "<tr class=\"row1\">\n<td class=\"col1\"> 1 </td><td class=\"col2\"> 2 </td><td class=\"col3\"> 3 </td></tr>\n<tr class=\"row2\"><td class=\"col1\"> 4 </td><td class=\"col2\"> 5 </td><td class=\"col3\"> 6 </td></tr>\n",
+    assert_template_result("<tr class=\"row1\">\n<td class=\"col1\"> 1 </td><td class=\"col2\"> 2 </td><td class=\"col3\"> 3 </td></tr>\n<tr class=\"row2\"><td class=\"col1\"> 4 </td><td class=\"col2\"> 5 </td><td class=\"col3\"> 6 </td></tr>\n",
      '{% tablerow n in numbers cols:3%} {{n}} {% endtablerow %}',
-      { 'numbers' => ArrayDrop.new([1, 2, 3, 4, 5, 6]) },
-    )
+      { 'numbers' => ArrayDrop.new([1, 2, 3, 4, 5, 6]) })
  end

  def test_offset_and_limit
-    assert_template_result(
-      "<tr class=\"row1\">\n<td class=\"col1\"> 1 </td><td class=\"col2\"> 2 </td><td class=\"col3\"> 3 </td></tr>\n<tr class=\"row2\"><td class=\"col1\"> 4 </td><td class=\"col2\"> 5 </td><td class=\"col3\"> 6 </td></tr>\n",
+    assert_template_result("<tr class=\"row1\">\n<td class=\"col1\"> 1 </td><td class=\"col2\"> 2 </td><td class=\"col3\"> 3 </td></tr>\n<tr class=\"row2\"><td class=\"col1\"> 4 </td><td class=\"col2\"> 5 </td><td class=\"col3\"> 6 </td></tr>\n",
      '{% tablerow n in numbers cols:3 offset:1 limit:6%} {{n}} {% endtablerow %}',
-      { 'numbers' => [0, 1, 2, 3, 4, 5, 6, 7] },
-    )
+      { 'numbers' => [0, 1, 2, 3, 4, 5, 6, 7] })
  end

  def test_blank_string_not_iterable
-    assert_template_result(
-      "<tr class=\"row1\">\n</tr>\n",
+    assert_template_result("<tr class=\"row1\">\n</tr>\n",
      "{% tablerow char in characters cols:3 %}I WILL NOT BE OUTPUT{% endtablerow %}",
-      { 'characters' => '' },
-    )
-  end
-
-  def test_cols_nil_constant_same_as_evaluated_nil_expression
-    expect = "<tr class=\"row1\">\n" \
-      "<td class=\"col1\">false</td>" \
-      "<td class=\"col2\">false</td>" \
-      "</tr>\n"
-
-    assert_template_result(
-      expect,
-      "{% tablerow i in (1..2) cols:nil %}{{ tablerowloop.col_last }}{% endtablerow %}",
-    )
-
-    assert_template_result(
-      expect,
-      "{% tablerow i in (1..2) cols:var %}{{ tablerowloop.col_last }}{% endtablerow %}",
-      { "var" => nil },
-    )
-  end
-
-  def test_nil_limit_is_treated_as_zero
-    expect = "<tr class=\"row1\">\n" \
-      "</tr>\n"
-
-    assert_template_result(
-      expect,
-      "{% tablerow i in (1..2) limit:nil %}{{ i }}{% endtablerow %}",
-    )
-
-    assert_template_result(
-      expect,
-      "{% tablerow i in (1..2) limit:var %}{{ i }}{% endtablerow %}",
-      { "var" => nil },
-    )
-  end
-
-  def test_nil_offset_is_treated_as_zero
-    expect = "<tr class=\"row1\">\n" \
-      "<td class=\"col1\">1:false</td>" \
-      "<td class=\"col2\">2:true</td>" \
-      "</tr>\n"
-
-    assert_template_result(
-      expect,
-      "{% tablerow i in (1..2) offset:nil %}{{ i }}:{{ tablerowloop.col_last }}{% endtablerow %}",
-    )
-
-    assert_template_result(
-      expect,
-      "{% tablerow i in (1..2) offset:var %}{{ i }}:{{ tablerowloop.col_last }}{% endtablerow %}",
-      { "var" => nil },
-    )
-  end
-
-  def test_tablerow_loop_drop_attributes
-    template = <<~LIQUID.chomp
-      {% tablerow i in (1...2) %}
-      col: {{ tablerowloop.col }}
-      col0: {{ tablerowloop.col0 }}
-      col_first: {{ tablerowloop.col_first }}
-      col_last: {{ tablerowloop.col_last }}
-      first: {{ tablerowloop.first }}
-      index: {{ tablerowloop.index }}
-      index0: {{ tablerowloop.index0 }}
-      last: {{ tablerowloop.last }}
-      length: {{ tablerowloop.length }}
-      rindex: {{ tablerowloop.rindex }}
-      rindex0: {{ tablerowloop.rindex0 }}
-      row: {{ tablerowloop.row }}
-      {% endtablerow %}
-    LIQUID
-
-    expected_output = <<~OUTPUT
-      <tr class="row1">
-      <td class="col1">
-      col: 1
-      col0: 0
-      col_first: true
-      col_last: false
-      first: true
-      index: 1
-      index0: 0
-      last: false
-      length: 2
-      rindex: 2
-      rindex0: 1
-      row: 1
-      </td><td class="col2">
-      col: 2
-      col0: 1
-      col_first: false
-      col_last: true
-      first: false
-      index: 2
-      index0: 1
-      last: true
-      length: 2
-      rindex: 1
-      rindex0: 0
-      row: 1
-      </td></tr>
-    OUTPUT
-
-    assert_template_result(expected_output, template)
-  end
-
-  def test_table_row_renders_correct_error_message_for_invalid_parameters
-    assert_template_result(
-      "Liquid error (line 1): invalid integer",
-      '{% tablerow n in (1...10) limit:true %} {{n}} {% endtablerow %}',
-      render_errors: true,
-    )
-
-    assert_template_result(
-      "Liquid error (line 1): invalid integer",
-      '{% tablerow n in (1...10) offset:true %} {{n}} {% endtablerow %}',
-      render_errors: true,
-    )
-
-    assert_template_result(
-      "Liquid error (line 1): invalid integer",
-      '{% tablerow n in (1...10) cols:true %} {{n}} {% endtablerow %}',
-      render_errors: true,
-    )
+      { 'characters' => '' })
  end
 end
@@ -7,10 +7,8 @@ class UnlessElseTagTest < Minitest::Test

  def test_unless
    assert_template_result('  ', ' {% unless true %} this text should not go into the output {% endunless %} ')
-    assert_template_result(
-      '  this text should go into the output  ',
-      ' {% unless false %} this text should go into the output {% endunless %} ',
-    )
+    assert_template_result('  this text should go into the output  ',
+      ' {% unless false %} this text should go into the output {% endunless %} ')
    assert_template_result('  you rock ?', '{% unless true %} you suck {% endunless %} {% unless false %} you rock {% endunless %}?')
  end

@@ -93,12 +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))
@@ -1,7 +1,6 @@
 # frozen_string_literal: true

 require 'test_helper'
-require 'timeout'

 class VariableTest < Minitest::Test
  include Liquid
@@ -25,23 +24,17 @@ class VariableTest < Minitest::Test

  def test_if_tag_calls_to_liquid_value
    assert_template_result('one', '{% if foo == 1 %}one{% endif %}', { 'foo' => IntegerDrop.new('1') })
-    assert_template_result('one', '{% if foo == eqv %}one{% endif %}', { 'foo' => IntegerDrop.new(1), 'eqv' => IntegerDrop.new(1) })
    assert_template_result('one', '{% if 0 < foo %}one{% endif %}', { 'foo' => IntegerDrop.new('1') })
    assert_template_result('one', '{% if foo > 0 %}one{% endif %}', { 'foo' => IntegerDrop.new('1') })
-    assert_template_result('one', '{% if b > a %}one{% endif %}', { 'b' => IntegerDrop.new(1), 'a' => IntegerDrop.new(0) })
    assert_template_result('true', '{% if foo == true %}true{% endif %}', { 'foo' => BooleanDrop.new(true) })
    assert_template_result('true', '{% if foo %}true{% endif %}', { 'foo' => BooleanDrop.new(true) })

    assert_template_result('', '{% if foo %}true{% endif %}', { 'foo' => BooleanDrop.new(false) })
    assert_template_result('', '{% if foo == true %}True{% endif %}', { 'foo' => BooleanDrop.new(false) })
-    assert_template_result('', '{% if foo and true %}SHOULD NOT HAPPEN{% endif %}', { 'foo' => BooleanDrop.new(false) })
-
-    assert_template_result('one', '{% if a contains x %}one{% endif %}', { 'a' => [1], 'x' => IntegerDrop.new(1) })
  end

  def test_unless_tag_calls_to_liquid_value
    assert_template_result('', '{% unless foo %}true{% endunless %}', { 'foo' => BooleanDrop.new(true) })
-    assert_template_result('true', '{% unless foo %}true{% endunless %}', { 'foo' => BooleanDrop.new(false) })
  end

  def test_case_tag_calls_to_liquid_value
@@ -137,72 +130,4 @@ class VariableTest < Minitest::Test
  def test_raw_value_variable
    assert_template_result('bar', '{{ [key] }}', { 'key' => 'foo', 'foo' => 'bar' })
  end
-
-  def test_dynamic_find_var_with_drop
-    assert_template_result(
-      'bar',
-      '{{ [list[settings.zero]] }}',
-      {
-        'list' => ['foo'],
-        'settings' => SettingsDrop.new("zero" => 0),
-        'foo' => 'bar',
-      },
-    )
-
-    assert_template_result(
-      'foo',
-      '{{ [list[settings.zero]["foo"]] }}',
-      {
-        'list' => [{ 'foo' => 'bar' }],
-        'settings' => SettingsDrop.new("zero" => 0),
-        'bar' => 'foo',
-      },
-    )
-  end
-
-  def test_double_nested_variable_lookup
-    assert_template_result(
-      'bar',
-      '{{ list[list[settings.zero]]["foo"] }}',
-      {
-        'list' => [1, { 'foo' => 'bar' }],
-        'settings' => SettingsDrop.new("zero" => 0),
-        'bar' => 'foo',
-      },
-    )
-  end
-
-  def test_variable_lookup_should_not_hang_with_invalid_syntax
-    Timeout.timeout(1) do
-      assert_template_result(
-        'bar',
-        "{{['foo'}}",
-        {
-          'foo' => 'bar',
-        },
-        error_mode: :lax,
-      )
-    end
-
-    very_long_key = "1234567890" * 100
-
-    template_list = [
-      "{{['#{very_long_key}']}}", # valid
-      "{{['#{very_long_key}'}}", # missing closing bracket
-      "{{[['#{very_long_key}']}}", # extra open bracket
-    ]
-
-    template_list.each do |template|
-      Timeout.timeout(1) do
-        assert_template_result(
-          'bar',
-          template,
-          {
-            very_long_key => 'bar',
-          },
-          error_mode: :lax,
-        )
-      end
-    end
-  end
 end
@@ -39,13 +39,12 @@ module Minitest

    def assert_template_result(
      expected, template, assigns = {},
-      message: nil, partials: nil, error_mode: nil, render_errors: false,
-      template_factory: nil
+      message: nil, partials: nil, error_mode: nil, render_errors: false
    )
      template = Liquid::Template.parse(template, line_numbers: true, error_mode: error_mode&.to_sym)
-      file_system = StubFileSystem.new(partials || {})
-      registers = Liquid::Registers.new(file_system: file_system, template_factory: template_factory)
-      context = Liquid::Context.build(static_environments: assigns, rethrow_errors: !render_errors, registers: registers)
+      file_system = StubFileSystem.new(partials) if partials
+      registers = Liquid::Registers.new(file_system: file_system)
+      context = Liquid::Context.build(environments: assigns, rethrow_errors: !render_errors, registers: registers)
      output = template.render(context)
      assert_equal(expected, output, message)
    end
@@ -126,23 +125,16 @@ class ThingWithToLiquid
  end
 end

-class SettingsDrop < Liquid::Drop
-  def initialize(settings)
-    super()
-    @settings = settings
-  end
-
-  def liquid_method_missing(key)
-    @settings[key]
-  end
-end
-
 class IntegerDrop < Liquid::Drop
  def initialize(value)
    super()
    @value = value.to_i
  end

+  def ==(other)
+    @value == other
+  end
+
  def to_s
    @value.to_s
  end
@@ -158,6 +150,10 @@ class BooleanDrop < Liquid::Drop
    @value = value
  end

+  def ==(other)
+    @value == other
+  end
+
  def to_liquid_value
    @value
  end
@@ -210,10 +206,8 @@ class StubTemplateFactory
    @count = 0
  end

-  def for(template_name)
+  def for(_template_name)
    @count += 1
-    template = Liquid::Template.new
-    template.name = "some/path/" + template_name
-    template
+    Liquid::Template.new
  end
 end
@@ -35,10 +35,8 @@ class BlockUnitTest < Minitest::Test
  def test_variable_many_embedded_fragments
    template = Liquid::Template.parse("  {{funk}} {{so}} {{brother}} ")
    assert_equal(7, template.root.nodelist.size)
-    assert_equal(
-      [String, Variable, String, Variable, String, Variable, String],
-      block_types(template.root.nodelist),
-    )
+    assert_equal([String, Variable, String, Variable, String, Variable, String],
+      block_types(template.root.nodelist))
  end

  def test_with_block
@@ -164,17 +164,13 @@ class ConditionUnitTest < Minitest::Test
  private

  def assert_evaluates_true(left, op, right)
-    assert(
-      Condition.new(left, op, right).evaluate(@context),
-      "Evaluated false: #{left} #{op} #{right}",
-    )
+    assert(Condition.new(left, op, right).evaluate(@context),
+      "Evaluated false: #{left} #{op} #{right}")
  end

  def assert_evaluates_false(left, op, right)
-    assert(
-      !Condition.new(left, op, right).evaluate(@context),
-      "Evaluated true: #{left} #{op} #{right}",
-    )
+    assert(!Condition.new(left, op, right).evaluate(@context),
+      "Evaluated true: #{left} #{op} #{right}")
  end

  def assert_evaluates_argument_error(left, op, right)
@@ -8,245 +8,245 @@ class ParseTreeVisitorTest < Minitest::Test
  def test_variable
    assert_equal(
      ["test"],
-      visit(%({{ test }})),
+      visit(%({{ test }}))
    )
  end

  def test_varible_with_filter
    assert_equal(
      ["test", "infilter"],
-      visit(%({{ test | split: infilter }})),
+      visit(%({{ test | split: infilter }}))
    )
  end

  def test_dynamic_variable
    assert_equal(
      ["test", "inlookup"],
-      visit(%({{ test[inlookup] }})),
+      visit(%({{ test[inlookup] }}))
    )
  end

  def test_echo
    assert_equal(
      ["test"],
-      visit(%({% echo test %})),
+      visit(%({% echo test %}))
    )
  end

  def test_if_condition
    assert_equal(
      ["test"],
-      visit(%({% if test %}{% endif %})),
+      visit(%({% if test %}{% endif %}))
    )
  end

  def test_complex_if_condition
    assert_equal(
      ["test"],
-      visit(%({% if 1 == 1 and 2 == test %}{% endif %})),
+      visit(%({% if 1 == 1 and 2 == test %}{% endif %}))
    )
  end

  def test_if_body
    assert_equal(
      ["test"],
-      visit(%({% if 1 == 1 %}{{ test }}{% endif %})),
+      visit(%({% if 1 == 1 %}{{ test }}{% endif %}))
    )
  end

  def test_unless_condition
    assert_equal(
      ["test"],
-      visit(%({% unless test %}{% endunless %})),
+      visit(%({% unless test %}{% endunless %}))
    )
  end

  def test_complex_unless_condition
    assert_equal(
      ["test"],
-      visit(%({% unless 1 == 1 and 2 == test %}{% endunless %})),
+      visit(%({% unless 1 == 1 and 2 == test %}{% endunless %}))
    )
  end

  def test_unless_body
    assert_equal(
      ["test"],
-      visit(%({% unless 1 == 1 %}{{ test }}{% endunless %})),
+      visit(%({% unless 1 == 1 %}{{ test }}{% endunless %}))
    )
  end

  def test_elsif_condition
    assert_equal(
      ["test"],
-      visit(%({% if 1 == 1 %}{% elsif test %}{% endif %})),
+      visit(%({% if 1 == 1 %}{% elsif test %}{% endif %}))
    )
  end

  def test_complex_elsif_condition
    assert_equal(
      ["test"],
-      visit(%({% if 1 == 1 %}{% elsif 1 == 1 and 2 == test %}{% endif %})),
+      visit(%({% if 1 == 1 %}{% elsif 1 == 1 and 2 == test %}{% endif %}))
    )
  end

  def test_elsif_body
    assert_equal(
      ["test"],
-      visit(%({% if 1 == 1 %}{% elsif 2 == 2 %}{{ test }}{% endif %})),
+      visit(%({% if 1 == 1 %}{% elsif 2 == 2 %}{{ test }}{% endif %}))
    )
  end

  def test_else_body
    assert_equal(
      ["test"],
-      visit(%({% if 1 == 1 %}{% else %}{{ test }}{% endif %})),
+      visit(%({% if 1 == 1 %}{% else %}{{ test }}{% endif %}))
    )
  end

  def test_case_left
    assert_equal(
      ["test"],
-      visit(%({% case test %}{% endcase %})),
+      visit(%({% case test %}{% endcase %}))
    )
  end

  def test_case_condition
    assert_equal(
      ["test"],
-      visit(%({% case 1 %}{% when test %}{% endcase %})),
+      visit(%({% case 1 %}{% when test %}{% endcase %}))
    )
  end

  def test_case_when_body
    assert_equal(
      ["test"],
-      visit(%({% case 1 %}{% when 2 %}{{ test }}{% endcase %})),
+      visit(%({% case 1 %}{% when 2 %}{{ test }}{% endcase %}))
    )
  end

  def test_case_else_body
    assert_equal(
      ["test"],
-      visit(%({% case 1 %}{% else %}{{ test }}{% endcase %})),
+      visit(%({% case 1 %}{% else %}{{ test }}{% endcase %}))
    )
  end

  def test_for_in
    assert_equal(
      ["test"],
-      visit(%({% for x in test %}{% endfor %})),
+      visit(%({% for x in test %}{% endfor %}))
    )
  end

  def test_for_limit
    assert_equal(
      ["test"],
-      visit(%({% for x in (1..5) limit: test %}{% endfor %})),
+      visit(%({% for x in (1..5) limit: test %}{% endfor %}))
    )
  end

  def test_for_offset
    assert_equal(
      ["test"],
-      visit(%({% for x in (1..5) offset: test %}{% endfor %})),
+      visit(%({% for x in (1..5) offset: test %}{% endfor %}))
    )
  end

  def test_for_body
    assert_equal(
      ["test"],
-      visit(%({% for x in (1..5) %}{{ test }}{% endfor %})),
+      visit(%({% for x in (1..5) %}{{ test }}{% endfor %}))
    )
  end

  def test_for_range
    assert_equal(
      ["test"],
-      visit(%({% for x in (1..test) %}{% endfor %})),
+      visit(%({% for x in (1..test) %}{% endfor %}))
    )
  end

  def test_tablerow_in
    assert_equal(
      ["test"],
-      visit(%({% tablerow x in test %}{% endtablerow %})),
+      visit(%({% tablerow x in test %}{% endtablerow %}))
    )
  end

  def test_tablerow_limit
    assert_equal(
      ["test"],
-      visit(%({% tablerow x in (1..5) limit: test %}{% endtablerow %})),
+      visit(%({% tablerow x in (1..5) limit: test %}{% endtablerow %}))
    )
  end

  def test_tablerow_offset
    assert_equal(
      ["test"],
-      visit(%({% tablerow x in (1..5) offset: test %}{% endtablerow %})),
+      visit(%({% tablerow x in (1..5) offset: test %}{% endtablerow %}))
    )
  end

  def test_tablerow_body
    assert_equal(
      ["test"],
-      visit(%({% tablerow x in (1..5) %}{{ test }}{% endtablerow %})),
+      visit(%({% tablerow x in (1..5) %}{{ test }}{% endtablerow %}))
    )
  end

  def test_cycle
    assert_equal(
      ["test"],
-      visit(%({% cycle test %})),
+      visit(%({% cycle test %}))
    )
  end

  def test_assign
    assert_equal(
      ["test"],
-      visit(%({% assign x = test %})),
+      visit(%({% assign x = test %}))
    )
  end

  def test_capture
    assert_equal(
      ["test"],
-      visit(%({% capture x %}{{ test }}{% endcapture %})),
+      visit(%({% capture x %}{{ test }}{% endcapture %}))
    )
  end

  def test_include
    assert_equal(
      ["test"],
-      visit(%({% include test %})),
+      visit(%({% include test %}))
    )
  end

  def test_include_with
    assert_equal(
      ["test"],
-      visit(%({% include "hai" with test %})),
+      visit(%({% include "hai" with test %}))
    )
  end

  def test_include_for
    assert_equal(
      ["test"],
-      visit(%({% include "hai" for test %})),
+      visit(%({% include "hai" for test %}))
    )
  end

  def test_render_with
    assert_equal(
      ["test"],
-      visit(%({% render "hai" with test %})),
+      visit(%({% render "hai" with test %}))
    )
  end

  def test_render_for
    assert_equal(
      ["test"],
-      visit(%({% render "hai" for test %})),
+      visit(%({% render "hai" for test %}))
    )
  end

@@ -257,7 +257,7 @@ class ParseTreeVisitorTest < Minitest::Test
        ["test", []],
        ["xs", []],
      ]]],
-      traversal(%({% for x in xs offset: test %}{{ other }}{% endfor %})).visit,
+      traversal(%({% for x in xs offset: test %}{{ other }}{% endfor %})).visit
    )
  end

@@ -7,13 +7,13 @@ class PartialCacheUnitTest < Minitest::Test
    context = Liquid::Context.build(
      registers: {
        file_system: StubFileSystem.new('my_partial' => 'my partial body'),
-      },
+      }
    )

    partial = Liquid::PartialCache.load(
      'my_partial',
      context: context,
-      parse_context: Liquid::ParseContext.new,
+      parse_context: Liquid::ParseContext.new
    )

    assert_equal('my partial body', partial.render)
@@ -22,14 +22,14 @@ class PartialCacheUnitTest < Minitest::Test
  def test_reads_from_the_file_system_only_once_per_file
    file_system = StubFileSystem.new('my_partial' => 'some partial body')
    context     = Liquid::Context.build(
-      registers: { file_system: file_system },
+      registers: { file_system: file_system }
    )

    2.times do
      Liquid::PartialCache.load(
        'my_partial',
        context: context,
-        parse_context: Liquid::ParseContext.new,
+        parse_context: Liquid::ParseContext.new
      )
    end

@@ -39,31 +39,31 @@ class PartialCacheUnitTest < Minitest::Test
  def test_cache_state_is_stored_per_context
    parse_context      = Liquid::ParseContext.new
    shared_file_system = StubFileSystem.new(
-      'my_partial' => 'my shared value',
+      'my_partial' => 'my shared value'
    )
    context_one = Liquid::Context.build(
      registers: {
        file_system: shared_file_system,
-      },
+      }
    )
    context_two = Liquid::Context.build(
      registers: {
        file_system: shared_file_system,
-      },
+      }
    )

    2.times do
      Liquid::PartialCache.load(
        'my_partial',
        context: context_one,
-        parse_context: parse_context,
+        parse_context: parse_context
      )
    end

    Liquid::PartialCache.load(
      'my_partial',
      context: context_two,
-      parse_context: parse_context,
+      parse_context: parse_context
    )

    assert_equal(2, shared_file_system.file_read_count)
@@ -72,18 +72,18 @@ class PartialCacheUnitTest < Minitest::Test
  def test_cache_is_not_broken_when_a_different_parse_context_is_used
    file_system = StubFileSystem.new('my_partial' => 'some partial body')
    context     = Liquid::Context.build(
-      registers: { file_system: file_system },
+      registers: { file_system: file_system }
    )

    Liquid::PartialCache.load(
      'my_partial',
      context: context,
-      parse_context: Liquid::ParseContext.new(my_key: 'value one'),
+      parse_context: Liquid::ParseContext.new(my_key: 'value one')
    )
    Liquid::PartialCache.load(
      'my_partial',
      context: context,
-      parse_context: Liquid::ParseContext.new(my_key: 'value two'),
+      parse_context: Liquid::ParseContext.new(my_key: 'value two')
    )

    # Technically what we care about is that the file was parsed twice,
@@ -95,13 +95,13 @@ class PartialCacheUnitTest < Minitest::Test
    context = Liquid::Context.build(
      registers: {
        file_system: StubFileSystem.new('my_partial' => 'my partial body'),
-      },
+      }
    )

    partial = Liquid::PartialCache.load(
      'my_partial',
      context: context,
-      parse_context: Liquid::ParseContext.new,
+      parse_context: Liquid::ParseContext.new
    )

    assert_equal('my partial body', partial.render)
@@ -113,13 +113,13 @@ class PartialCacheUnitTest < Minitest::Test
      registers: {
        file_system: StubFileSystem.new('my_partial' => 'my partial body'),
        template_factory: template_factory,
-      },
+      }
    )

    partial = Liquid::PartialCache.load(
      'my_partial',
      context: context,
-      parse_context: Liquid::ParseContext.new,
+      parse_context: Liquid::ParseContext.new
    )

    assert_equal('my partial body', partial.render)
@@ -129,12 +129,12 @@ class PartialCacheUnitTest < Minitest::Test
  def test_cache_state_is_shared_for_subcontexts
    parse_context      = Liquid::ParseContext.new
    shared_file_system = StubFileSystem.new(
-      'my_partial' => 'my shared value',
+      'my_partial' => 'my shared value'
    )
    context = Liquid::Context.build(
      registers: Liquid::Registers.new(
        file_system: shared_file_system,
-      ),
+      )
    )
    subcontext = context.new_isolated_subcontext

@@ -144,57 +144,16 @@ class PartialCacheUnitTest < Minitest::Test
      Liquid::PartialCache.load(
        'my_partial',
        context: context,
-        parse_context: parse_context,
+        parse_context: parse_context
      )

      Liquid::PartialCache.load(
        'my_partial',
        context: subcontext,
-        parse_context: parse_context,
+        parse_context: parse_context
      )
    end

    assert_equal(1, shared_file_system.file_read_count)
  end
-
-  def test_uses_template_name_from_template_factory
-    template_factory = StubTemplateFactory.new
-    context = Liquid::Context.build(
-      registers: {
-        file_system: StubFileSystem.new('my_partial' => 'my partial body'),
-        template_factory: template_factory,
-      },
-    )
-
-    partial = Liquid::PartialCache.load(
-      'my_partial',
-      context: context,
-      parse_context: Liquid::ParseContext.new,
-    )
-
-    assert_equal('some/path/my_partial', partial.name)
-  end
-
-  def test_includes_error_mode_into_template_cache
-    template_factory = StubTemplateFactory.new
-    context = Liquid::Context.build(
-      registers: {
-        file_system: StubFileSystem.new('my_partial' => 'my partial body'),
-        template_factory: template_factory,
-      },
-    )
-
-    [:lax, :warn, :strict].each do |error_mode|
-      Liquid::PartialCache.load(
-        'my_partial',
-        context: context,
-        parse_context: Liquid::ParseContext.new(error_mode: error_mode),
-      )
-    end
-
-    assert_equal(
-      ["my_partial:lax", "my_partial:warn", "my_partial:strict"],
-      context.registers[:cached_partials].keys,
-    )
-  end
 end
@@ -1,7 +1,6 @@
 # frozen_string_literal: true

 require 'test_helper'
-require 'timeout'

 class RegexpUnitTest < Minitest::Test
  include Liquid
@@ -38,22 +37,10 @@ class RegexpUnitTest < Minitest::Test

  def test_variable_parser
    assert_equal(['var'],                               'var'.scan(VariableParser))
-    assert_equal(['[var]'],                             '[var]'.scan(VariableParser))
    assert_equal(['var', 'method'],                     'var.method'.scan(VariableParser))
    assert_equal(['var', '[method]'],                   'var[method]'.scan(VariableParser))
    assert_equal(['var', '[method]', '[0]'],            'var[method][0]'.scan(VariableParser))
    assert_equal(['var', '["method"]', '[0]'],          'var["method"][0]'.scan(VariableParser))
    assert_equal(['var', '[method]', '[0]', 'method'],  'var[method][0].method'.scan(VariableParser))
  end
-
-  def test_variable_parser_with_large_input
-    Timeout.timeout(1) { assert_equal(['[var]'], '[var]'.scan(VariableParser)) }
-
-    very_long_string = "foo" * 1000
-
-    # valid dynamic lookup
-    Timeout.timeout(1) { assert_equal(["[#{very_long_string}]"], "[#{very_long_string}]".scan(VariableParser)) }
-    # invalid dynamic lookup with missing closing bracket
-    Timeout.timeout(1) { assert_equal([very_long_string], "[#{very_long_string}".scan(VariableParser)) }
-  end
 end # RegexpTest
@@ -50,7 +50,7 @@ class StrainerFactoryUnitTest < Minitest::Test

    assert_match(
      /\ALiquid error: wrong number of arguments \((1 for 0|given 1, expected 0)\)\z/,
-      exception.message,
+      exception.message
    )
    source = AccessScopeFilters.instance_method(:public_filter).source_location
    assert_equal(source.map(&:to_s), exception.backtrace[0].split(':')[0..1])