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

Conflicts:

	CHANGELOG
	spec/unit/provider/user/ldap.rb

1 files changed, 7 insertions, 0 deletions

diff --git a/spec/unit/provider/user/ldap.rb b/spec/unit/provider/user/ldap.rb
index 5cae61a7f..7e039d582 100755
--- a/spec/unit/provider/user/ldap.rb
+++ b/spec/unit/provider/user/ldap.rb
@@ -26,6 +26,13 @@ describe provider_class do
 
     it "should be able to manage passwords" do
         provider_class.should be_manages_passwords
+    
+    it "should use the ldap group provider to convert group names to numbers" do
+        provider = provider_class.new(:name => "foo")
+        Puppet::Type.type(:group).provider(:ldap).expects(:name2id).with("bar").returns 10
+
+        provider.gid = 'bar'
+        provider.gid.should == 10
     end
 
     {:name => "uid",