chef 11.6.2-x86-mingw32 → 11.8.0.rc.1-x86-mingw32

data/spec/unit/provider/group/groupmod_spec.rb

@@ -29,7 +29,7 @@ describe Chef::Provider::Group::Groupmod do
       @new_resource.append false
       @provider = Chef::Provider::Group::Groupmod.new(@new_resource, @run_context)
     end
-  
+
   describe "manage_group" do
     describe "when determining the current group state" do
       it "should raise an error if the required binary /usr/sbin/group doesn't exist" do
@@ -41,25 +41,25 @@ describe Chef::Provider::Group::Groupmod do
         File.should_receive(:exists?).with("/usr/sbin/user").and_return(false)
         lambda { @provider.load_current_resource }.should raise_error(Chef::Exceptions::Group)
       end
-  
+
       it "shouldn't raise an error if the required binaries exist" do
         File.stub!(:exists?).and_return(true)
         lambda { @provider.load_current_resource }.should_not raise_error(Chef::Exceptions::Group)
       end
     end
-  
+
     describe "after the group's current state is known" do
       before do
         @current_resource = @new_resource.dup
         @provider.current_resource = @current_resource
       end
-  
+
       describe "when no group members are specified and append is not set" do
         before do
           @new_resource.append(false)
           @new_resource.members([])
         end
-  
+
         it "logs a message and sets group's members to 'none', then removes existing group members" do
           Chef::Log.should_receive(:debug).with("group[wheel] setting group members to: none")
           Chef::Log.should_receive(:debug).with("group[wheel] removing members lobster, rage, fist")
@@ -69,26 +69,26 @@ describe Chef::Provider::Group::Groupmod do
           @provider.manage_group
         end
       end
-  
+
       describe "when no group members are specified and append is set" do
         before do
           @new_resource.append(true)
           @new_resource.members([])
         end
-   
+
         it "logs a message and does not modify group membership" do
           Chef::Log.should_receive(:debug).with("group[wheel] not changing group members, the group has no members to add")
           @provider.should_not_receive(:shell_out!)
           @provider.manage_group
         end
       end
-  
+
       describe "when removing some group members" do
         before do
           @new_resource.append(false)
           @new_resource.members(%w{ lobster })
         end
-  
+
         it "updates group membership correctly" do
           Chef::Log.stub!(:debug)
           @provider.should_receive(:shell_out!).with("group mod -n wheel_bak wheel")
@@ -100,14 +100,14 @@ describe Chef::Provider::Group::Groupmod do
       end
     end
   end
-  
+
   describe "create_group" do
     describe "when creating a new group" do
       before do
         @current_resource = Chef::Resource::Group.new("wheel")
         @provider.current_resource = @current_resource
       end
-  
+
       it "should run a group add command and some user mod commands" do
         @provider.should_receive(:shell_out!).with("group add -g '123' wheel")
         @provider.should_receive(:shell_out!).with("user mod -G wheel lobster")
@@ -117,14 +117,14 @@ describe Chef::Provider::Group::Groupmod do
       end
     end
   end
-  
+
   describe "remove_group" do
     describe "when removing an existing group" do
       before do
         @current_resource = @new_resource.dup
         @provider.current_resource = @current_resource
       end
-  
+
       it "should run a group del command" do
         @provider.should_receive(:shell_out!).with("group del wheel")
         @provider.remove_group

data/spec/unit/provider/group/pw_spec.rb

@@ -6,9 +6,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,7 +23,7 @@ describe Chef::Provider::Group::Pw do
     @node = Chef::Node.new
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)
-    
+
     @new_resource = Chef::Resource::Group.new("wheel")
     @new_resource.gid 50
     @new_resource.members [ "root", "aj"]
@@ -34,12 +34,12 @@ describe Chef::Provider::Group::Pw do
     @provider = Chef::Provider::Group::Pw.new(@new_resource, @run_context)
     @provider.current_resource = @current_resource
   end
-  
+
   describe "when setting options for the pw command" do
     it "does not set the gid option if gids match or are unmanaged" do
       @provider.set_options.should ==  " wheel"
     end
-    
+
     it "sets the option for gid if it is not nil" do
       @new_resource.gid(42)
       @provider.set_options.should eql(" wheel -g '42'")
@@ -55,7 +55,7 @@ describe Chef::Provider::Group::Pw do
   end
 
   describe "when managing the group" do
-  
+
     it "should run pw groupmod with the return of set_options" do
       @new_resource.gid(42)
       @provider.should_receive(:run_command).with({ :command => "pw groupmod wheel -g '42' -M root,aj" }).and_return(true)
@@ -72,18 +72,18 @@ describe Chef::Provider::Group::Pw do
   end
 
   describe "when setting group membership" do
-  
+
     describe "with an empty members array in both the new and current resource" do
       before do
         @new_resource.stub!(:members).and_return([])
         @current_resource.stub!(:members).and_return([])
       end
-    
+
       it "should log an appropriate message" do
         Chef::Log.should_receive(:debug).with("group[wheel] not changing group members, the group has no members")
         @provider.set_members_option
       end
-    
+
       it "should set no options" do
         @provider.set_members_option.should eql("")
       end
@@ -94,28 +94,28 @@ describe Chef::Provider::Group::Pw do
         @new_resource.stub!(:members).and_return([])
         @current_resource.stub!(:members).and_return(["all", "your", "base"])
       end
-    
+
       it "should log an appropriate message" do
         Chef::Log.should_receive(:debug).with("group[wheel] removing group members all, your, base")
         @provider.set_members_option
       end
-    
+
       it "should set the -d option with the members joined by ','" do
         @provider.set_members_option.should eql(" -d all,your,base")
       end
     end
-  
+
     describe "with supplied members array in the new resource and an empty members array in the current resource" do
       before do
         @new_resource.stub!(:members).and_return(["all", "your", "base"])
         @current_resource.stub!(:members).and_return([])
       end
-    
+
       it "should log an appropriate debug message" do
         Chef::Log.should_receive(:debug).with("group[wheel] setting group members to all, your, base")
         @provider.set_members_option
       end
-    
+
       it "should set the -M option with the members joined by ','" do
         @provider.set_members_option.should eql(" -M all,your,base")
       end
@@ -123,7 +123,7 @@ describe Chef::Provider::Group::Pw do
   end
 
   describe"load_current_resource" do
-    before (:each) do 
+    before (:each) do
       @provider.load_current_resource
       @provider.define_resource_requirements
     end
@@ -131,7 +131,7 @@ describe Chef::Provider::Group::Pw do
       File.should_receive(:exists?).with("/usr/sbin/pw").and_return(false)
       lambda { @provider.process_resource_requirements }.should raise_error(Chef::Exceptions::Group)
     end
-  
+
     it "shouldn't raise an error if /usr/sbin/pw exists" do
       File.stub!(:exists?).and_return(true)
       lambda { @provider.process_resource_requirements }.should_not raise_error(Chef::Exceptions::Group)

data/spec/unit/provider/group/usermod_spec.rb

@@ -6,9 +6,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -28,26 +28,27 @@ describe Chef::Provider::Group::Usermod do
     @provider = Chef::Provider::Group::Usermod.new(@new_resource, @run_context)
     @provider.stub!(:run_command)
   end
-  
+
   describe "modify_group_members" do
-  
+
     describe "with an empty members array" do
       before do
         @new_resource.stub!(:members).and_return([])
       end
-    
+
       it "should log an appropriate message" do
         Chef::Log.should_receive(:debug).with("group[wheel] not changing group members, the group has no members")
         @provider.modify_group_members
       end
     end
-  
+
     describe "with supplied members" do
       platforms = {
         "openbsd" => "-G",
         "netbsd" => "-G",
         "solaris" => "-a -G",
         "suse" => "-a -G",
+        "opensuse" => "-a -G",
         "smartos" => "-G"
       }
 
@@ -60,10 +61,10 @@ describe Chef::Provider::Group::Usermod do
         @provider.define_resource_requirements
         @provider.load_current_resource
         @provider.instance_variable_set("@group_exists", true)
-        @provider.action = :modify 
+        @provider.action = :modify
         lambda { @provider.run_action(@provider.process_resource_requirements) }.should raise_error(Chef::Exceptions::Group, "setting group members directly is not supported by #{@provider.to_s}, must set append true in group")
       end
-    
+
       platforms.each do |platform, flags|
         it "should usermod each user when the append option is set on #{platform}" do
           @node.automatic_attrs[:platform] = platform
@@ -88,7 +89,7 @@ describe Chef::Provider::Group::Usermod do
       File.should_receive(:exists?).with("/usr/sbin/usermod").and_return(false)
       lambda { @provider.process_resource_requirements }.should raise_error(Chef::Exceptions::Group)
     end
-  
+
     it "shouldn't raise an error if the required binaries exist" do
       File.stub!(:exists?).and_return(true)
       lambda { @provider.process_resource_requirements }.should_not raise_error(Chef::Exceptions::Group)

data/spec/unit/provider/group/windows_spec.rb

@@ -92,3 +92,17 @@ describe Chef::Provider::Group::Windows do
     end
   end
 end
+
+describe Chef::Provider::Group::Windows, "NetGroup" do
+  before do
+    @node = Chef::Node.new
+    @events = Chef::EventDispatch::Dispatcher.new
+    @run_context = Chef::RunContext.new(@node, {}, @events)
+    @new_resource = Chef::Resource::Group.new("Creating a new group")
+    @new_resource.group_name "Remote Desktop Users"
+  end
+  it 'sets group_name correctly' do
+    Chef::Util::Windows::NetGroup.should_receive(:new).with("Remote Desktop Users")
+    Chef::Provider::Group::Windows.new(@new_resource, @run_context)
+  end
+end

data/spec/unit/provider/group_spec.rb

@@ -6,9 +6,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -33,7 +33,7 @@ describe Chef::Provider::User do
     @current_resource = Chef::Resource::Group.new("aj", @run_context)
     @current_resource.gid 500
     @current_resource.members "aj"
-    
+
     @provider.current_resource = @current_resource
 
     @pw_group = mock("Struct::Group",
@@ -43,13 +43,13 @@ describe Chef::Provider::User do
       )
     Etc.stub!(:getgrnam).with('wheel').and_return(@pw_group)
   end
-  
+
   it "assumes the group exists by default" do
     @provider.group_exists.should be_true
   end
 
   describe "when establishing the current state of the group" do
-  
+
     it "sets the group name of the current resource to the group name of the new resource" do
       @provider.load_current_resource
       @provider.current_resource.group_name.should == 'wheel'
@@ -65,22 +65,22 @@ describe Chef::Provider::User do
       @provider.load_current_resource
       @new_resource.gid.should == 20
     end
-  
+
     it "looks up the group in /etc/group with getgrnam" do
       Etc.should_receive(:getgrnam).with(@new_resource.group_name).and_return(@pw_group)
       @provider.load_current_resource
       @provider.current_resource.gid.should == 20
       @provider.current_resource.members.should == %w{root aj}
     end
-  
+
     it "should flip the value of exists if it cannot be found in /etc/group" do
       Etc.stub!(:getgrnam).and_raise(ArgumentError)
       @provider.load_current_resource
       @provider.group_exists.should be_false
     end
-  
+
     it "should return the current resource" do
-      @provider.load_current_resource.should equal(@provider.current_resource)    
+      @provider.load_current_resource.should equal(@provider.current_resource)
     end
   end
 
@@ -91,7 +91,7 @@ describe Chef::Provider::User do
         @provider.compare_group.should be_true
       end
     end
-  
+
     it "should return false if gid and members are equal" do
       @provider.compare_group.should be_false
     end
@@ -116,29 +116,29 @@ describe Chef::Provider::User do
       @provider.should_receive(:create_group).and_return(true)
       @provider.run_action(:create)
     end
-  
-    it "should set the the new_resources updated flag when it creates the group" do
+
+    it "should set the new_resources updated flag when it creates the group" do
       @provider.group_exists = false
       @provider.stub!(:create_group)
       @provider.run_action(:create)
       @provider.new_resource.should be_updated
     end
-  
+
     it "should check to see if the group has mismatched attributes if the group exists" do
       @provider.group_exists = true
       @provider.stub!(:compare_group).and_return(false)
       @provider.run_action(:create)
       @provider.new_resource.should_not be_updated
     end
-  
+
     it "should call manage_group if the group exists and has mismatched attributes" do
       @provider.group_exists = true
       @provider.stub!(:compare_group).and_return(true)
       @provider.should_receive(:manage_group).and_return(true)
       @provider.run_action(:create)
     end
-  
-    it "should set the the new_resources updated flag when it creates the group if we call manage_group" do
+
+    it "should set the new_resources updated flag when it creates the group if we call manage_group" do
       @provider.group_exists = true
       @provider.stub!(:compare_group).and_return(true)
       @provider.stub!(:manage_group).and_return(true)
@@ -148,14 +148,14 @@ describe Chef::Provider::User do
   end
 
   describe "when removing a group" do
-  
+
     it "should not call remove_group if the group does not exist" do
       @provider.group_exists = false
-      @provider.should_not_receive(:remove_group) 
+      @provider.should_not_receive(:remove_group)
       @provider.run_action(:remove)
       @provider.new_resource.should_not be_updated
     end
-  
+
     it "should call remove_group if the group exists" do
       @provider.group_exists = true
       @provider.should_receive(:remove_group)
@@ -169,26 +169,26 @@ describe Chef::Provider::User do
       @provider.group_exists = true
       @provider.stub!(:manage_group).and_return(true)
     end
- 
+
     it "should run manage_group if the group exists and has mismatched attributes" do
       @provider.should_receive(:compare_group).and_return(true)
       @provider.should_receive(:manage_group).and_return(true)
       @provider.run_action(:manage)
     end
-  
+
     it "should set the new resources updated flag to true if manage_group is called" do
       @provider.stub!(:compare_group).and_return(true)
       @provider.stub!(:manage_group).and_return(true)
       @provider.run_action(:manage)
       @new_resource.should be_updated
     end
-  
+
     it "should not run manage_group if the group does not exist" do
       @provider.group_exists = false
       @provider.should_not_receive(:manage_group)
       @provider.run_action(:manage)
     end
-    
+
     it "should not run manage_group if the group exists but has no differing attributes" do
       @provider.should_receive(:compare_group).and_return(false)
       @provider.should_not_receive(:manage_group)
@@ -201,26 +201,26 @@ describe Chef::Provider::User do
       @provider.group_exists = true
       @provider.stub!(:manage_group).and_return(true)
     end
- 
+
     it "should run manage_group if the group exists and has mismatched attributes" do
       @provider.should_receive(:compare_group).and_return(true)
       @provider.should_receive(:manage_group).and_return(true)
       @provider.run_action(:modify)
     end
-  
+
     it "should set the new resources updated flag to true if manage_group is called" do
       @provider.stub!(:compare_group).and_return(true)
       @provider.stub!(:manage_group).and_return(true)
       @provider.run_action(:modify)
       @new_resource.should be_updated
     end
-  
+
     it "should not run manage_group if the group exists but has no differing attributes" do
       @provider.should_receive(:compare_group).and_return(false)
       @provider.should_not_receive(:manage_group)
       @provider.run_action(:modify)
     end
-  
+
     it "should raise a Chef::Exceptions::Group if the group doesn't exist" do
       @provider.group_exists = false
       lambda { @provider.run_action(:modify) }.should raise_error(Chef::Exceptions::Group)
@@ -230,7 +230,7 @@ describe Chef::Provider::User do
   describe "when determining the reason for a change" do
     it "should report which group members are missing if members are missing and appending to the group" do
        @new_resource.members << "user1"
-       @new_resource.members << "user2" 
+       @new_resource.members << "user2"
        @new_resource.stub!(:append).and_return true
        @provider.compare_group.should be_true
        @provider.change_desc.should == "add missing member(s): user1, user2"
@@ -238,7 +238,7 @@ describe Chef::Provider::User do
 
     it "should report that the group members will be overwritten if not appending" do
        @new_resource.members << "user1"
-       @new_resource.stub!(:append).and_return false 
+       @new_resource.stub!(:append).and_return false
        @provider.compare_group.should be_true
        @provider.change_desc.should == "replace group members with new list of members"
     end