summaryrefslogtreecommitdiffstats
path: root/spec
diff options
context:
space:
mode:
authorMarkus Roberts <Markus@reality.com>2010-01-07 17:23:31 -0800
committertest branch <puppet-dev@googlegroups.com>2010-02-17 06:50:53 -0800
commit7504f1ede94900ab42cd6e9c4ff9c8a5cb9e65ee (patch)
tree201452cd2daa12369c5d3fecd9caa3a0a1ad5cc7 /spec
parentd0389f4d16efbeccf47d6cd2f1b0854ccb1c88d5 (diff)
Resolving conflicts with ???
Diffstat (limited to 'spec')
-rwxr-xr-xspec/unit/resource/type.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/unit/resource/type.rb b/spec/unit/resource/type.rb
index 14503b7cc..98b38c9b1 100755
--- a/spec/unit/resource/type.rb
+++ b/spec/unit/resource/type.rb
@@ -343,11 +343,11 @@ describe Puppet::Resource::Type do
end
it "should store the class scope" do
- subscope = stub 'subscope', :compiler => @compiler
+ subscope = stub 'subscope'
+ subscope.expects(:class_set).with('foo',subscope)
@type.expects(:subscope).with(@scope, @resource).returns subscope
@type.evaluate_code(@resource)
- @compiler.class_scope(@type).should equal(subscope)
end
it "should evaluate the code if any is provided" do