Switching the class resource evaluation to only happen

when using :include, not (for example) when evaluating
node classes.

1 files changed, 12 insertions, 6 deletions

diff --git a/spec/unit/parser/compile.rb b/spec/unit/parser/compile.rb
index c7a367957..93c440417 100755
--- a/spec/unit/parser/compile.rb
+++ b/spec/unit/parser/compile.rb
@@ -88,7 +88,6 @@ describe Puppet::Parser::Compile, " when evaluating found classes" do
         @compile.configuration.stubs(:tag)
 
         @compile.stubs :store_resource
-        @resource.stubs(:evaluate)
 
         Puppet::Parser::Resource.expects(:new).with(:scope => @scope, :source => @scope.source, :title => "my::class", :type => "class").returns(@resource)
         @compile.evaluate_classes(%w{myclass}, @scope)
@@ -98,7 +97,6 @@ describe Puppet::Parser::Compile, " when evaluating found classes" do
         @compile.configuration.stubs(:tag)
 
         @compile.expects(:store_resource).with(@scope, @resource)
-        @resource.stubs(:evaluate)
 
         Puppet::Parser::Resource.stubs(:new).returns(@resource)
         @compile.evaluate_classes(%w{myclass}, @scope)
@@ -108,27 +106,35 @@ describe Puppet::Parser::Compile, " when evaluating found classes" do
         @compile.configuration.expects(:tag).with("my::class")
 
         @compile.stubs(:store_resource)
-        @resource.stubs(:evaluate)
 
         Puppet::Parser::Resource.stubs(:new).returns(@resource)
         @compile.evaluate_classes(%w{myclass}, @scope)
     end
 
-    it "should immediately evaluate the resources created for found classes" do
+    it "should not evaluate the resources created for found classes unless asked" do
         @compile.configuration.stubs(:tag)
 
         @compile.stubs(:store_resource)
-        @resource.expects(:evaluate)
+        @resource.expects(:evaluate).never
 
         Puppet::Parser::Resource.stubs(:new).returns(@resource)
         @compile.evaluate_classes(%w{myclass}, @scope)
     end
 
-    it "should return the list of found classes" do
+    it "should immediately evaluate the resources created for found classes when asked" do
         @compile.configuration.stubs(:tag)
 
         @compile.stubs(:store_resource)
         @resource.expects(:evaluate)
+
+        Puppet::Parser::Resource.stubs(:new).returns(@resource)
+        @compile.evaluate_classes(%w{myclass}, @scope, false)
+    end
+
+    it "should return the list of found classes" do
+        @compile.configuration.stubs(:tag)
+
+        @compile.stubs(:store_resource)
         @scope.stubs(:findclass).with("notfound").returns(nil)
 
         Puppet::Parser::Resource.stubs(:new).returns(@resource)