Merge branch '0.24.x' of git://github.com/lak/puppet into 0.24.x

Conflicts:

	CHANGELOG

2 files changed, 23 insertions, 0 deletions

diff --git a/spec/integration/defaults.rb b/spec/integration/defaults.rb
new file mode 100755
index 000000000..b14a141fb
--- /dev/null
+++ b/spec/integration/defaults.rb
@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../spec_helper'
+
+require 'puppet/defaults'
+
+describe "Puppet defaults" do
+    describe "when setting the :factpath" do
+        after { Puppet.settings.clear }
+
+        it "should add the :factpath to Facter's search paths" do
+            Facter.expects(:search).with("/my/fact/path")
+
+            Puppet.settings[:factpath] = "/my/fact/path"
+        end
+    end
+end
diff --git a/spec/integration/node/catalog.rb b/spec/integration/node/catalog.rb
index ca14c2ea8..941d2cc6c 100755
--- a/spec/integration/node/catalog.rb
+++ b/spec/integration/node/catalog.rb
@@ -7,6 +7,12 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe Puppet::Node::Catalog do
     describe "when using the indirector" do
+        before do
+            # This is so the tests work w/out networking.
+            Facter.stubs(:to_hash).returns({"hostname" => "foo.domain.com"})
+            Facter.stubs(:value).returns("eh")
+        end
+
         after { Puppet::Node::Catalog.indirection.clear_cache }
 
         it "should be able to delegate to the :yaml terminus" do