chef 10.34.6 → 11.0.0.beta.0

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

@@ -265,7 +265,6 @@ describe Chef::Provider::Group::Dscl do
     it "should manage the group_name if it changed and the new resources group_name is not null" do
       @current_resource.group_name("oldval")
       @new_resource.group_name("newname")
-      @provider.should_receive(:set_members).and_return(true)
       @provider.should_receive(:safe_dscl).with("create /Groups/newname")
       @provider.should_receive(:safe_dscl).with("create /Groups/newname Password '*'")
       @provider.manage_group
@@ -293,38 +292,3 @@ describe Chef::Provider::Group::Dscl do
     end
   end
 end
-
-describe 'Test DSCL loading' 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("aj")
-    @provider = Chef::Provider::Group::Dscl.new(@new_resource, @run_context)
-    @output = <<-EOF
-AppleMetaNodeLocation: /Local/Default
-Comment:
- Test Group
-GeneratedUID: AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAAA
-NestedGroups: AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAAB
-Password: *
-PrimaryGroupID: 999
-RealName:
- TestGroup
-RecordName: com.apple.aj
-RecordType: dsRecTypeStandard:Groups
-GroupMembership: waka bar
-EOF
-    @provider.stub(:safe_dscl).with("read /Groups/aj").and_return(@output)
-    @current_resource = @provider.load_current_resource
-  end
-
-  it 'should parse gid properly' do
-    File.stub(:exists?).and_return(true)
-    @current_resource.gid.should eq("999")
-  end
-  it 'should parse members properly' do
-    File.stub(:exists?).and_return(true)
-    @current_resource.members.should eq(['waka', 'bar'])
-  end
-end

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

@@ -76,7 +76,8 @@ describe Chef::Provider::Group::Gpasswd, "modify_group_members" do
         @new_resource.members([])
       end
 
-      it "does not modify group membership" do
+      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.modify_group_members
       end
@@ -84,7 +85,7 @@ describe Chef::Provider::Group::Gpasswd, "modify_group_members" do
 
     describe "when the resource specifies group members" do
       it "should log an appropriate debug message" do
-        Chef::Log.should_receive(:debug).with("group[wheel] setting group members to: lobster, rage, fist")
+        Chef::Log.should_receive(:debug).with("group[wheel] setting group members to lobster, rage, fist")
         @provider.stub!(:shell_out!)
         @provider.modify_group_members
       end
@@ -94,20 +95,12 @@ describe Chef::Provider::Group::Gpasswd, "modify_group_members" do
         @provider.modify_group_members
       end
 
-      describe "when no user exists in the system" do
-        before do
-          current_resource = @new_resource.dup
-          current_resource.members([ ])
-          @provider.current_resource = current_resource
-        end
-
-        it "should run gpasswd individually for each user when the append option is set" do
-          @new_resource.append(true)
-          @provider.should_receive(:shell_out!).with("gpasswd -a lobster wheel")
-          @provider.should_receive(:shell_out!).with("gpasswd -a rage wheel")
-          @provider.should_receive(:shell_out!).with("gpasswd -a fist wheel")
-          @provider.modify_group_members
-        end
+      it "should run gpasswd individually for each user when the append option is set" do
+        @new_resource.append(true)
+        @provider.should_receive(:shell_out!).with("gpasswd -a lobster wheel")
+        @provider.should_receive(:shell_out!).with("gpasswd -a rage wheel")
+        @provider.should_receive(:shell_out!).with("gpasswd -a fist wheel")
+        @provider.modify_group_members
       end
 
     end

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

@@ -129,9 +129,10 @@ describe Chef::Provider::Group::Groupadd do
     end
   end
 
-  [:add_member, :remove_member, :set_members].each do |m|
-    it "should raise an error when calling #{m}" do
-      lambda { @provider.send(m, [ ]) }.should raise_error(Chef::Exceptions::Group, "you must override #{m} in #{@provider.to_s}")
+  describe "modify_group_members" do
+
+    it "should raise an error when calling modify_group_members" do
+      lambda { @provider.modify_group_members }.should raise_error(Chef::Exceptions::Group, "you must override modify_group_members in #{@provider.to_s}")
     end
   end
 

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

@@ -62,6 +62,7 @@ describe Chef::Provider::Group::Groupmod do
   
         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")
           @provider.should_receive(:shell_out!).with("group mod -n wheel_bak wheel")
           @provider.should_receive(:shell_out!).with("group add -g '123' -o wheel")
           @provider.should_receive(:shell_out!).with("group del wheel_bak")

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

@@ -49,7 +49,7 @@ describe Chef::Provider::Group::Pw do
   describe "when creating a group" do
     it "should run pw groupadd with the return of set_options and set_members_option" do
       @new_resource.gid(23)
-      @provider.should_receive(:run_command).with({ :command => "pw groupadd wheel -g '23'" }).and_return(true)
+      @provider.should_receive(:run_command).with({ :command => "pw groupadd wheel -g '23' -M root,aj" }).and_return(true)
       @provider.create_group
     end
   end
@@ -58,9 +58,7 @@ describe Chef::Provider::Group::Pw do
   
     it "should run pw groupmod with the return of set_options" do
       @new_resource.gid(42)
-      @new_resource.members(["someone"])
-      @provider.should_receive(:run_command).with({ :command => "pw groupmod wheel -g '42' -m someone" }).and_return(true)
-      @provider.should_receive(:run_command).with({ :command => "pw groupmod wheel -g '42' -d root,aj" }).and_return(true)
+      @provider.should_receive(:run_command).with({ :command => "pw groupmod wheel -g '42' -M root,aj" }).and_return(true)
       @provider.manage_group
     end
 
@@ -80,9 +78,14 @@ describe Chef::Provider::Group::Pw 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_options.should eql([ ])
+        @provider.set_members_option.should eql("")
       end
     end
 
@@ -93,12 +96,12 @@ describe Chef::Provider::Group::Pw do
       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_options
+        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_options.should eql([ " -d all,your,base" ])
+        @provider.set_members_option.should eql(" -d all,your,base")
       end
     end
   
@@ -109,12 +112,12 @@ describe Chef::Provider::Group::Pw do
       end
     
       it "should log an appropriate debug message" do
-        Chef::Log.should_receive(:debug).with("group[wheel] adding group members: all,your,base")
-        @provider.set_members_options
+        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_options.should eql([ " -m all,your,base" ])
+        @provider.set_members_option.should eql(" -M all,your,base")
       end
     end
   end

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

@@ -25,7 +25,6 @@ describe Chef::Provider::Group::Usermod do
     @run_context = Chef::RunContext.new(@node, {}, @events)
     @new_resource = Chef::Resource::Group.new("wheel")
     @new_resource.members [ "all", "your", "base" ]
-    @new_resource.excluded_members [ ]
     @provider = Chef::Provider::Group::Usermod.new(@new_resource, @run_context)
     @provider.stub!(:run_command)
   end
@@ -34,12 +33,11 @@ describe Chef::Provider::Group::Usermod do
   
     describe "with an empty members array" do
       before do
-        @new_resource.stub!(:append).and_return(true)
         @new_resource.stub!(:members).and_return([])
       end
     
       it "should log an appropriate message" do
-        @provider.should_not_receive(:shell_out!)
+        Chef::Log.should_receive(:debug).with("group[wheel] not changing group members, the group has no members")
         @provider.modify_group_members
       end
     end
@@ -63,27 +61,14 @@ describe Chef::Provider::Group::Usermod do
         @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
-
-      it "should raise an error when excluded_members are set" do
-        @provider.define_resource_requirements
-        @provider.load_current_resource
-        @provider.instance_variable_set("@group_exists", true)
-        @provider.action = :modify
-        @new_resource.stub!(:append).and_return(true)
-        @new_resource.stub!(:excluded_members).and_return(["someone"])
-        lambda { @provider.run_action(@provider.process_resource_requirements) }.should raise_error(Chef::Exceptions::Group, "excluded_members is not supported by #{@provider.to_s}")
-      end
-
+    
       platforms.each do |platform, flags|
         it "should usermod each user when the append option is set on #{platform}" do
-          current_resource = @new_resource.dup
-          current_resource.members([ ])
-          @provider.current_resource = current_resource
           @node.automatic_attrs[:platform] = platform
           @new_resource.stub!(:append).and_return(true)
-          @provider.should_receive(:shell_out!).with("usermod #{flags} wheel all")
-          @provider.should_receive(:shell_out!).with("usermod #{flags} wheel your")
-          @provider.should_receive(:shell_out!).with("usermod #{flags} wheel base")
+          @provider.should_receive(:run_command).with({:command => "usermod #{flags} wheel all"})
+          @provider.should_receive(:run_command).with({:command => "usermod #{flags} wheel your"})
+          @provider.should_receive(:run_command).with({:command => "usermod #{flags} wheel base"})
           @provider.modify_group_members
         end
       end
@@ -91,7 +76,7 @@ describe Chef::Provider::Group::Usermod do
   end
 
   describe "when loading the current resource" do
-    before (:each) do
+    before(:each) do
       File.stub!(:exists?).and_return(false)
       @provider.define_resource_requirements
     end

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

@@ -70,6 +70,14 @@ describe Chef::Provider::Group::Windows do
       @provider.manage_group
     end
 
+    it "should call @net_group.local_set_members if append fails" do
+      @new_resource.stub!(:append).and_return(true)
+      @net_group.stub!(:local_add_members).and_raise(ArgumentError)
+      @net_group.should_receive(:local_add_members).with(@new_resource.members)
+      @net_group.should_receive(:local_set_members).with(@new_resource.members + @current_resource.members)
+      @provider.manage_group
+    end
+
   end
 
   describe "remove_group" do

data/spec/unit/provider/group_spec.rb

@@ -108,19 +108,6 @@ describe Chef::Provider::User do
       @provider.compare_group.should be_true
     end
 
-    it "should return false if append is true and excluded_members include a non existing member" do
-      @new_resource.excluded_members << "extra_user"
-      @new_resource.stub!(:append).and_return(true)
-      @provider.compare_group.should be_false
-    end
-
-    it "should return true if the append is true and excluded_members include an existing user" do
-      @new_resource.members.each {|m| @new_resource.excluded_members << m }
-      @new_resource.members.clear
-      @new_resource.stub!(:append).and_return(true)
-      @provider.compare_group.should be_true
-    end
-
   end
 
   describe "when creating a group" do
@@ -130,7 +117,7 @@ describe Chef::Provider::User do
       @provider.run_action(:create)
     end
   
-    it "should set the new_resources updated flag when it creates the group" do
+    it "should set the the new_resources updated flag when it creates the group" do
       @provider.group_exists = false
       @provider.stub!(:create_group)
       @provider.run_action(:create)
@@ -140,7 +127,6 @@ describe Chef::Provider::User do
     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.stub!(:change_desc).and_return([ ])
       @provider.run_action(:create)
       @provider.new_resource.should_not be_updated
     end
@@ -148,15 +134,13 @@ describe Chef::Provider::User do
     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.stub!(:change_desc).and_return([ ])
       @provider.should_receive(:manage_group).and_return(true)
       @provider.run_action(:create)
     end
   
-    it "should set the new_resources updated flag when it creates the group if we call manage_group" do
+    it "should set the 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!(:change_desc).and_return(["Some changes are going to be done."])
       @provider.stub!(:manage_group).and_return(true)
       @provider.run_action(:create)
       @new_resource.should be_updated
@@ -188,14 +172,12 @@ describe Chef::Provider::User do
  
     it "should run manage_group if the group exists and has mismatched attributes" do
       @provider.should_receive(:compare_group).and_return(true)
-      @provider.stub!(:change_desc).and_return(["Some changes are going to be done."])
       @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!(:change_desc).and_return(["Some changes are going to be done."])
       @provider.stub!(:manage_group).and_return(true)
       @provider.run_action(:manage)
       @new_resource.should be_updated
@@ -209,7 +191,6 @@ describe Chef::Provider::User do
     
     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.stub!(:change_desc).and_return(["Some changes are going to be done."])
       @provider.should_not_receive(:manage_group)
       @provider.run_action(:manage)
     end
@@ -223,14 +204,12 @@ describe Chef::Provider::User do
  
     it "should run manage_group if the group exists and has mismatched attributes" do
       @provider.should_receive(:compare_group).and_return(true)
-      @provider.stub!(:change_desc).and_return(["Some changes are going to be done."])
       @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!(:change_desc).and_return(["Some changes are going to be done."])
       @provider.stub!(:manage_group).and_return(true)
       @provider.run_action(:modify)
       @new_resource.should be_updated
@@ -238,7 +217,6 @@ describe Chef::Provider::User do
   
     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.stub!(:change_desc).and_return(["Some changes are going to be done."])
       @provider.should_not_receive(:manage_group)
       @provider.run_action(:modify)
     end
@@ -255,26 +233,26 @@ describe Chef::Provider::User do
        @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" ]
+       @provider.change_desc.should == "add missing member(s): user1, user2"
     end
 
     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 
        @provider.compare_group.should be_true
-       @provider.change_desc.should == [ "replace group members with new list of members" ]
+       @provider.change_desc.should == "replace group members with new list of members"
     end
 
     it "should report the gid will be changed when it does not match" do
       @current_resource.stub!(:gid).and_return("BADF00D")
       @provider.compare_group.should be_true
-      @provider.change_desc.should == [ "change gid #{@current_resource.gid} to #{@new_resource.gid}" ]
+      @provider.change_desc.should == "change gid #{@current_resource.gid} to #{@new_resource.gid}"
 
     end
 
     it "should report no change reason when no change is required" do
       @provider.compare_group.should be_false
-      @provider.change_desc.should == [ ]
+      @provider.change_desc.should == nil
     end
   end
 

data/spec/unit/provider/http_request_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.
@@ -26,13 +26,13 @@ describe Chef::Provider::HttpRequest do
 
     @new_resource = Chef::Resource::HttpRequest.new('adam')
     @new_resource.name "adam"
-    @new_resource.url "http://www.opscode.com"
+    @new_resource.url "http://www.opscode.com/"
     @new_resource.message "is cool"
 
     @provider = Chef::Provider::HttpRequest.new(@new_resource, @run_context)
   end
 
-  describe "load_current_resource" do  
+  describe "load_current_resource" do
 
     it "should set up a Chef::REST client, with no authentication" do
       Chef::REST.should_receive(:new).with(@new_resource.url, nil, nil)
@@ -45,91 +45,59 @@ describe Chef::Provider::HttpRequest do
       # run_action(x) forces load_current_resource to run;
       # that would overwrite our supplied mock Chef::Rest # object
       @provider.stub!(:load_current_resource).and_return(true)
-      @rest = mock("Chef::REST", :create_url => "http://www.opscode.com", :run_request => "you made it!" )
+      @rest = mock("Chef::REST")
       @provider.rest = @rest
     end
 
-    describe "action_get" do  
-      it "should create the url with a message argument" do
-        @rest.should_receive(:create_url).with("#{@new_resource.url}?message=#{@new_resource.message}")
-        @provider.run_action(:get)
-      end
+    describe "action_get" do
 
       it "should inflate a message block at runtime" do
-        @new_resource.stub!(:message).and_return(lambda { "return" })
-        @rest.should_receive(:create_url).with("#{@new_resource.url}?message=return")
+        @new_resource.message { "return" }
+        @rest.should_receive(:get).with("http://www.opscode.com/?message=return", false, {})
         @provider.run_action(:get)
+        @new_resource.should be_updated
       end
 
       it "should run a GET request" do
-        @rest.should_receive(:run_request).with(:GET, @rest.create_url, {}, false, 10, false)
-        @provider.run_action(:get)
-      end
-
-      it "should update the resource" do
+        @rest.should_receive(:get).with("http://www.opscode.com/?message=is cool", false, {})
         @provider.run_action(:get)
         @new_resource.should be_updated
       end
     end
 
-    describe "action_put" do  
-      it "should create the url" do
-        @rest.should_receive(:create_url).with("#{@new_resource.url}")
-        @provider.run_action(:put)
-      end
-
+    describe "action_put" do
       it "should run a PUT request with the message as the payload" do
-        @rest.should_receive(:run_request).with(:PUT, @rest.create_url, {}, @new_resource.message, 10, false)
+        @rest.should_receive(:put).with("http://www.opscode.com/", @new_resource.message, {})
         @provider.run_action(:put)
+        @new_resource.should be_updated
       end
 
       it "should inflate a message block at runtime" do
         @new_resource.stub!(:message).and_return(lambda { "return" })
-        @rest.should_receive(:run_request).with(:PUT, @rest.create_url, {}, "return", 10, false)    
-        @provider.run_action(:put)
-      end
-
-      it "should update the resource" do
+        @rest.should_receive(:put).with("http://www.opscode.com/", "return", {})
         @provider.run_action(:put)
         @new_resource.should be_updated
       end
     end
 
-    describe "action_post" do  
-      it "should create the url" do
-        @rest.should_receive(:create_url).with("#{@new_resource.url}")
-        @provider.run_action(:post)
-      end
-  
+    describe "action_post" do
       it "should run a PUT request with the message as the payload" do
-        @rest.should_receive(:run_request).with(:POST, @rest.create_url, {}, @new_resource.message, 10, false)
+        @rest.should_receive(:post).with("http://www.opscode.com/", @new_resource.message, {})
         @provider.run_action(:post)
+        @new_resource.should be_updated
       end
-  
+
       it "should inflate a message block at runtime" do
-        @new_resource.stub!(:message).and_return(lambda { "return" })
-        @rest.should_receive(:run_request).with(:POST, @rest.create_url, {}, "return", 10, false)    
-        @provider.run_action(:post)
-      end
-  
-      it "should update the resource" do
+        @new_resource.message { "return" }
+        @rest.should_receive(:post).with("http://www.opscode.com/", "return", {})
         @provider.run_action(:post)
         @new_resource.should be_updated
       end
     end
 
-    describe "action_delete" do  
-      it "should create the url" do
-        @rest.should_receive(:create_url).with("#{@new_resource.url}")
-        @provider.run_action(:delete)
-      end
-
+    describe "action_delete" do
       it "should run a DELETE request" do
-        @rest.should_receive(:run_request).with(:DELETE, @rest.create_url, {}, false, 10, false)
-        @provider.run_action(:delete)
-      end
-
-      it "should update the resource" do
+        @rest.should_receive(:delete).with("http://www.opscode.com/", {})
         @provider.run_action(:delete)
         @new_resource.should be_updated
       end
@@ -137,39 +105,30 @@ describe Chef::Provider::HttpRequest do
 
     describe "action_head" do
       before do
-        @rest = mock("Chef::REST", :create_url => "http://www.opscode.com", :run_request => true)
         @provider.rest = @rest
       end
 
-      it "should create the url with a message argument" do
-        @rest.should_receive(:create_url).with("#{@new_resource.url}?message=#{@new_resource.message}")
-        @provider.run_action(:head)
-      end
-
       it "should inflate a message block at runtime" do
-        @new_resource.stub!(:message).and_return(lambda { "return" })
-        @rest.should_receive(:create_url).with("#{@new_resource.url}?message=return")
+        @new_resource.message { "return" }
+        @rest.should_receive(:head).with("http://www.opscode.com/?message=return", {}).and_return("")
         @provider.run_action(:head)
+        @new_resource.should be_updated
       end
 
       it "should run a HEAD request" do
-        @rest.should_receive(:run_request).with(:HEAD, @rest.create_url, {}, false, 10, false)
-        @provider.run_action(:head)
-      end
-
-      it "should update the resource" do
+        @rest.should_receive(:head).with("http://www.opscode.com/?message=is cool", {}).and_return("")
         @provider.run_action(:head)
         @new_resource.should be_updated
       end
 
       it "should run a HEAD request with If-Modified-Since header" do
         @new_resource.headers "If-Modified-Since" => File.mtime(__FILE__).httpdate
-        @rest.should_receive(:run_request).with(:HEAD, @rest.create_url, @new_resource.headers, false, 10, false)
+        @rest.should_receive(:head).with("http://www.opscode.com/?message=is cool", @new_resource.headers)
         @provider.run_action(:head)
       end
 
       it "doesn't call converge_by if HEAD does not return modified" do
-        @rest.should_receive(:run_request).and_return(false)
+        @rest.should_receive(:head).and_return(false)
         @provider.should_not_receive(:converge_by)
         @provider.run_action(:head)
       end