diff options
author | sersut <serdar@opscode.com> | 2014-03-12 15:23:32 -0700 |
---|---|---|
committer | sersut <serdar@opscode.com> | 2014-03-12 15:23:32 -0700 |
commit | cfaab29133cd61671092549fc90862f8ac23a9dd (patch) | |
tree | cef4cdc65e6cc604b330c0cc53d3cf2365a9438c | |
parent | b96ff0afec7bfae3a567c8f8203dc767df5c8983 (diff) | |
parent | 42e97ee5282a52c28fb72c53722f8afbcbc33bdb (diff) | |
download | chef-cfaab29133cd61671092549fc90862f8ac23a9dd.tar.gz |
Merge branch 'jtimberman/CHEF-4927' into contributions-cc-51
-rw-r--r-- | lib/chef/provider/group.rb | 2 | ||||
-rw-r--r-- | spec/unit/provider/group_spec.rb | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/chef/provider/group.rb b/lib/chef/provider/group.rb index f01677b3ac..35a16c870c 100644 --- a/lib/chef/provider/group.rb +++ b/lib/chef/provider/group.rb @@ -84,7 +84,7 @@ class Chef # <false>:: If a change is not required def compare_group @change_desc = [ ] - if @new_resource.gid != @current_resource.gid + if @new_resource.gid.to_s != @current_resource.gid.to_s @change_desc << "change gid #{@current_resource.gid} to #{@new_resource.gid}" end diff --git a/spec/unit/provider/group_spec.rb b/spec/unit/provider/group_spec.rb index 9ff9f85c7c..b138f6b210 100644 --- a/spec/unit/provider/group_spec.rb +++ b/spec/unit/provider/group_spec.rb @@ -96,6 +96,11 @@ describe Chef::Provider::User do @provider.compare_group.should be_false end + it "should coerce an integer to a string for comparison" do + @current_resource.stub!(:gid).and_return("500") + @provider.compare_group.should be_false + end + it "should return false if append is true and the group member(s) already exists" do @current_resource.members << "extra_user" @new_resource.stub(:append).and_return(true) |