Merge branch '0.24.x'

Conflicts:

	CHANGELOG
	lib/puppet/defaults.rb
	spec/integration/defaults.rb

1 files changed, 8 insertions, 2 deletions

diff --git a/spec/integration/defaults.rb b/spec/integration/defaults.rb
index b6f6bf109..9d8ea30f7 100755
--- a/spec/integration/defaults.rb
+++ b/spec/integration/defaults.rb
@@ -6,7 +6,8 @@ require 'puppet/defaults'
 
 describe "Puppet defaults" do
     after { Puppet.settings.clear }
-    describe "when configuring the :crl" do
+
+    describe "when setting the :factpath" do
         it "should add the :factpath to Facter's search paths" do
             Facter.expects(:search).with("/my/fact/path")
 
@@ -14,8 +15,13 @@ describe "Puppet defaults" do
         end
     end
 
-    describe "when setting the :factpath" do
+    describe "when setting the :certname" do
+        it "should fail if the certname is not downcased" do
+            lambda { Puppet.settings[:certname] = "Host.Domain.Com" }.should raise_error(ArgumentError)
+        end
+    end
 
+    describe "when configuring the :crl" do
         it "should warn if :cacrl is set to false" do
             Puppet.expects(:warning)
             Puppet.settings[:cacrl] = 'false'