diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-08-27 12:33:15 -0700 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2010-08-27 12:33:15 -0700 |
| commit | fb9034731ddae41f1009745eb8eb1ea53aa05cfb (patch) | |
| tree | 5cb8296af8859f59b9a20995105af77a9cdb2821 /spec/unit/parser/compiler_spec.rb | |
| parent | 16f701edd89a320ad73b5468d883dfb017fe6e96 (diff) | |
| parent | 8be1929043f4560bb17a4b06293b3f9a4efcfdbf (diff) | |
| download | puppet-fb9034731ddae41f1009745eb8eb1ea53aa05cfb.tar.gz puppet-fb9034731ddae41f1009745eb8eb1ea53aa05cfb.tar.xz puppet-fb9034731ddae41f1009745eb8eb1ea53aa05cfb.zip | |
Merge commit '2.6.1rc3' into next
Diffstat (limited to 'spec/unit/parser/compiler_spec.rb')
| -rwxr-xr-x | spec/unit/parser/compiler_spec.rb | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/spec/unit/parser/compiler_spec.rb b/spec/unit/parser/compiler_spec.rb index e8c06dd0b..22d52f257 100755 --- a/spec/unit/parser/compiler_spec.rb +++ b/spec/unit/parser/compiler_spec.rb @@ -430,7 +430,18 @@ describe Puppet::Parser::Compiler do lambda { @compiler.add_resource(@scope, resource) }.should raise_error(ArgumentError) end - it "should add edges from the class resources to the main stage if no stage is specified" do + it "should add edges from the class resources to the parent's stage if no stage is specified" do + main = @compiler.catalog.resource(:stage, :main) + foo_stage = resource(:stage, :foo_stage) + @compiler.add_resource(@scope, foo_stage) + resource = resource(:class, "foo") + @scope.stubs(:resource).returns(:stage => :foo_stage) + @compiler.add_resource(@scope, resource) + + @compiler.catalog.should be_edge(foo_stage, resource) + end + + it "should add edges from top-level class resources to the main stage if no stage is specified" do main = @compiler.catalog.resource(:stage, :main) resource = resource(:class, "foo") @compiler.add_resource(@scope, resource) |