Fixing (and testing) the return of Indirection#save

This broke in a previous commit, and was apparently not
tested well because of how the mocks were set up.  The
integration test caught it.

Signed-off-by: Luke Kanies <luke@madstop.com>

2 files changed, 16 insertions, 4 deletions

diff --git a/lib/puppet/indirector/indirection.rb b/lib/puppet/indirector/indirection.rb
index 2eac2395b..18b764757 100644
--- a/lib/puppet/indirector/indirection.rb
+++ b/lib/puppet/indirector/indirection.rb
@@ -244,10 +244,12 @@ class Puppet::Indirector::Indirection
         request = request(:save, instance, *args)
         terminus = prepare(request)
 
-        terminus.save(request)
+        result = terminus.save(request)
 
         # If caching is enabled, save our document there
         cache.save(request) if cache?
+
+        result
     end
 
     private
diff --git a/spec/unit/indirector/indirection.rb b/spec/unit/indirector/indirection.rb
index 51bd45473..84b4e0e24 100755
--- a/spec/unit/indirector/indirection.rb
+++ b/spec/unit/indirector/indirection.rb
@@ -351,9 +351,9 @@ describe Puppet::Indirector::Indirection do
             it_should_behave_like "Indirection Delegator"
             it_should_behave_like "Delegation Authorizer"
 
-            it "should return nil" do
-                @terminus.stubs(:save)
-                @indirection.save(@instance).should be_nil
+            it "should return the result of the save" do
+                @terminus.stubs(:save).returns "foo"
+                @indirection.save(@instance).should == "foo"
             end
 
             describe "when caching is enabled" do
@@ -364,6 +364,16 @@ describe Puppet::Indirector::Indirection do
                     @instance.stubs(:expired?).returns false
                 end
 
+                it "should return the result of saving to the terminus" do
+                    request = stub 'request', :instance => @instance, :node => nil
+
+                    @indirection.expects(:request).returns request
+
+                    @cache.stubs(:save)
+                    @terminus.stubs(:save).returns @instance
+                    @indirection.save(@instance).should equal(@instance)
+                end
+
                 it "should use a request to save the object to the cache" do
                     request = stub 'request', :instance => @instance, :node => nil