Renaming the 'Puppet::Util::Config' class to

'Puppet::Util::Settings'.  This is to clear up
confusion caused by the fact that we now have a
'Configuration' class to model host configurations,
or any set of resources as a "configuration".

3 files changed, 6 insertions, 6 deletions

diff --git a/spec/unit/node/configuration.rb b/spec/unit/node/configuration.rb
index b37cc754d..8ba55f50c 100755
--- a/spec/unit/node/configuration.rb
+++ b/spec/unit/node/configuration.rb
@@ -305,7 +305,7 @@ describe Puppet::Node::Configuration, " when applying host configurations" do
         @config.apply
     end
 
-    after { Puppet.config.clear }
+    after { Puppet.settings.clear }
 end
 
 describe Puppet::Node::Configuration, " when applying non-host configurations" do
@@ -328,7 +328,7 @@ describe Puppet::Node::Configuration, " when applying non-host configurations" d
         @config.apply
     end
 
-    after { Puppet.config.clear }
+    after { Puppet.settings.clear }
 end
 
 describe Puppet::Node::Configuration, " when creating a relationship graph" do
@@ -467,6 +467,6 @@ describe Puppet::Node::Configuration, " when writing dot files" do
     end
 
     after do
-        Puppet.config.clear
+        Puppet.settings.clear
     end
 end
diff --git a/spec/unit/node/node.rb b/spec/unit/node/node.rb
index 53f362da6..3146f6e7e 100755
--- a/spec/unit/node/node.rb
+++ b/spec/unit/node/node.rb
@@ -66,7 +66,7 @@ describe Puppet::Node, " when returning the environment" do
     end
 
     it "should return the central environment if there is no environment fact nor explicit environment" do
-        Puppet.config.expects(:[]).with(:environment).returns(:centralenv)
+        Puppet.settings.expects(:[]).with(:environment).returns(:centralenv)
         @node.environment.should == :centralenv
     end
 
@@ -81,7 +81,7 @@ describe Puppet::Node, " when returning the environment" do
     end
 
     it "should not use an explicit environment that is an empty string" do
-        Puppet.config.expects(:[]).with(:environment).returns(nil)
+        Puppet.settings.expects(:[]).with(:environment).returns(nil)
         @node.environment.should be_nil
     end
 end
diff --git a/spec/unit/node/searching.rb b/spec/unit/node/searching.rb
index b7105050a..e747996e4 100755
--- a/spec/unit/node/searching.rb
+++ b/spec/unit/node/searching.rb
@@ -74,6 +74,6 @@ describe Puppet::Node::Searching, " when searching for nodes" do
     end
 
     after do
-        Puppet.config.clear
+        Puppet.settings.clear
     end
 end