diff options
author | Brice Figureau <brice-puppet@daysofwonder.com> | 2009-01-30 20:12:50 +0100 |
---|---|---|
committer | James Turnbull <james@lovedthanlost.net> | 2009-02-11 08:51:58 +1100 |
commit | 7e036eb761539d58794469ecf14ee7e94d10a5fc (patch) | |
tree | 6bb6e3c2cfee04a44f23084a4dbce93c99be91a2 /spec/unit/parser/ast/astarray.rb | |
parent | 535fa89af0b87f1d514d75040c1da7795d1dc87e (diff) | |
download | puppet-7e036eb761539d58794469ecf14ee7e94d10a5fc.tar.gz puppet-7e036eb761539d58794469ecf14ee7e94d10a5fc.tar.xz puppet-7e036eb761539d58794469ecf14ee7e94d10a5fc.zip |
Fix #1922 - Functions squash all arguments into a single hash
Revert "Fix #1682 - ASTArray should flatten product of evaluation of its children"
This reverts commit c7ccc4ba7c42d56595564491ae578a1604c628d1.
Bug #1824 and #1922 proved the fix for #1682 and #1691 was wrong.
Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
Diffstat (limited to 'spec/unit/parser/ast/astarray.rb')
-rwxr-xr-x | spec/unit/parser/ast/astarray.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/unit/parser/ast/astarray.rb b/spec/unit/parser/ast/astarray.rb index f1c28ce47..b3026fe1e 100755 --- a/spec/unit/parser/ast/astarray.rb +++ b/spec/unit/parser/ast/astarray.rb @@ -49,7 +49,7 @@ describe Puppet::Parser::AST::ASTArray do operator.evaluate(@scope).should == [123] end - it "should flatten the results of children evaluation" do + it "should not flatten the results of children evaluation" do item1 = stub "item1", :is_a? => true item2 = stub "item2" item2.stubs(:is_a?).with(Puppet::Parser::AST).returns(true) @@ -59,7 +59,7 @@ describe Puppet::Parser::AST::ASTArray do item1.expects(:safeevaluate).with(@scope).returns([123]) operator = Puppet::Parser::AST::ASTArray.new :children => [item2] - operator.evaluate(@scope).should == [123] + operator.evaluate(@scope).should == [[123]] end |