chef 12.14.89 → 12.15.19

data/lib/chef/provider/user/pw.rb

@@ -46,7 +46,7 @@ class Chef
 
         def remove_user
           command = "pw userdel #{@new_resource.username}"
-          command << " -r" if @new_resource.supports[:manage_home]
+          command << " -r" if managing_home_dir?
           run_command(:command => command)
         end
 
@@ -87,7 +87,7 @@ class Chef
               end
             end
           end
-          if @new_resource.supports[:manage_home]
+          if managing_home_dir?
             Chef::Log.debug("#{@new_resource} is managing the users home directory")
             opts << " -m"
           end

data/lib/chef/provider/user/solaris.rb

@@ -73,6 +73,21 @@ class Chef
 
         private
 
+        # Override the version from {#Useradd} because Solaris doesn't support
+        # system users and therefore has no `-r` option. This also inverts the
+        # logic for manage_home as Solaris defaults to no-manage-home and only
+        # offers `-m`.
+        #
+        # @since 12.15
+        # @api private
+        # @see Useradd#useradd_options
+        # @return [Array<String>]
+        def useradd_options
+          opts = []
+          opts << "-m" if managing_home_dir?
+          opts
+        end
+
         def manage_password
           if @current_resource.password != @new_resource.password && @new_resource.password
             Chef::Log.debug("#{@new_resource} setting password to #{@new_resource.password}")

data/lib/chef/provider/user/useradd.rb

@@ -124,7 +124,7 @@ class Chef
                   Chef::Log.debug("#{new_resource} setting home to #{new_resource.home}")
                 end
               end
-              opts << "-o" if new_resource.non_unique
+              opts << "-o" if non_unique?
               opts
             end
         end
@@ -154,10 +154,6 @@ class Chef
           new_resource.home && Pathname.new(@current_resource.home).cleanpath != Pathname.new(new_resource.home).cleanpath
         end
 
-        def managing_home_dir?
-          new_resource.manage_home || new_resource.supports[:manage_home]
-        end
-
       end
     end
   end

data/lib/chef/providers.rb

@@ -83,6 +83,7 @@ require "chef/provider/package/zypper"
 require "chef/provider/package/solaris"
 require "chef/provider/package/smartos"
 require "chef/provider/package/aix"
+require "chef/provider/package/cab"
 
 require "chef/provider/service/arch"
 require "chef/provider/service/freebsd"

data/lib/chef/resource/cab_package.rb

@@ -0,0 +1,44 @@
+#
+# Author:: Vasundhara Jagdale (<vasundhara.jagdale@msystechnologies.com>)
+# Copyright:: Copyright 2008-2016, Chef Software, Inc.
+# 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 "chef/resource/package"
+require "chef/mixin/uris"
+
+class Chef
+  class Resource
+    class CabPackage < Chef::Resource::Package
+      include Chef::Mixin::Uris
+
+      provides :cab_package, os: "windows"
+
+      allowed_actions :install, :remove
+
+      def initialize(name, run_context = nil)
+        super
+        @resource_name = :cab_package
+      end
+
+      property  :source, String,
+                coerce: (proc do |s|
+                  unless s.nil?
+                    uri_scheme?(s) ? s : Chef::Util::PathHelper.canonical_path(s, false)
+                  end
+                end)
+    end
+  end
+end

data/lib/chef/resource/registry_key.rb

@@ -87,13 +87,13 @@ class Chef
 
           @values.each do |v|
             raise ArgumentError, "Missing name key in RegistryKey values hash" unless v.has_key?(:name)
-            raise ArgumentError, "Missing type key in RegistryKey values hash" unless v.has_key?(:type)
-            raise ArgumentError, "Missing data key in RegistryKey values hash" unless v.has_key?(:data)
             v.each_key do |key|
               raise ArgumentError, "Bad key #{key} in RegistryKey values hash" unless [:name, :type, :data].include?(key)
             end
             raise ArgumentError, "Type of name => #{v[:name]} should be string" unless v[:name].is_a?(String)
-            raise ArgumentError, "Type of type => #{v[:type]} should be symbol" unless v[:type].is_a?(Symbol)
+            if v[:type]
+              raise ArgumentError, "Type of type => #{v[:type]} should be symbol" unless v[:type].is_a?(Symbol)
+            end
           end
           @unscrubbed_values = @values
         elsif self.instance_variable_defined?(:@values)

data/lib/chef/resource/yum_repository.rb

@@ -35,7 +35,7 @@ class Chef
       property :exclude, String, regex: /.*/
       property :failovermethod, String, equal_to: %w{priority roundrobin}
       property :fastestmirror_enabled, [TrueClass, FalseClass]
-      property :gpgcheck, [TrueClass, FalseClass]
+      property :gpgcheck, [TrueClass, FalseClass], default: true
       property :gpgkey, [String, Array], regex: /.*/
       property :http_caching, String, equal_to: %w{packages all none}
       property :include_config, String, regex: /.*/

data/lib/chef/resources.rb

@@ -95,3 +95,4 @@ require "chef/resource/yum_repository"
 require "chef/resource/lwrp_base"
 require "chef/resource/bff_package"
 require "chef/resource/zypper_package"
+require "chef/resource/cab_package"

data/lib/chef/server_api.rb

@@ -30,7 +30,7 @@ class Chef
 
     def initialize(url = Chef::Config[:chef_server_url], options = {})
       options[:client_name] ||= Chef::Config[:node_name]
-      options[:signing_key_filename] ||= Chef::Config[:client_key]
+      options[:signing_key_filename] ||= Chef::Config[:client_key] unless options[:raw_key]
       options[:signing_key_filename] = nil if chef_zero_uri?(url)
       options[:inflate_json_class] = false
       super(url, options)

data/lib/chef/util/dsc/local_configuration_manager.rb

@@ -74,7 +74,7 @@ class Chef::Util::DSC
 
     def lcm_command_code(configuration_path, test_only_parameters)
       <<-EOH
-$ProgressPreference = 'SilentlyContinue';start-dscconfiguration -path #{@configuration_path} -wait -erroraction 'continue' -force #{test_only_parameters}
+$ProgressPreference = 'SilentlyContinue';start-dscconfiguration -path #{@configuration_path} -wait -erroraction 'stop' -force #{test_only_parameters}
 EOH
     end
 

data/lib/chef/version.rb

@@ -21,7 +21,7 @@
 
 class Chef
   CHEF_ROOT = File.expand_path("../..", __FILE__)
-  VERSION = "12.14.89"
+  VERSION = "12.15.19"
 end
 
 #

data/spec/data/templates/chef-seattle20160930-4388-1crv7ef.txt

@@ -0,0 +1 @@
+Do do do do, do do do do, do do do do, do do do do

data/spec/data/templates/chef-seattle20160930-4388-jjfoae.txt

@@ -0,0 +1 @@
+Do do do do, do do do do, do do do do, do do do do

data/spec/data/templates/chef-seattle20160930-4388-umeq2c.txt

@@ -0,0 +1 @@
+Do do do do, do do do do, do do do do, do do do do

data/spec/functional/knife/cookbook_delete_spec.rb

@@ -20,86 +20,75 @@ require "spec_helper"
 require "tiny_server"
 
 describe Chef::Knife::CookbookDelete do
-  before(:each) do
-    @server = TinyServer::Manager.new
-    @server.start
-  end
-
-  after(:each) do
-    @server.stop
+  let(:server) { TinyServer::Manager.new }
+  let(:api) { TinyServer::API.instance }
+  let(:knife_stdout) { StringIO.new }
+  let(:knife_stderr) { StringIO.new }
+  let(:knife) do
+    knife = Chef::Knife::CookbookDelete.new
+    allow(knife.ui).to receive(:stdout).and_return(knife_stdout)
+    allow(knife.ui).to receive(:stderr).and_return(knife_stderr)
+    knife
   end
 
   before(:each) do
-    @knife = Chef::Knife::CookbookDelete.new
-    @api = TinyServer::API.instance
-    @api.clear
+    server.start
+    api.clear
 
     Chef::Config[:node_name] = nil
     Chef::Config[:client_key] = nil
     Chef::Config[:chef_server_url] = "http://localhost:9000"
   end
 
-  context "when the cookbook doesn't exist" do
-    let(:log_output) { StringIO.new }
+  after(:each) do
+    server.stop
+  end
 
+  context "when the cookbook doesn't exist" do
     before do
-      @knife.name_args = %w{no-such-cookbook}
-      @api.get("/cookbooks/no-such-cookbook", 404, Chef::JSONCompat.to_json({ "error" => "dear Tim, no. -Sent from my iPad" }))
-    end
-
-    around do |ex|
-      old_logger = Chef::Log.logger
-      old_level = Chef::Log.level
-      begin
-        Chef::Log.logger = Logger.new(log_output)
-        Chef::Log.level = :debug
-        ex.run
-      ensure
-        Chef::Log.logger = old_logger
-        Chef::Log.level = old_level
-      end
+      knife.name_args = %w{no-such-cookbook}
+      api.get("/cookbooks/no-such-cookbook", 404, Chef::JSONCompat.to_json({ "error" => "dear Tim, no. -Sent from my iPad" }))
     end
 
     it "logs an error and exits" do
-      allow(@knife.ui).to receive(:stderr).and_return(log_output)
-      expect { @knife.run }.to raise_error(SystemExit)
-      expect(log_output.string).to match(/Cannot find a cookbook named no-such-cookbook to delete/)
+      expect { knife.run }.to raise_error(SystemExit)
+      expect(knife_stderr.string).to match(/Cannot find a cookbook named no-such-cookbook to delete/)
     end
 
   end
 
   context "when there is only one version of a cookbook" do
     before do
-      @knife.name_args = %w{obsolete-cookbook}
+      knife.name_args = %w{obsolete-cookbook}
       @cookbook_list = { "obsolete-cookbook" => { "versions" => ["version" => "1.0.0"] } }
-      @api.get("/cookbooks/obsolete-cookbook", 200, Chef::JSONCompat.to_json(@cookbook_list))
+      api.get("/cookbooks/obsolete-cookbook", 200, Chef::JSONCompat.to_json(@cookbook_list))
     end
 
     it "asks for confirmation, then deletes the cookbook" do
       stdin, stdout = StringIO.new("y\n"), StringIO.new
-      allow(@knife.ui).to receive(:stdin).and_return(stdin)
-      allow(@knife.ui).to receive(:stdout).and_return(stdout)
+      allow(knife.ui).to receive(:stdin).and_return(stdin)
+      allow(knife.ui).to receive(:stdout).and_return(stdout)
 
       cb100_deleted = false
-      @api.delete("/cookbooks/obsolete-cookbook/1.0.0", 200) { cb100_deleted = true; "[\"true\"]" }
+      api.delete("/cookbooks/obsolete-cookbook/1.0.0", 200) { cb100_deleted = true; "[\"true\"]" }
 
-      @knife.run
+      knife.run
 
       expect(stdout.string).to match(/#{Regexp.escape('Do you really want to delete obsolete-cookbook version 1.0.0? (Y/N)')}/)
       expect(cb100_deleted).to be_truthy
     end
 
     it "asks for confirmation before purging" do
-      @knife.config[:purge] = true
+      knife.config[:purge] = true
 
       stdin, stdout = StringIO.new("y\ny\n"), StringIO.new
-      allow(@knife.ui).to receive(:stdin).and_return(stdin)
-      allow(@knife.ui).to receive(:stdout).and_return(stdout)
+      allow(knife.ui).to receive(:stdin).and_return(stdin)
+      allow(knife.ui).to receive(:stdout).and_return(stdout)
 
       cb100_deleted = false
-      @api.delete("/cookbooks/obsolete-cookbook/1.0.0?purge=true", 200) { cb100_deleted = true; "[\"true\"]" }
+      api.delete("/cookbooks/obsolete-cookbook/1.0.0?purge=true", 200) { cb100_deleted = true; "[\"true\"]" }
 
-      @knife.run
+      knife.run
 
       expect(stdout.string).to match(/#{Regexp.escape('Are you sure you want to purge files')}/)
       expect(stdout.string).to match(/#{Regexp.escape('Do you really want to delete obsolete-cookbook version 1.0.0? (Y/N)')}/)
@@ -111,21 +100,21 @@ describe Chef::Knife::CookbookDelete do
 
   context "when there are several versions of a cookbook" do
     before do
-      @knife.name_args = %w{obsolete-cookbook}
+      knife.name_args = %w{obsolete-cookbook}
       versions = ["1.0.0", "1.1.0", "1.2.0"]
       with_version = lambda { |version| { "version" => version } }
       @cookbook_list = { "obsolete-cookbook" => { "versions" => versions.map(&with_version) } }
-      @api.get("/cookbooks/obsolete-cookbook", 200, Chef::JSONCompat.to_json(@cookbook_list))
+      api.get("/cookbooks/obsolete-cookbook", 200, Chef::JSONCompat.to_json(@cookbook_list))
     end
 
     it "deletes all versions of a cookbook when given the '-a' flag" do
-      @knife.config[:all] = true
-      @knife.config[:yes] = true
+      knife.config[:all] = true
+      knife.config[:yes] = true
       cb100_deleted = cb110_deleted = cb120_deleted = nil
-      @api.delete("/cookbooks/obsolete-cookbook/1.0.0", 200) { cb100_deleted = true; "[\"true\"]" }
-      @api.delete("/cookbooks/obsolete-cookbook/1.1.0", 200) { cb110_deleted = true; "[\"true\"]" }
-      @api.delete("/cookbooks/obsolete-cookbook/1.2.0", 200) { cb120_deleted = true; "[\"true\"]" }
-      @knife.run
+      api.delete("/cookbooks/obsolete-cookbook/1.0.0", 200) { cb100_deleted = true; "[\"true\"]" }
+      api.delete("/cookbooks/obsolete-cookbook/1.1.0", 200) { cb110_deleted = true; "[\"true\"]" }
+      api.delete("/cookbooks/obsolete-cookbook/1.2.0", 200) { cb120_deleted = true; "[\"true\"]" }
+      knife.run
 
       expect(cb100_deleted).to be_truthy
       expect(cb110_deleted).to be_truthy
@@ -134,28 +123,28 @@ describe Chef::Knife::CookbookDelete do
 
     it "asks which version to delete and deletes that when not given the -a flag" do
       cb100_deleted = cb110_deleted = cb120_deleted = nil
-      @api.delete("/cookbooks/obsolete-cookbook/1.0.0", 200) { cb100_deleted = true; "[\"true\"]" }
+      api.delete("/cookbooks/obsolete-cookbook/1.0.0", 200) { cb100_deleted = true; "[\"true\"]" }
       stdin, stdout = StringIO.new, StringIO.new
-      allow(@knife.ui).to receive(:stdin).and_return(stdin)
-      allow(@knife.ui).to receive(:stdout).and_return(stdout)
+      allow(knife.ui).to receive(:stdin).and_return(stdin)
+      allow(knife.ui).to receive(:stdout).and_return(stdout)
       stdin << "1\n"
       stdin.rewind
-      @knife.run
+      knife.run
       expect(cb100_deleted).to be_truthy
       expect(stdout.string).to match(/Which version\(s\) do you want to delete\?/)
     end
 
     it "deletes all versions of the cookbook when not given the -a flag and the user chooses to delete all" do
       cb100_deleted = cb110_deleted = cb120_deleted = nil
-      @api.delete("/cookbooks/obsolete-cookbook/1.0.0", 200) { cb100_deleted = true; "[\"true\"]" }
-      @api.delete("/cookbooks/obsolete-cookbook/1.1.0", 200) { cb110_deleted = true; "[\"true\"]" }
-      @api.delete("/cookbooks/obsolete-cookbook/1.2.0", 200) { cb120_deleted = true; "[\"true\"]" }
+      api.delete("/cookbooks/obsolete-cookbook/1.0.0", 200) { cb100_deleted = true; "[\"true\"]" }
+      api.delete("/cookbooks/obsolete-cookbook/1.1.0", 200) { cb110_deleted = true; "[\"true\"]" }
+      api.delete("/cookbooks/obsolete-cookbook/1.2.0", 200) { cb120_deleted = true; "[\"true\"]" }
 
       stdin, stdout = StringIO.new("4\n"), StringIO.new
-      allow(@knife.ui).to receive(:stdin).and_return(stdin)
-      allow(@knife.ui).to receive(:stdout).and_return(stdout)
+      allow(knife.ui).to receive(:stdin).and_return(stdin)
+      allow(knife.ui).to receive(:stdout).and_return(stdout)
 
-      @knife.run
+      knife.run
 
       expect(cb100_deleted).to be_truthy
       expect(cb110_deleted).to be_truthy

data/spec/functional/resource/ifconfig_spec.rb

@@ -51,11 +51,17 @@ describe Chef::Resource::Ifconfig, :requires_root, :skip_travis, :external => in
     end
   end
 
+  def fetch_first_interface_name
+    shell_out("ifconfig | grep Ethernet | head -1 | cut -d' ' -f1").stdout.strip
+  end
+
   # **Caution: any updates to core interfaces can be risky.
   def en0_interface_for_test
     case ohai[:platform]
     when "aix"
       "en0"
+    when "ubuntu"
+      fetch_first_interface_name
     else
       "eth0"
     end

data/spec/functional/resource/registry_spec.rb

@@ -197,13 +197,37 @@ describe Chef::Resource::RegistryKey, :windows_only, :broken => true do
       expect(@registry.value_exists?(reg_child + '\OpscodeTest', { :name => "Chef", :type => :multi_string, :data => %w{OpscodeOrange Rules} })).to eq(true)
     end
 
-    it "gives error if action create and parent does not exist and recursive is set to false" do
+    it "raises an error if action create and parent does not exist and recursive is set to false" do
       @new_resource.key(reg_child + '\Missing1\Missing2')
       @new_resource.values([{ :name => "OC", :type => :string, :data => "MissingData" }])
       @new_resource.recursive(false)
       expect { @new_resource.run_action(:create) }.to raise_error(Chef::Exceptions::Win32RegNoRecursive)
     end
 
+    it "raises an error if action create and type key missing in values hash" do
+      @new_resource.key(reg_child)
+      @new_resource.values([{ :name => "OC", :data => "my_data" }])
+      expect { @new_resource.run_action(:create) }.to raise_error(Chef::Exceptions::RegKeyValuesTypeMissing)
+    end
+
+    it "raises an error if action create and data key missing in values hash" do
+      @new_resource.key(reg_child)
+      @new_resource.values([{ :name => "OC", :type => :string }])
+      expect { @new_resource.run_action(:create) }.to raise_error(Chef::Exceptions::RegKeyValuesDataMissing)
+    end
+
+    it "raises an error if action create and only name key present in values hash" do
+      @new_resource.key(reg_child)
+      @new_resource.values([{ :name => "OC" }])
+      expect { @new_resource.run_action(:create) }.to raise_error(Chef::Exceptions::RegKeyValuesTypeMissing)
+    end
+
+    it "does not raise an error if action create and all keys are present in values hash" do
+      @new_resource.key(reg_child)
+      @new_resource.values([{ :name => "OC", :type => :string, :data => "my_data" }])
+      expect { @new_resource.run_action(:create) }.to_not raise_error
+    end
+
     it "creates missing keys if action create and parent does not exist and recursive is set to true" do
       @new_resource.key(reg_child + '\Missing1\Missing2')
       @new_resource.values([{ :name => "OC", :type => :string, :data => "MissingData" }])
@@ -270,7 +294,7 @@ describe Chef::Resource::RegistryKey, :windows_only, :broken => true do
         Chef::Config[:why_run] = true
       end
 
-      it "does not throw an exception if the keys do not exist but recursive is set to false" do
+      it "does not raise an exception if the keys do not exist but recursive is set to false" do
         @new_resource.key(reg_child + '\Slitheen\Raxicoricofallapatorius')
         @new_resource.values([{ :name => "BriskWalk", :type => :string, :data => "is good for health" }])
         @new_resource.recursive(false)
@@ -278,6 +302,7 @@ describe Chef::Resource::RegistryKey, :windows_only, :broken => true do
         expect(@registry.key_exists?(reg_child + '\Slitheen')).to eq(false)
         expect(@registry.key_exists?(reg_child + '\Slitheen\Raxicoricofallapatorius')).to eq(false)
       end
+
       it "does not create key if the action is create" do
         @new_resource.key(reg_child + '\Slitheen')
         @new_resource.values([{ :name => "BriskWalk", :type => :string, :data => "is good for health" }])
@@ -285,6 +310,34 @@ describe Chef::Resource::RegistryKey, :windows_only, :broken => true do
         @new_resource.run_action(:create)
         expect(@registry.key_exists?(reg_child + '\Slitheen')).to eq(false)
       end
+
+      it "does not raise an exception if the action create and type key missing in values hash" do
+        @new_resource.key(reg_child + '\Slitheen')
+        @new_resource.values([{ :name => "BriskWalk", :data => "my_data" }])
+        @new_resource.run_action(:create) # should not raise_error
+        expect(@registry.key_exists?(reg_child + '\Slitheen')).to eq(false)
+      end
+
+      it "does not raise an exception if the action create and data key missing in values hash" do
+        @new_resource.key(reg_child + '\Slitheen')
+        @new_resource.values([{ :name => "BriskWalk", :type => :string }])
+        @new_resource.run_action(:create) # should not raise_error
+        expect(@registry.key_exists?(reg_child + '\Slitheen')).to eq(false)
+      end
+
+      it "does not raise an exception if the action create and only name key present in values hash" do
+        @new_resource.key(reg_child + '\Slitheen')
+        @new_resource.values([{ :name => "BriskWalk" }])
+        @new_resource.run_action(:create) # should not raise_error
+        expect(@registry.key_exists?(reg_child + '\Slitheen')).to eq(false)
+      end
+
+      it "does not raise an exception if the action create and all keys are present in values hash" do
+        @new_resource.key(reg_child + '\Slitheen')
+        @new_resource.values([{ :name => "BriskWalk", :type => :string, :data => "my_data" }])
+        @new_resource.run_action(:create) # should not raise_error
+        expect(@registry.key_exists?(reg_child + '\Slitheen')).to eq(false)
+      end
     end
   end
 
@@ -330,13 +383,37 @@ describe Chef::Resource::RegistryKey, :windows_only, :broken => true do
       expect(@registry.value_exists?(reg_child + '\Pyrovile', { :name => "Chef", :type => :multi_string, :data => %w{OpscodeOrange Rules} })).to eq(true)
     end
 
-    it "gives error if action create and parent does not exist and recursive is set to false" do
+    it "raises an error if action create and parent does not exist and recursive is set to false" do
       @new_resource.key(reg_child + '\Sontaran\Sontar')
       @new_resource.values([{ :name => "OC", :type => :string, :data => "MissingData" }])
       @new_resource.recursive(false)
       expect { @new_resource.run_action(:create_if_missing) }.to raise_error(Chef::Exceptions::Win32RegNoRecursive)
     end
 
+    it "raises an error if action create_if_missing and type key missing in values hash" do
+      @new_resource.key(reg_child)
+      @new_resource.values([{ :name => "OC", :data => "my_data" }])
+      expect { @new_resource.run_action(:create_if_missing) }.to raise_error(Chef::Exceptions::RegKeyValuesTypeMissing)
+    end
+
+    it "raises an error if action create_if_missing and data key missing in values hash" do
+      @new_resource.key(reg_child)
+      @new_resource.values([{ :name => "OC", :type => :string }])
+      expect { @new_resource.run_action(:create_if_missing) }.to raise_error(Chef::Exceptions::RegKeyValuesDataMissing)
+    end
+
+    it "raises an error if action create_if_missing and only name key present in values hash" do
+      @new_resource.key(reg_child)
+      @new_resource.values([{ :name => "OC" }])
+      expect { @new_resource.run_action(:create_if_missing) }.to raise_error(Chef::Exceptions::RegKeyValuesTypeMissing)
+    end
+
+    it "does not raise an error if action create_if_missing and all keys are present in values hash" do
+      @new_resource.key(reg_child)
+      @new_resource.values([{ :name => "OC", :type => :string, :data => "my_data" }])
+      expect { @new_resource.run_action(:create_if_missing) }.to_not raise_error
+    end
+
     it "creates missing keys if action create and parent does not exist and recursive is set to true" do
       @new_resource.key(reg_child + '\Sontaran\Sontar')
       @new_resource.values([{ :name => "OC", :type => :string, :data => "MissingData" }])
@@ -381,7 +458,7 @@ describe Chef::Resource::RegistryKey, :windows_only, :broken => true do
         Chef::Config[:why_run] = true
       end
 
-      it "does not throw an exception if the keys do not exist but recursive is set to false" do
+      it "does not raise an exception if the keys do not exist but recursive is set to false" do
         @new_resource.key(reg_child + '\Zygons\Zygor')
         @new_resource.values([{ :name => "BriskWalk", :type => :string, :data => "is good for health" }])
         @new_resource.recursive(false)
@@ -389,6 +466,7 @@ describe Chef::Resource::RegistryKey, :windows_only, :broken => true do
         expect(@registry.key_exists?(reg_child + '\Zygons')).to eq(false)
         expect(@registry.key_exists?(reg_child + '\Zygons\Zygor')).to eq(false)
       end
+
       it "does nothing if the action is create_if_missing" do
         @new_resource.key(reg_child + '\Zygons')
         @new_resource.values([{ :name => "BriskWalk", :type => :string, :data => "is good for health" }])
@@ -396,6 +474,34 @@ describe Chef::Resource::RegistryKey, :windows_only, :broken => true do
         @new_resource.run_action(:create_if_missing)
         expect(@registry.key_exists?(reg_child + '\Zygons')).to eq(false)
       end
+
+      it "does not raise an exception if the action create_if_missing and type key missing in values hash" do
+        @new_resource.key(reg_child + '\Zygons')
+        @new_resource.values([{ :name => "BriskWalk", :data => "my_data" }])
+        @new_resource.run_action(:create_if_missing) # should not raise_error
+        expect(@registry.key_exists?(reg_child + '\Zygons')).to eq(false)
+      end
+
+      it "does not raise an exception if the action create_if_missing and data key missing in values hash" do
+        @new_resource.key(reg_child + '\Zygons')
+        @new_resource.values([{ :name => "BriskWalk", :type => :string }])
+        @new_resource.run_action(:create_if_missing) # should not raise_error
+        expect(@registry.key_exists?(reg_child + '\Zygons')).to eq(false)
+      end
+
+      it "does not raise an exception if the action create_if_missing and only name key present in values hash" do
+        @new_resource.key(reg_child + '\Zygons')
+        @new_resource.values([{ :name => "BriskWalk" }])
+        @new_resource.run_action(:create_if_missing) # should not raise_error
+        expect(@registry.key_exists?(reg_child + '\Zygons')).to eq(false)
+      end
+
+      it "does not raise an exception if the action create_if_missing and all keys are present in values hash" do
+        @new_resource.key(reg_child + '\Zygons')
+        @new_resource.values([{ :name => "BriskWalk", :type => :string, :data => "my_data" }])
+        @new_resource.run_action(:create_if_missing) # should not raise_error
+        expect(@registry.key_exists?(reg_child + '\Zygons')).to eq(false)
+      end
     end
   end