Removing the last vestiges of the 'puppetmounts' protocol marker.

I created this when I first designed the fileserving
Indirection hooks, and it's unnecessary.

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

3 files changed, 3 insertions, 4 deletions

diff --git a/spec/shared_behaviours/file_server_terminus.rb b/spec/shared_behaviours/file_server_terminus.rb
index 0230d39e8..91e1b2dca 100644
--- a/spec/shared_behaviours/file_server_terminus.rb
+++ b/spec/shared_behaviours/file_server_terminus.rb
@@ -25,7 +25,7 @@ describe "Puppet::Indirector::FileServerTerminus", :shared => true do
         # Stub out the modules terminus
         @modules = mock 'modules terminus'
 
-        @request = Puppet::Indirector::Request.new(:indirection, :method, "puppetmounts://myhost/one/my/file")
+        @request = Puppet::Indirector::Request.new(:indirection, :method, "puppet://myhost/one/my/file")
     end
 
     it "should use the file server configuration to find files" do
diff --git a/spec/unit/file_serving/indirection_hooks.rb b/spec/unit/file_serving/indirection_hooks.rb
index 12993bf1b..83ff5848f 100755
--- a/spec/unit/file_serving/indirection_hooks.rb
+++ b/spec/unit/file_serving/indirection_hooks.rb
@@ -90,7 +90,7 @@ describe Puppet::FileServing::IndirectionHooks do
                 @object.stubs(:terminus).with(:modules).returns(modules)
                 modules.stubs(:find_module).returns(nil)
 
-                @request.stubs(:key).returns "puppetmounts://host/notmodules/file"
+                @request.stubs(:key).returns "notmodules/file"
 
                 @object.select_terminus(@request).should == :file_server
             end
diff --git a/spec/unit/indirector/file_server.rb b/spec/unit/indirector/file_server.rb
index 90fb84d35..ab8e32566 100755
--- a/spec/unit/indirector/file_server.rb
+++ b/spec/unit/indirector/file_server.rb
@@ -103,7 +103,6 @@ describe Puppet::Indirector::FileServer do
         
         describe "and finding file information" do
             before do
-                @request.key =  "puppetmounts://host/my/file"
                 @request.method = :find 
             end
 
@@ -113,7 +112,7 @@ describe Puppet::Indirector::FileServer do
             end
 
             it "should pass the file path from the URI to the file server configuration" do
-                @configuration.expects(:authorized?).with { |uri, *args| uri == "/my/file" }
+                @configuration.expects(:authorized?).with { |uri, *args| uri == "my/local/file" }
                 @file_server.authorized?(@request)
             end