1 files changed, 51 insertions, 35 deletions
diff --git a/spec/unit/indirector/module_files.rb b/spec/unit/indirector/module_files.rb
index f5b92e1fd..32dedd4f1 100755
--- a/spec/unit/indirector/module_files.rb
+++ b/spec/unit/indirector/module_files.rb
@@ -27,61 +27,66 @@ describe Puppet::Indirector::ModuleFiles do
   
         @uri = "puppetmounts://host/modules/my/local/file"
         @module = Puppet::Module.new("mymod", "/module/path")
+
+        @request = stub 'request', :key => @uri, :options => {}, :node => nil, :ip => nil, :method => :find
     end
 
     describe Puppet::Indirector::ModuleFiles, " when finding files" do
 
         it "should strip off the leading '/modules' mount name" do
             Puppet::Module.expects(:find).with('my', "myenv").returns @module
-            @module_files.find(@uri)
+            @module_files.find(@request)
         end
 
         it "should not strip off leading terms that start with '/modules' but are longer words" do
+            @request.stubs(:key).returns "puppetmounts://host/modulestart/my/local/file"
             Puppet::Module.expects(:find).with('modulestart', "myenv").returns nil
-            @module_files.find("puppetmounts://host/modulestart/my/local/file")
+            @module_files.find(@request)
         end
 
         it "should search for a module whose name is the first term in the remaining file path" do
             Puppet::Module.expects(:find).with('my', "myenv").returns @module
-            @module_files.find(@uri)
+            @module_files.find(@request)
         end
 
         it "should search for a file relative to the module's files directory" do
             Puppet::Module.expects(:find).with('my', "myenv").returns @module
             FileTest.expects(:exists?).with("/module/path/files/local/file")
-            @module_files.find(@uri)
+            @module_files.find(@request)
         end
 
         it "should return nil if the module does not exist" do
             Puppet::Module.expects(:find).with('my', "myenv").returns nil
-            @module_files.find(@uri).should be_nil
+            @module_files.find(@request).should be_nil
         end
 
         it "should return nil if the module exists but the file does not" do
             Puppet::Module.expects(:find).with('my', "myenv").returns @module
             FileTest.expects(:exists?).with("/module/path/files/local/file").returns(false)
-            @module_files.find(@uri).should be_nil
+            @module_files.find(@request).should be_nil
         end
 
         it "should return an instance of the model if a module is found and the file exists" do
             Puppet::Module.expects(:find).with('my', "myenv").returns @module
             FileTest.expects(:exists?).with("/module/path/files/local/file").returns(true)
             @model.expects(:new).returns(:myinstance)
-            @module_files.find(@uri).should == :myinstance
+            @module_files.find(@request).should == :myinstance
         end
 
         it "should use the node's environment to look up the module if the node name is provided" do
             node = stub "node", :environment => "testing"
             Puppet::Node.expects(:find).with("mynode").returns(node)
             Puppet::Module.expects(:find).with('my', "testing")
-            @module_files.find(@uri, :node => "mynode")
+
+            @request.stubs(:node).returns "mynode"
+            @module_files.find(@request)
         end
 
         it "should use the default environment setting to look up the module if the node name is not provided" do
             env = stub "environment", :name => "testing"
             Puppet::Node::Environment.stubs(:new).returns(env)
             Puppet::Module.expects(:find).with('my', "testing")
-            @module_files.find(@uri)
+            @module_files.find(@request)
         end
     end
 
@@ -95,23 +100,25 @@ describe Puppet::Indirector::ModuleFiles do
 
         it "should create the instance with the key used to find the instance" do
             @model.expects(:new).with { |key, *options| key == @uri }
-            @module_files.find(@uri)
+            @module_files.find(@request)
         end
 
         it "should create the instance with the path at which the instance was found" do
             @model.expects(:new).with { |key, options| options[:path] == "/module/path/files/local/file" }
-            @module_files.find(@uri)
+            @module_files.find(@request)
         end
 
         it "should set the provided :links setting on to the instance if one is provided" do
             @model.expects(:new).returns(@instance)
             @instance.expects(:links=).with(:mytest)
-            @module_files.find(@uri, :links => :mytest)
+
+            @request.options[:links] = :mytest
+            @module_files.find(@request)
         end
 
         it "should not set a :links value if no :links parameter is provided" do
             @model.expects(:new).returns(@instance)
-            @module_files.find(@uri)
+            @module_files.find(@request)
         end
     end
 
@@ -127,46 +134,53 @@ describe Puppet::Indirector::ModuleFiles do
         end
 
         it "should deny the :destroy method" do
-            @module_files.authorized?(:destroy, "whatever").should be_false
+            @request.expects(:method).returns :destroy
+            @module_files.authorized?(@request).should be_false
         end
 
         it "should deny the :save method" do
-            @module_files.authorized?(:save, "whatever").should be_false
+            @request.expects(:method).returns :save
+            @module_files.authorized?(@request).should be_false
         end
 
         it "should use the file server configuration to determine authorization" do
             @configuration.expects(:authorized?)
-            @module_files.authorized?(:find, "puppetmounts://host/my/file")
+            @module_files.authorized?(@request)
         end
 
         it "should use the path directly from the URI if it already includes /modules" do
+            @request.expects(:key).returns "puppetmounts://host/modules/my/file"
             @configuration.expects(:authorized?).with { |uri, *args| uri == "/modules/my/file" }
-            @module_files.authorized?(:find, "puppetmounts://host/modules/my/file")
+            @module_files.authorized?(@request)
         end
 
         it "should add /modules to the file path if it's not included in the URI" do
+            @request.expects(:key).returns "puppetmounts://host/my/file"
             @configuration.expects(:authorized?).with { |uri, *args| uri == "/modules/my/file" }
-            @module_files.authorized?(:find, "puppetmounts://host/my/file")
+            @module_files.authorized?(@request)
         end
 
         it "should pass the node name to the file server configuration" do
+            @request.expects(:key).returns "puppetmounts://host/my/file"
             @configuration.expects(:authorized?).with { |key, options| options[:node] == "mynode" }
-            @module_files.authorized?(:find, "puppetmounts://host/my/file", :node => "mynode")
+            @request.stubs(:node).returns "mynode"
+            @module_files.authorized?(@request)
         end
 
         it "should pass the IP address to the file server configuration" do
+            @request.expects(:ip).returns "myip"
             @configuration.expects(:authorized?).with { |key, options| options[:ipaddress] == "myip" }
-            @module_files.authorized?(:find, "puppetmounts://host/my/file", :ipaddress => "myip")
+            @module_files.authorized?(@request)
         end
 
         it "should return false if the file server configuration denies authorization" do
             @configuration.expects(:authorized?).returns(false)
-            @module_files.authorized?(:find, "puppetmounts://host/my/file").should be_false
+            @module_files.authorized?(@request).should be_false
         end
 
         it "should return true if the file server configuration approves authorization" do
             @configuration.expects(:authorized?).returns(true)
-            @module_files.authorized?(:find, "puppetmounts://host/my/file").should be_true
+            @module_files.authorized?(@request).should be_true
         end
     end
 
@@ -175,69 +189,71 @@ describe Puppet::Indirector::ModuleFiles do
         it "should strip off the leading '/modules' mount name" do
             Puppet::Node::Environment.stubs(:new).returns(stub('env', :name => "myenv"))
             Puppet::Module.expects(:find).with('my', "myenv").returns @module
-            @module_files.search(@uri)
+            @module_files.search(@request)
         end
 
         it "should not strip off leading terms that start with '/modules' but are longer words" do
             Puppet::Node::Environment.stubs(:new).returns(stub('env', :name => "myenv"))
             Puppet::Module.expects(:find).with('modulestart', "myenv").returns nil
-            @module_files.search("puppetmounts://host/modulestart/my/local/file")
+            @request.stubs(:key).returns "puppetmounts://host/modulestart/my/local/file"
+            @module_files.search @request
         end
 
         it "should search for a module whose name is the first term in the remaining file path" do
             Puppet::Node::Environment.stubs(:new).returns(stub('env', :name => "myenv"))
             Puppet::Module.expects(:find).with('my', "myenv").returns @module
-            @module_files.search(@uri)
+            @module_files.search(@request)
         end
 
         it "should search for a file relative to the module's files directory" do
             Puppet::Node::Environment.stubs(:new).returns(stub('env', :name => "myenv"))
             Puppet::Module.expects(:find).with('my', "myenv").returns @module
             FileTest.expects(:exists?).with("/module/path/files/local/file")
-            @module_files.search(@uri)
+            @module_files.search(@request)
         end
 
         it "should return nil if the module does not exist" do
             Puppet::Node::Environment.stubs(:new).returns(stub('env', :name => "myenv"))
             Puppet::Module.expects(:find).with('my', "myenv").returns nil
-            @module_files.search(@uri).should be_nil
+            @module_files.search(@request).should be_nil
         end
 
         it "should return nil if the module exists but the file does not" do
             Puppet::Node::Environment.stubs(:new).returns(stub('env', :name => "myenv"))
             Puppet::Module.expects(:find).with('my', "myenv").returns @module
             FileTest.expects(:exists?).with("/module/path/files/local/file").returns(false)
-            @module_files.search(@uri).should be_nil
+            @module_files.search(@request).should be_nil
         end
 
         it "should use the node's environment to look up the module if the node name is provided" do
             node = stub "node", :environment => "testing"
             Puppet::Node.expects(:find).with("mynode").returns(node)
             Puppet::Module.expects(:find).with('my', "testing")
-            @module_files.search(@uri, :node => "mynode")
+            @request.stubs(:node).returns "mynode"
+            @module_files.search(@request)
         end
 
         it "should use the default environment setting to look up the module if the node name is not provided and the environment is not set to ''" do
             env = stub 'env', :name => "testing"
             Puppet::Node::Environment.stubs(:new).returns(env)
             Puppet::Module.expects(:find).with('my', "testing")
-            @module_files.search(@uri)
+            @module_files.search(@request)
         end
 
         it "should use :path2instances from the terminus_helper to return instances if a module is found and the file exists" do
             Puppet::Node::Environment.stubs(:new).returns(stub('env', :name => "myenv"))
             Puppet::Module.expects(:find).with('my', "myenv").returns @module
             FileTest.expects(:exists?).with("/module/path/files/local/file").returns(true)
-            @module_files.expects(:path2instances).with(@uri, "/module/path/files/local/file", {})
-            @module_files.search(@uri)
+            @module_files.expects(:path2instances).with(@request, "/module/path/files/local/file")
+            @module_files.search(@request)
         end
 
-        it "should pass any options on to :path2instances" do
+        it "should pass the request directly to :path2instances" do
             Puppet::Node::Environment.stubs(:new).returns(stub('env', :name => "myenv"))
             Puppet::Module.expects(:find).with('my', "myenv").returns @module
             FileTest.expects(:exists?).with("/module/path/files/local/file").returns(true)
-            @module_files.expects(:path2instances).with(@uri, "/module/path/files/local/file", :testing => :one, :other => :two)
-            @module_files.search(@uri, :testing => :one, :other => :two)
+            @module_files.expects(:path2instances).with(@request, "/module/path/files/local/file")
+            @module_files.search(@request)
         end
     end
 end