Merge branch '0.24.x'

Conflicts:

	CHANGELOG

2 files changed, 6 insertions, 6 deletions

diff --git a/spec/integration/node/catalog.rb b/spec/integration/node/catalog.rb
index 285b85869..87d62ea6a 100755
--- a/spec/integration/node/catalog.rb
+++ b/spec/integration/node/catalog.rb
@@ -19,10 +19,10 @@ describe Puppet::Node::Catalog do
             Puppet::Node::Catalog.indirection.stubs(:terminus_class).returns :yaml
 
             # Load now, before we stub the exists? method.
-            Puppet::Node::Catalog.indirection.terminus(:yaml)
+            terminus = Puppet::Node::Catalog.indirection.terminus(:yaml)
+            terminus.expects(:path).with("me").returns "/my/yaml/file"
 
-            file = File.join(Puppet[:yamldir], "catalog", "me.yaml")
-            FileTest.expects(:exist?).with(file).returns false
+            FileTest.expects(:exist?).with("/my/yaml/file").returns false
             Puppet::Node::Catalog.find("me").should be_nil
         end
 
diff --git a/spec/integration/node/facts.rb b/spec/integration/node/facts.rb
index cef3d79d4..5a54a6e49 100755
--- a/spec/integration/node/facts.rb
+++ b/spec/integration/node/facts.rb
@@ -26,10 +26,10 @@ describe Puppet::Node::Facts do
             Puppet::Node::Facts.indirection.stubs(:terminus_class).returns :yaml
 
             # Load now, before we stub the exists? method.
-            Puppet::Node::Facts.indirection.terminus(:yaml)
+            terminus = Puppet::Node::Facts.indirection.terminus(:yaml)
 
-            file = File.join(Puppet[:yamldir], "facts", "me.yaml")
-            FileTest.expects(:exist?).with(file).returns false
+            terminus.expects(:path).with("me").returns "/my/yaml/file"
+            FileTest.expects(:exist?).with("/my/yaml/file").returns false
 
             Puppet::Node::Facts.find("me").should be_nil
         end