Merge branch '0.24.x' into merging

Conflicts:

	test/ral/type/filesources.rb

4 files changed, 20 insertions, 3 deletions

diff --git a/spec/integration/defaults.rb b/spec/integration/defaults.rb
index eba58a3d5..fcf8ccf22 100755
--- a/spec/integration/defaults.rb
+++ b/spec/integration/defaults.rb
@@ -47,4 +47,8 @@ describe "Puppet defaults" do
         Puppet.settings.element(:rundir).owner.should be_nil
         Puppet.settings.element(:rundir).group.should be_nil
     end
+
+    it "should default to yaml as the catalog format" do
+        Puppet.settings[:catalog_format].should == "yaml"
+    end
 end
diff --git a/spec/integration/file_serving/metadata.rb b/spec/integration/file_serving/metadata.rb
index 5600365f1..067cb566a 100755
--- a/spec/integration/file_serving/metadata.rb
+++ b/spec/integration/file_serving/metadata.rb
@@ -16,4 +16,3 @@ describe Puppet::FileServing::Metadata, " when finding files" do
         @indirection = Puppet::FileServing::Metadata.indirection
     end
 end
-
diff --git a/spec/integration/indirector/module_files.rb b/spec/integration/indirector/module_files.rb
index 1831bffbc..ae14aa5a7 100755
--- a/spec/integration/indirector/module_files.rb
+++ b/spec/integration/indirector/module_files.rb
@@ -20,7 +20,9 @@ describe Puppet::Indirector::ModuleFiles, " when interacting with Puppet::Module
 
         FileTest.expects(:exists?).with(filepath).returns(true)
 
-        @terminus.find("puppetmounts://host/modules/mymod/myfile").should be_instance_of(Puppet::FileServing::Content)
+        @request = Puppet::Indirector::Request.new(:content, :find, "puppetmounts://host/modules/mymod/myfile")
+
+        @terminus.find(@request).should be_instance_of(Puppet::FileServing::Content)
     end
 end
 
@@ -45,7 +47,9 @@ describe Puppet::Indirector::ModuleFiles, " when interacting with FileServing::F
 
         Dir.expects(:entries).with(filepath).returns(%w{one two})
 
-        result = @terminus.search("puppetmounts://host/modules/mymod/myfile", :recurse => true)
+        @request = Puppet::Indirector::Request.new(:content, :search, "puppetmounts://host/modules/mymod/myfile", :recurse => true)
+
+        result = @terminus.search(@request)
         result.should be_instance_of(Array)
         result.length.should == 3
         result.each { |r| r.should be_instance_of(Puppet::FileServing::Content) }
diff --git a/spec/integration/node/catalog.rb b/spec/integration/node/catalog.rb
index 87d62ea6a..75be9501a 100755
--- a/spec/integration/node/catalog.rb
+++ b/spec/integration/node/catalog.rb
@@ -40,5 +40,15 @@ describe Puppet::Node::Catalog do
 
             Puppet::Node::Catalog.find("me").should be_nil
         end
+
+        it "should pass provided node information directly to the terminus" do
+            terminus = mock 'terminus'
+
+            Puppet::Node::Catalog.indirection.stubs(:terminus).returns terminus
+
+            node = mock 'node'
+            terminus.expects(:find).with { |request| request.options[:use_node] == node }
+            Puppet::Node::Catalog.find("me", :use_node => node)
+        end
     end
 end