[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.5-639-g8f94f35

[Markus Roberts]

The following commit has been merged in the upstream branch:
commit dd4fa6686b31501ab8d8f800a81715e713b14031
Author: Brice Figureau <brice-puppet at daysofwonder.com>
Date:   Sat Apr 24 17:32:39 2010 +0200

    Fix failing tests in spec/unit/resources/type.rb
    
    Signed-off-by: Brice Figureau <brice-puppet at daysofwonder.com>

diff --git a/spec/unit/resource/type_spec.rb b/spec/unit/resource/type_spec.rb
index 781721d..2a8802c 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)
 

-- 
Puppet packaging for Debian