diff options
| author | Brice Figureau <brice-puppet@daysofwonder.com> | 2010-04-24 17:32:39 +0200 |
|---|---|---|
| committer | Markus Roberts <Markus@reality.com> | 2010-06-28 14:17:57 -0700 |
| commit | dd4fa6686b31501ab8d8f800a81715e713b14031 (patch) | |
| tree | 98ee67e64b065a1331ea244be74f226752c8c77d | |
| parent | 770a8ea2beb58cff52f5e532a777d7046aa2efb0 (diff) | |
| download | puppet-dd4fa6686b31501ab8d8f800a81715e713b14031.tar.gz puppet-dd4fa6686b31501ab8d8f800a81715e713b14031.tar.xz puppet-dd4fa6686b31501ab8d8f800a81715e713b14031.zip | |
Fix failing tests in spec/unit/resources/type.rb
Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
| -rwxr-xr-x | spec/unit/resource/type_spec.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/spec/unit/resource/type_spec.rb b/spec/unit/resource/type_spec.rb index 781721d84..2a8802c73 100755 --- a/spec/unit/resource/type_spec.rb +++ b/spec/unit/resource/type_spec.rb @@ -434,7 +434,8 @@ describe Puppet::Resource::Type do it "should evaluate the AST code if any is provided" do code = stub 'code' @type.stubs(:code).returns code - code.expects(:safeevaluate) + @type.stubs(:subscope).returns stub_everything("subscope", :compiler => @compiler) + code.expects(:safeevaluate).with @type.subscope @type.evaluate_code(@resource) end @@ -442,7 +443,6 @@ describe Puppet::Resource::Type do describe "and ruby code is provided" do it "should create a DSL Resource API and evaluate it" do @type.stubs(:ruby_code).returns(proc { "foo" }) - @api = stub 'api' Puppet::DSL::ResourceAPI.expects(:new).with { |res, scope, code| code == @type.ruby_code }.returns @api @api.expects(:evaluate) @@ -460,7 +460,6 @@ describe Puppet::Resource::Type do describe "and it has a parent class" do before do @parent_type = Puppet::Resource::Type.new(:hostclass, "parent") - @compiler @type.parent = "parent" @parent_resource = Puppet::Parser::Resource.new(:class, "parent", :scope => @scope) |
