Renaming the 'mounts' terminus to 'file_server', and renaming

tests accordingly.

2 files changed, 5 insertions, 7 deletions

diff --git a/spec/lib/shared_behaviours/file_server_mounts.rb b/spec/lib/shared_behaviours/file_server_terminus.rb
index 99a2f2953..93634e7dc 100644
--- a/spec/lib/shared_behaviours/file_server_mounts.rb
+++ b/spec/lib/shared_behaviours/file_server_terminus.rb
@@ -3,7 +3,7 @@
 #  Created by Luke Kanies on 2007-10-18.
 #  Copyright (c) 2007. All rights reserved.
 
-describe "Puppet::Indirector::FileServerMounts", :shared => true do
+describe "Puppet::Indirector::FileServerTerminus", :shared => true do
     # This only works if the shared behaviour is included before
     # the 'before' block in the including context.
     before do
@@ -22,8 +22,6 @@ describe "Puppet::Indirector::FileServerMounts", :shared => true do
 
         Puppet::FileServing::Configuration::Parser.stubs(:new).returns(@parser)
 
-        Puppet::FileServing::Configuration.create.stubs(:modules_mount)
-
         # Stub out the modules terminus
         @modules = mock 'modules terminus'
     end
diff --git a/spec/lib/shared_behaviours/file_serving.rb b/spec/lib/shared_behaviours/file_serving.rb
index ffc96ee78..5c1d87015 100644
--- a/spec/lib/shared_behaviours/file_serving.rb
+++ b/spec/lib/shared_behaviours/file_serving.rb
@@ -18,19 +18,19 @@ describe "Puppet::FileServing::Files", :shared => true do
         @test_class.find(uri)
     end
 
-    it "should use the mounts terminus when the 'puppet' URI scheme is used, no host name is present, and the process name is 'puppet'" do
+    it "should use the file_server terminus when the 'puppet' URI scheme is used, no host name is present, and the process name is 'puppet'" do
         uri = "puppet:///mymod/my/file"
         Puppet.settings.stubs(:value).with(:name).returns("puppet")
         Puppet.settings.stubs(:value).with(:modulepath).returns("")
         Puppet.settings.stubs(:value).with(:libdir).returns("")
         Puppet.settings.stubs(:value).with(:fileserverconfig).returns("/whatever")
-        @indirection.terminus(:mounts).expects(:find).with(uri)
+        @indirection.terminus(:file_server).expects(:find).with(uri)
         @test_class.find(uri)
     end
 
-    it "should use the mounts terminus when the 'puppetmounts' URI scheme is used" do
+    it "should use the file_server terminus when the 'puppetmounts' URI scheme is used" do
         uri = "puppetmounts:///mymod/my/file"
-        @indirection.terminus(:mounts).expects(:find).with(uri)
+        @indirection.terminus(:file_server).expects(:find).with(uri)
         @test_class.find(uri)
     end