Merge branch '0.24.x' of ssh://reductivelabs.com/opt/rl/git/puppet into 0.24.x

1 files changed, 49 insertions, 44 deletions

diff --git a/spec/unit/indirector/node/exec.rb b/spec/unit/indirector/node/exec.rb
index 5e6a9b1da..b67e0fe97 100755
--- a/spec/unit/indirector/node/exec.rb
+++ b/spec/unit/indirector/node/exec.rb
@@ -4,65 +4,70 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 
 require 'puppet/indirector/node/exec'
 
-describe Puppet::Node::Exec, " when constructing the command to run" do
+describe Puppet::Node::Exec do
     before do
         @indirection = mock 'indirection'
         Puppet.settings.stubs(:value).with(:external_nodes).returns("/echo")
         @searcher = Puppet::Node::Exec.new
     end
 
-    it "should use the external_node script as the command" do
-        Puppet.expects(:[]).with(:external_nodes).returns("/bin/echo")
-        @searcher.command.should == %w{/bin/echo}
+    it "should use the version of the facts as its version" do
+        version = mock 'version'
+        Puppet::Node::Facts.expects(:version).with("me").returns version
+        @searcher.version("me").should equal(version)
     end
 
-    it "should throw an exception if no external node command is set" do
-        Puppet.expects(:[]).with(:external_nodes).returns("none")
-        proc { @searcher.find("foo") }.should raise_error(ArgumentError)
-    end
-end
+    describe "when constructing the command to run" do
+        it "should use the external_node script as the command" do
+            Puppet.expects(:[]).with(:external_nodes).returns("/bin/echo")
+            @searcher.command.should == %w{/bin/echo}
+        end
 
-describe Puppet::Node::Exec, " when handling the results of the command" do
-    before do
-        @indirection = mock 'indirection'
-        Puppet.settings.stubs(:value).with(:external_nodes).returns("/echo")
-        @searcher = Puppet::Node::Exec.new
-        @node = stub 'node', :fact_merge => nil
-        @name = "yay"
-        Puppet::Node.expects(:new).with(@name).returns(@node)
-        @result = {}
-        # Use a local variable so the reference is usable in the execute() definition.
-        result = @result
-        @searcher.meta_def(:execute) do |command|
-            return YAML.dump(result)
+        it "should throw an exception if no external node command is set" do
+            Puppet.expects(:[]).with(:external_nodes).returns("none")
+            proc { @searcher.find("foo") }.should raise_error(ArgumentError)
         end
     end
 
-    it "should translate the YAML into a Node instance" do
-        # Use an empty hash
-        @searcher.find(@name).should equal(@node)
-    end
+    describe "when handling the results of the command" do
+        before do
+            @node = stub 'node', :fact_merge => nil
+            @name = "yay"
+            Puppet::Node.expects(:new).with(@name).returns(@node)
+            @result = {}
+            # Use a local variable so the reference is usable in the execute() definition.
+            result = @result
+            @searcher.meta_def(:execute) do |command|
+                return YAML.dump(result)
+            end
+        end
 
-    it "should set the resulting parameters as the node parameters" do
-        @result[:parameters] = {"a" => "b", "c" => "d"}
-        @node.expects(:parameters=).with "a" => "b", "c" => "d"
-        @searcher.find(@name)
-    end
+        it "should translate the YAML into a Node instance" do
+            # Use an empty hash
+            @searcher.find(@name).should equal(@node)
+        end
 
-    it "should set the resulting classes as the node classes" do
-        @result[:classes] = %w{one two}
-        @node.expects(:classes=).with %w{one two}
-        @searcher.find(@name)
-    end
+        it "should set the resulting parameters as the node parameters" do
+            @result[:parameters] = {"a" => "b", "c" => "d"}
+            @node.expects(:parameters=).with "a" => "b", "c" => "d"
+            @searcher.find(@name)
+        end
 
-    it "should merge the node's facts with its parameters" do
-        @node.expects(:fact_merge)
-        @searcher.find(@name)
-    end
+        it "should set the resulting classes as the node classes" do
+            @result[:classes] = %w{one two}
+            @node.expects(:classes=).with %w{one two}
+            @searcher.find(@name)
+        end
+
+        it "should merge the node's facts with its parameters" do
+            @node.expects(:fact_merge)
+            @searcher.find(@name)
+        end
 
-    it "should set the node's environment if one is provided" do
-        @result[:environment] = "yay"
-        @node.expects(:environment=).with "yay"
-        @searcher.find(@name)
+        it "should set the node's environment if one is provided" do
+            @result[:environment] = "yay"
+            @node.expects(:environment=).with "yay"
+            @searcher.find(@name)
+        end
     end
 end