Fixing how the indirection tests for whether the request has node info.

My request authorization code changed the request to set its 'node'
instance variable, rather than using its options, and I apparently
didn't change the Indirection class to do this.

I have *no* idea how these tests were passing before -- they passed for
me yesterday but failed for Andrew, and today they started failing for
me.  Frightening.

2 files changed, 5 insertions, 5 deletions

diff --git a/lib/puppet/indirector/indirection.rb b/lib/puppet/indirector/indirection.rb
index 05464f8c9..4841ec532 100644
--- a/lib/puppet/indirector/indirection.rb
+++ b/lib/puppet/indirector/indirection.rb
@@ -267,7 +267,7 @@ class Puppet::Indirector::Indirection
     def check_authorization(request, terminus)
         # At this point, we're assuming authorization makes no sense without
         # client information.
-        return unless request.options[:node]
+        return unless request.node
 
         # This is only to authorize via a terminus-specific authorization hook.
         return unless terminus.respond_to?(:authorized?)
diff --git a/spec/unit/indirector/indirection.rb b/spec/unit/indirector/indirection.rb
index cefd0557e..5d4539e95 100755
--- a/spec/unit/indirector/indirection.rb
+++ b/spec/unit/indirector/indirection.rb
@@ -6,7 +6,7 @@ require 'puppet/indirector/indirection'
 
 describe "Indirection Delegator", :shared => true do
     it "should create a request object with the appropriate method name and all of the passed arguments" do
-        request = stub 'request', :options => {}
+        request = stub 'request', :node => nil
 
         @indirection.expects(:request).with(@method, "mystuff", :one => :two).returns request
 
@@ -339,7 +339,7 @@ describe Puppet::Indirector::Indirection do
                 end
 
                 it "should use a request to save the object to the cache" do
-                    request = stub 'request', :instance => @instance, :options => {}
+                    request = stub 'request', :instance => @instance, :node => nil
 
                     @indirection.expects(:request).returns request
 
@@ -370,8 +370,8 @@ describe Puppet::Indirector::Indirection do
                 end
 
                 it "should use a request instance to search in and remove objects from the cache" do
-                    destroy = stub 'destroy_request', :key => "/my/key", :options => {}
-                    find = stub 'destroy_request', :key => "/my/key", :options => {}
+                    destroy = stub 'destroy_request', :key => "/my/key", :node => nil
+                    find = stub 'destroy_request', :key => "/my/key", :node => nil
 
                     @indirection.expects(:request).with(:destroy, "/my/key").returns destroy
                     @indirection.expects(:request).with(:find, "/my/key").returns find