Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/Template/Plugin/Assert.pm
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ sub AUTOLOAD {
$item =~ s/.*:://;
return if $item eq 'DESTROY';

my $value = $stash->dotop($stash, $item, \@args);
my $value = $stash->dotop($this, $item, \@args);

if (! defined $value) {
die $EXCEPTION->new( assert => "undefined value for $item" );
Expand Down
52 changes: 50 additions & 2 deletions t/assert.t
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,15 @@ sub nil {

package main;

my $vars = {
my $vars = {
object => Template::Test::Object->new,
hash => { foo => 10, bar => undef },
list => [ undef ],
subref => sub { return undef },
nothing => undef,
nested => { name => 'hello', deep => { value => 42 } },
items => [ 10, 20, 30 ],
name => 'world',
};

test_expect(\*DATA, undef, $vars);
Expand Down Expand Up @@ -105,11 +108,56 @@ assert error - undefined value for first
-- expect --
assert error - undefined value for nothing

-- test --
-- test --
[% USE assert;
TRY; assert.subref; CATCH; error; END;
%]
-- expect --
assert error - undefined value for subref

#------------------------------------------------------------------------
# GH #300: assert should pass through defined values without error
#------------------------------------------------------------------------

-- test --
[% USE assert;
hash.assert.foo;
%]
-- expect --
10

-- test --
[% USE assert;
nested.assert.name;
%]
-- expect --
hello

-- test --
[% USE assert;
nested.assert.deep.value;
%]
-- expect --
42

-- test --
[% USE assert;
items.assert.size;
%]
-- expect --
3

-- test --
[% USE assert;
items.assert.first;
%]
-- expect --
10

-- test --
[% USE assert;
assert.name;
%]
-- expect --
world