diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-08-12 13:53:13 -0700 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2010-08-12 13:53:29 -0700 |
| commit | 1f3070c4bc77b38e3dd6170cf6a58bee7ec337ac (patch) | |
| tree | 3c6495838d1b876528cb4522de3484c44749140d /spec/unit/parser/functions/require_spec.rb | |
| parent | d5db8db116aff58215ab0feebd7ec02086040f51 (diff) | |
| parent | 0f56c1b02d40f1f8552d933dd78b24745937b137 (diff) | |
| download | puppet-1f3070c4bc77b38e3dd6170cf6a58bee7ec337ac.tar.gz puppet-1f3070c4bc77b38e3dd6170cf6a58bee7ec337ac.tar.xz puppet-1f3070c4bc77b38e3dd6170cf6a58bee7ec337ac.zip | |
Merge branch 'next'
This synchronizes the 2.7 master branch with 2.6.1RC2
Diffstat (limited to 'spec/unit/parser/functions/require_spec.rb')
| -rwxr-xr-x | spec/unit/parser/functions/require_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/unit/parser/functions/require_spec.rb b/spec/unit/parser/functions/require_spec.rb index bd42fa579..49c4bbf74 100755 --- a/spec/unit/parser/functions/require_spec.rb +++ b/spec/unit/parser/functions/require_spec.rb @@ -6,7 +6,7 @@ describe "the require function" do before :each do @catalog = stub 'catalog' - @compiler = stub 'compiler', :catalog => @catalog + @compiler = stub 'compiler', :catalog => @catalog, :environment => nil @scope = Puppet::Parser::Scope.new @scope.stubs(:findresource) |