From d79945796ebdfb2d4a387217f30df36ad7a67da0 Mon Sep 17 00:00:00 2001 From: Phil Dibowitz Date: Thu, 12 Nov 2020 19:28:33 -0800 Subject: Fix tests; improve output Signed-off-by: Phil Dibowitz --- lib/chef/provider/group.rb | 4 ++-- spec/unit/provider/group/windows_spec.rb | 6 ++++++ spec/unit/provider/group_spec.rb | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/chef/provider/group.rb b/lib/chef/provider/group.rb index 2615d1eb5b..4676158acf 100644 --- a/lib/chef/provider/group.rb +++ b/lib/chef/provider/group.rb @@ -104,7 +104,7 @@ class Chef @change_desc << "remove existing member(s): #{members_to_be_removed.join(", ")}" end elsif !group_members_match? - @change_desc << "replace group members with new list of members: #{new_resource.members}" + @change_desc << "replace group members with new list of members: #{new_resource.members.join(', ')}" end !@change_desc.empty? @@ -115,7 +115,7 @@ class Chef end def group_members_match? - new_resource.members.sort == current_resource.members.sort + [new_resource.members].flatten.sort == [current_resource.members].flatten.sort end def has_current_group_member?(member) diff --git a/spec/unit/provider/group/windows_spec.rb b/spec/unit/provider/group/windows_spec.rb index 61853c90bd..85b88000a8 100644 --- a/spec/unit/provider/group/windows_spec.rb +++ b/spec/unit/provider/group/windows_spec.rb @@ -39,6 +39,12 @@ describe Chef::Provider::Group::Windows do end describe "when creating the group" do + before do + @current_resource = Chef::Resource::Group.new("staff") + @current_resource.members %w{all your base} + @provider.current_resource = @current_resource + end + it "should call @net_group.local_add" do expect(@net_group).to receive(:local_set_members).with([]) expect(@net_group).to receive(:local_add) diff --git a/spec/unit/provider/group_spec.rb b/spec/unit/provider/group_spec.rb index 76fde1e141..a3701c1f45 100644 --- a/spec/unit/provider/group_spec.rb +++ b/spec/unit/provider/group_spec.rb @@ -266,7 +266,7 @@ describe Chef::Provider::User do @new_resource.members << "user1" allow(@new_resource).to receive(:append).and_return false expect(@provider.compare_group).to be_truthy - expect(@provider.change_desc).to eq([ "replace group members with new list of members" ]) + expect(@provider.change_desc).to eq([ "replace group members with new list of members: aj, user1" ]) end it "should report the gid will be changed when it does not match" do -- cgit v1.2.1