mirror of
https://github.com/kemko/liquid.git
synced 2026-01-08 19:25:40 +03:00
Revert "Merge pull request #352 from gaiottino/master"
This reverts commit553b0926ae, reversing changes made to628ab3dc6a.
This commit is contained in:
@@ -3,7 +3,6 @@
|
||||
## 3.0.0 / not yet released / branch "master"
|
||||
|
||||
* ...
|
||||
* Add error messages for missing variables when :strict, see #352 [Daniel Gaiottino]
|
||||
* Properly set context rethrow_errors on render! #349 [Thierry Joyal, tjoyal]
|
||||
* Fix broken rendering of variables which are equal to false, see #345 [Florian Weingarten, fw42]
|
||||
* Remove ActionView template handler [Dylan Thacker-Smith, dylanahsmith]
|
||||
|
||||
@@ -205,7 +205,6 @@ module Liquid
|
||||
end
|
||||
|
||||
scope ||= @environments.last || @scopes.last
|
||||
handle_not_found(key) unless scope.has_key?(key)
|
||||
variable ||= lookup_and_evaluate(scope, key)
|
||||
|
||||
variable = variable.to_liquid
|
||||
@@ -255,7 +254,6 @@ module Liquid
|
||||
# No key was present with the desired value and it wasn't one of the directly supported
|
||||
# keywords either. The only thing we got left is to return nil
|
||||
else
|
||||
handle_not_found(markup)
|
||||
return nil
|
||||
end
|
||||
|
||||
@@ -285,10 +283,6 @@ module Liquid
|
||||
end
|
||||
end
|
||||
end # squash_instance_assigns_with_environments
|
||||
|
||||
def handle_not_found(variable)
|
||||
@errors << "Variable {{#{variable}}} not found" if Template.error_mode == :strict
|
||||
end
|
||||
end # Context
|
||||
|
||||
end # Liquid
|
||||
|
||||
@@ -457,22 +457,4 @@ class ContextUnitTest < Test::Unit::TestCase
|
||||
assert_kind_of CategoryDrop, @context['category']
|
||||
assert_equal @context, @context['category'].context
|
||||
end
|
||||
|
||||
def test_strict_variables_not_found
|
||||
with_error_mode(:strict) do
|
||||
@context['does_not_exist']
|
||||
assert(@context.errors.length == 1)
|
||||
assert_equal(@context.errors[0], 'Variable {{does_not_exist}} not found')
|
||||
end
|
||||
end
|
||||
|
||||
def test_strict_nested_variables_not_found
|
||||
with_error_mode(:strict) do
|
||||
@context['hash'] = {'this' => 'exists'}
|
||||
@context['hash.does_not_exist']
|
||||
assert(@context.errors.length == 1)
|
||||
assert_equal(@context.errors[0], 'Variable {{hash.does_not_exist}} not found')
|
||||
end
|
||||
end
|
||||
|
||||
end # ContextTest
|
||||
|
||||
Reference in New Issue
Block a user