Removing unnecessary parser variables when yaml-dumping

Also working around a YAML bug in Ruby.

And fixing tests that were broken in a previous commit
in this rebase but not caught earlier.

Signed-off-by: Luke Kanies <luke@madstop.com>

3 files changed, 13 insertions, 11 deletions

diff --git a/spec/unit/indirector/catalog/active_record.rb b/spec/unit/indirector/catalog/active_record.rb
index 948b811d3..cf7484110 100755
--- a/spec/unit/indirector/catalog/active_record.rb
+++ b/spec/unit/indirector/catalog/active_record.rb
@@ -4,20 +4,21 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 
 require 'puppet/indirector/catalog/active_record'
 
-describe Puppet::Node::Catalog::ActiveRecord do
+describe Puppet::Resource::Catalog::ActiveRecord do
     confine "Missing Rails" => Puppet.features.rails?
 
     before do
         Puppet.features.stubs(:rails?).returns true
-        @terminus = Puppet::Node::Catalog::ActiveRecord.new
+        Puppet::Rails.stubs(:init)
+        @terminus = Puppet::Resource::Catalog::ActiveRecord.new
     end
 
     it "should be a subclass of the ActiveRecord terminus class" do
-        Puppet::Node::Catalog::ActiveRecord.ancestors.should be_include(Puppet::Indirector::ActiveRecord)
+        Puppet::Resource::Catalog::ActiveRecord.ancestors.should be_include(Puppet::Indirector::ActiveRecord)
     end
 
     it "should use Puppet::Rails::Host as its ActiveRecord model" do
-        Puppet::Node::Catalog::ActiveRecord.ar_model.should equal(Puppet::Rails::Host)
+        Puppet::Resource::Catalog::ActiveRecord.ar_model.should equal(Puppet::Rails::Host)
     end
 
     describe "when finding an instance" do
@@ -50,7 +51,7 @@ describe Puppet::Node::Catalog::ActiveRecord do
             Puppet::Rails::Host.expects(:find_by_name).returns host
 
             result = @terminus.find(@request)
-            result.should be_instance_of(Puppet::Node::Catalog)
+            result.should be_instance_of(Puppet::Resource::Catalog)
             result.name.should == "foo"
         end
         
@@ -64,7 +65,7 @@ describe Puppet::Node::Catalog::ActiveRecord do
             host.expects(:resources).returns [res1, res2]
 
             catalog = stub 'catalog'
-            Puppet::Node::Catalog.expects(:new).returns catalog
+            Puppet::Resource::Catalog.expects(:new).returns catalog
 
             catalog.expects(:add_resource).with "trans_res1"
             catalog.expects(:add_resource).with "trans_res2"
@@ -77,7 +78,7 @@ describe Puppet::Node::Catalog::ActiveRecord do
         before do
             @host = stub 'host', :name => "foo", :save => nil, :merge_resources => nil, :last_compile= => nil
             Puppet::Rails::Host.stubs(:find_by_name).returns @host
-            @catalog = Puppet::Node::Catalog.new("foo")
+            @catalog = Puppet::Resource::Catalog.new("foo")
             @request = stub 'request', :key => "foo", :instance => @catalog
         end
 
diff --git a/spec/unit/indirector/catalog/queue.rb b/spec/unit/indirector/catalog/queue.rb
index e47af3126..66a30c0d6 100755
--- a/spec/unit/indirector/catalog/queue.rb
+++ b/spec/unit/indirector/catalog/queue.rb
@@ -4,17 +4,17 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 
 require 'puppet/indirector/catalog/queue'
 
-describe Puppet::Node::Catalog::Queue do
+describe Puppet::Resource::Catalog::Queue do
     it 'should be a subclass of the Queue terminus' do
-        Puppet::Node::Catalog::Queue.superclass.should equal(Puppet::Indirector::Queue)
+        Puppet::Resource::Catalog::Queue.superclass.should equal(Puppet::Indirector::Queue)
     end
 
     it 'should be registered with the catalog store indirection' do
         indirection = Puppet::Indirector::Indirection.instance(:catalog)
-        Puppet::Node::Catalog::Queue.indirection.should equal(indirection)
+        Puppet::Resource::Catalog::Queue.indirection.should equal(indirection)
     end
 
     it 'shall be dubbed ":queue"' do
-        Puppet::Node::Catalog::Queue.name.should == :queue
+        Puppet::Resource::Catalog::Queue.name.should == :queue
     end
 end
diff --git a/spec/unit/indirector/facts/active_record.rb b/spec/unit/indirector/facts/active_record.rb
index fc35f1a45..37a8f9d6b 100755
--- a/spec/unit/indirector/facts/active_record.rb
+++ b/spec/unit/indirector/facts/active_record.rb
@@ -10,6 +10,7 @@ describe Puppet::Node::Facts::ActiveRecord do
 
     before do
         Puppet.features.stubs(:rails?).returns true
+        Puppet::Rails.stubs(:init)
         @terminus = Puppet::Node::Facts::ActiveRecord.new
     end