diff options
| author | Paul Berry <paul@puppetlabs.com> | 2010-11-17 15:19:15 -0800 |
|---|---|---|
| committer | Paul Berry <paul@puppetlabs.com> | 2010-11-17 15:19:15 -0800 |
| commit | e6ec6468c4a9eec58dc155858665a70eee4dfb8c (patch) | |
| tree | 85cdb7614a1922752ff652b93f2947ef231fa8fb /spec/unit/parser/ast/resource_spec.rb | |
| parent | fb2b9e65990477e81728402afa1aab6fbe4a9c7e (diff) | |
| parent | 53bb805f118ccaca5598e60afadfa6b777410a0f (diff) | |
| download | puppet-e6ec6468c4a9eec58dc155858665a70eee4dfb8c.tar.gz puppet-e6ec6468c4a9eec58dc155858665a70eee4dfb8c.tar.xz puppet-e6ec6468c4a9eec58dc155858665a70eee4dfb8c.zip | |
Merge commit '2.6.3' into next
Resolved conflicts manually:
spec/integration/indirector/bucket_file/rest_spec.rb
spec/integration/indirector/certificate_revocation_list/rest_spec.rb
Diffstat (limited to 'spec/unit/parser/ast/resource_spec.rb')
| -rwxr-xr-x | spec/unit/parser/ast/resource_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/unit/parser/ast/resource_spec.rb b/spec/unit/parser/ast/resource_spec.rb index 3ed7b3e08..3f7fa229a 100755 --- a/spec/unit/parser/ast/resource_spec.rb +++ b/spec/unit/parser/ast/resource_spec.rb @@ -164,7 +164,7 @@ describe Puppet::Parser::AST::Resource do result = @resource.evaluate(@scope) result.length.should == 1 result.first.ref.should == "Class[Classname]" - @compiler.catalog.resource("Class[Classname]").should equal result.first + @compiler.catalog.resource("Class[Classname]").should equal(result.first) end it "should cause its parent to be evaluated" do @@ -175,7 +175,7 @@ describe Puppet::Parser::AST::Resource do result = @resource.evaluate(@scope) result.length.should == 1 result.first.ref.should == "Class[Classname]" - @compiler.catalog.resource("Class[Classname]").should equal result.first + @compiler.catalog.resource("Class[Classname]").should equal(result.first) @compiler.catalog.resource("Class[Parentname]").should be_instance_of(Puppet::Parser::Resource) end |