chef 11.8.4.ohai7.0 → 11.10.0.alpha.1

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

@@ -76,8 +76,7 @@ describe Chef::Provider::Group::Gpasswd, "modify_group_members" do
         @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")
+      it "does not modify group membership" do
         @provider.should_not_receive(:shell_out!)
         @provider.modify_group_members
       end
@@ -85,7 +84,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
@@ -95,12 +94,20 @@ describe Chef::Provider::Group::Gpasswd, "modify_group_members" do
         @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
+      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
       end
 
     end

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

@@ -143,10 +143,9 @@ describe Chef::Provider::Group::Groupadd do
     end
   end
 
-  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}")
+  [: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}")
     end
   end
 

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

@@ -62,7 +62,6 @@ 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' -M root,aj" }).and_return(true)
+      @provider.should_receive(:run_command).with({ :command => "pw groupadd wheel -g '23'" }).and_return(true)
       @provider.create_group
     end
   end
@@ -58,7 +58,9 @@ describe Chef::Provider::Group::Pw 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)
+      @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.manage_group
     end
 
@@ -79,13 +81,8 @@ describe Chef::Provider::Group::Pw do
         @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("")
+        @provider.set_members_options.should eql([ ])
       end
     end
 
@@ -96,12 +93,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_option
+        Chef::Log.should_receive(:debug).with("group[wheel] removing group members: all,your,base")
+        @provider.set_members_options
       end
 
       it "should set the -d option with the members joined by ','" do
-        @provider.set_members_option.should eql(" -d all,your,base")
+        @provider.set_members_options.should eql([ " -d all,your,base" ])
       end
     end
 
@@ -112,12 +109,12 @@ describe Chef::Provider::Group::Pw do
       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
+        Chef::Log.should_receive(:debug).with("group[wheel] adding group members: all,your,base")
+        @provider.set_members_options
       end
 
       it "should set the -M option with the members joined by ','" do
-        @provider.set_members_option.should eql(" -M all,your,base")
+        @provider.set_members_options.should eql([ " -m all,your,base" ])
       end
     end
   end

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

@@ -25,6 +25,7 @@ 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
@@ -33,11 +34,12 @@ 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
-        Chef::Log.should_receive(:debug).with("group[wheel] not changing group members, the group has no members")
+        @provider.should_not_receive(:shell_out!)
         @provider.modify_group_members
       end
     end
@@ -65,13 +67,26 @@ describe Chef::Provider::Group::Usermod do
         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(: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.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.modify_group_members
         end
       end

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

@@ -70,14 +70,6 @@ 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,6 +108,19 @@ 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
@@ -127,6 +140,7 @@ 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
@@ -134,6 +148,7 @@ 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
@@ -141,6 +156,7 @@ describe Chef::Provider::User 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!(: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
@@ -172,12 +188,14 @@ 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
@@ -191,6 +209,7 @@ 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
@@ -204,12 +223,14 @@ 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
@@ -217,6 +238,7 @@ 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
@@ -233,26 +255,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 == nil
+      @provider.change_desc.should == [ ]
     end
   end
 

data/spec/unit/provider/ohai_spec.rb

@@ -42,6 +42,7 @@ describe Chef::Provider::Ohai do
       }
     }
     mock_ohai.stub!(:all_plugins).and_return(true)
+    mock_ohai.stub!(:require_plugin).and_return(true)
     mock_ohai.stub!(:data).and_return(mock_ohai[:data],
                                       mock_ohai[:data2])
     Ohai::System.stub!(:new).and_return(mock_ohai)

data/spec/unit/provider/remote_file_spec.rb

@@ -47,16 +47,17 @@ describe Chef::Provider::RemoteFile do
 
   subject(:provider) do
     provider = described_class.new(resource, run_context)
-    provider.stub!(:content).and_return(content)
-    provider.stub!(:update_new_resource_checksum).and_return(nil) # Otherwise it doesn't behave like a File provider
+    provider.stub(:content).and_return(content)
+    provider.stub(:update_new_resource_checksum).and_return(nil) # Otherwise it doesn't behave like a File provider
     provider
   end
 
   before do
-    Chef::FileCache.stub!(:load).with("remote_file/#{resource.name}").and_raise(Chef::Exceptions::FileNotFound)
+    Chef::FileCache.stub(:load).with("remote_file/#{resource.name}").and_raise(Chef::Exceptions::FileNotFound)
   end
 
   it_behaves_like Chef::Provider::File
 
+  it_behaves_like "a file provider with source field"
 end
 

data/spec/unit/provider/template_spec.rb

@@ -39,7 +39,7 @@ describe Chef::Provider::Template do
 
   let(:provider) do
     provider = described_class.new(resource, run_context)
-    provider.stub!(:content).and_return(content)
+    provider.stub(:content).and_return(content)
     provider
   end
 
@@ -73,16 +73,18 @@ describe Chef::Provider::Template do
 
     let(:provider) do
       provider = described_class.new(resource, run_context)
-      provider.stub!(:content).and_return(content)
+      provider.stub(:content).and_return(content)
       provider
     end
 
     it "stops executing when the local template source can't be found" do
       setup_normal_file
-      content.stub!(:template_location).and_return("/baz/bar/foo")
+      content.stub(:template_location).and_return("/baz/bar/foo")
       File.stub(:exists?).with("/baz/bar/foo").and_return(false)
       lambda { provider.run_action(:create) }.should raise_error Chef::Mixin::WhyRun::ResourceRequirements::Assertion::AssertionFailure
     end
 
   end
+
+  it_behaves_like "a file provider with source field"
 end

data/spec/unit/provider/user_spec.rb

@@ -91,6 +91,12 @@ describe Chef::Provider::User do
       @current_resource.username.should == @new_resource.username
     end
 
+    it "should change the encoding of gecos to the encoding of the new resource", :ruby_gte_19_only do
+      @pw_user.gecos.force_encoding('ASCII-8BIT')
+      @provider.load_current_resource
+      @provider.current_resource.comment.encoding.should == @new_resource.comment.encoding
+    end
+
     it "should look up the user in /etc/passwd with getpwnam" do
       Etc.should_receive(:getpwnam).with(@new_resource.username).and_return(@pw_user)
       @provider.load_current_resource

data/spec/unit/provider/whyrun_safe_ruby_block_spec.rb

@@ -0,0 +1,47 @@
+#
+# Author:: Phil Dibowitz (<phild@fb.com>)
+# Copyright:: Copyright (c) 2013 Facebook
+# License:: Apache License, Version 2.0
+#
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'spec_helper'
+
+describe Chef::Provider::WhyrunSafeRubyBlock, "initialize" do
+  before(:each) do
+    $evil_global_evil_laugh = :wahwah
+    @node = Chef::Node.new
+    @events = Chef::EventDispatch::Dispatcher.new
+    @run_context = Chef::RunContext.new(@node, {}, @events)
+    @new_resource = Chef::Resource::WhyrunSafeRubyBlock.new("bloc party")
+    @new_resource.block { $evil_global_evil_laugh = :mwahahaha}
+    @provider = Chef::Provider::WhyrunSafeRubyBlock.new(@new_resource, @run_context)
+  end
+
+  it "should call the block and flag the resource as updated" do
+    @provider.run_action(:create)
+    $evil_global_evil_laugh.should == :mwahahaha
+    @new_resource.should be_updated
+  end
+
+  it "should call the block and flat the resource as updated - even in whyrun" do
+    Chef::Config[:why_run] = true
+    @provider.run_action(:create)
+    $evil_global_evil_laugh.should == :mwahahaha
+    @new_resource.should be_updated
+    Chef::Config[:why_run] = false
+  end
+
+end
+

data/spec/unit/resource/scm_spec.rb

@@ -118,6 +118,16 @@ describe Chef::Resource::Scm do
     @resource.enable_submodules.should be_false
   end
 
+  it "takes a boolean for #enable_checkout" do
+    @resource.enable_checkout true
+    @resource.enable_checkout.should be_true
+    lambda {@resource.enable_checkout "lolz"}.should raise_error(ArgumentError)
+  end
+
+  it "defaults to enabling checkout" do
+    @resource.enable_checkout.should be_true
+  end
+
   it "takes a string for the remote" do
     @resource.remote "opscode"
     @resource.remote.should eql("opscode")