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

Conflicts:

	CHANGELOG

1 files changed, 7 insertions, 1 deletions

diff --git a/spec/integration/defaults.rb b/spec/integration/defaults.rb
index b14a141fb..a07743679 100755
--- a/spec/integration/defaults.rb
+++ b/spec/integration/defaults.rb
@@ -5,8 +5,9 @@ require File.dirname(__FILE__) + '/../spec_helper'
 require 'puppet/defaults'
 
 describe "Puppet defaults" do
+    after { Puppet.settings.clear }
+
     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")
@@ -14,4 +15,9 @@ describe "Puppet defaults" do
             Puppet.settings[:factpath] = "/my/fact/path"
         end
     end
+    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
 end