summaryrefslogtreecommitdiffstats
path: root/spec/lib
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2007-11-20 01:30:20 -0600
committerLuke Kanies <luke@madstop.com>2007-11-20 01:30:20 -0600
commit94e63add08c94d019c079e758e46ca727446d86b (patch)
tree7f13d7146c50e1f5d1ae6fe3788ae68451cafafd /spec/lib
parent7fe5bfcd28fe61422ffa2071bfc36f753f83c11a (diff)
downloadpuppet-94e63add08c94d019c079e758e46ca727446d86b.tar.gz
puppet-94e63add08c94d019c079e758e46ca727446d86b.tar.xz
puppet-94e63add08c94d019c079e758e46ca727446d86b.zip
Fixing the last failing test relating to the environment changes
Diffstat (limited to 'spec/lib')
-rw-r--r--spec/lib/shared_behaviours/file_serving.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/lib/shared_behaviours/file_serving.rb b/spec/lib/shared_behaviours/file_serving.rb
index a5e80f89b..b5ab6b0fd 100644
--- a/spec/lib/shared_behaviours/file_serving.rb
+++ b/spec/lib/shared_behaviours/file_serving.rb
@@ -20,8 +20,9 @@ describe "Puppet::FileServing::Files", :shared => true 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::Node::Environment.stubs(:new).returns(stub("env", :name => "testing"))
Puppet.settings.stubs(:value).with(:name).returns("puppet")
- Puppet.settings.stubs(:value).with(:modulepath, nil).returns("")
+ Puppet.settings.stubs(:value).with(:modulepath, "testing").returns("")
Puppet.settings.stubs(:value).with(:modulepath).returns("")
Puppet.settings.stubs(:value).with(:libdir).returns("")
Puppet.settings.stubs(:value).with(:fileserverconfig).returns("/whatever")