chef 17.5.22-universal-mingw32 → 17.7.29-universal-mingw32

data/spec/unit/provider/package/rubygems_spec.rb

@@ -503,11 +503,11 @@ describe Chef::Provider::Package::Rubygems do
           platform_mock :windows do
             allow(ENV).to receive(:[]).with("PATH").and_return('C:\windows\system32;C:\windows;C:\Ruby186\bin')
             allow(ENV).to receive(:[]).with("PATHEXT").and_return(nil)
-            allow(File).to receive(:executable?).with('C:\\windows\\system32/gem').and_return(false)
-            allow(File).to receive(:executable?).with('C:\\windows/gem').and_return(false)
-            allow(File).to receive(:executable?).with('C:\\Ruby186\\bin/gem').and_return(true)
-            allow(File).to receive(:executable?).with('d:\\opscode\\chef\\bin/gem').and_return(false) # should not get here
-            allow(File).to receive(:executable?).with('d:\\opscode\\chef\\bin/gem').and_return(false) # should not get here
+            allow(File).to receive(:executable?).with("C:\\windows\\system32/gem").and_return(false)
+            allow(File).to receive(:executable?).with("C:\\windows/gem").and_return(false)
+            allow(File).to receive(:executable?).with("C:\\Ruby186\\bin/gem").and_return(true)
+            allow(File).to receive(:executable?).with("d:\\opscode\\chef\\bin/gem").and_return(false) # should not get here
+            allow(File).to receive(:executable?).with("d:\\opscode\\chef\\bin/gem").and_return(false) # should not get here
             allow(File).to receive(:executable?).with("d:/opscode/chef/embedded/bin/gem").and_return(false) # should not get here
             expect(provider.gem_env.gem_binary_location).to eq('C:\Ruby186\bin/gem')
           end

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

@@ -39,7 +39,7 @@ describe Chef::Provider::Package::Windows, :windows_only do
     new_resource
   end
   let(:provider) { Chef::Provider::Package::Windows.new(new_resource, run_context) }
-  let(:cache_path) { 'c:\\cache\\' }
+  let(:cache_path) { "c:\\cache\\" }
 
   before(:each) do
     allow(::File).to receive(:exist?).with(new_resource.source).and_return(true)

data/spec/unit/provider/registry_key_spec.rb

@@ -274,7 +274,7 @@ describe Chef::Provider::RegistryKey do
   end
 
   context "when the key data is safe" do
-    let(:keyname) { 'HKLM\Software\Opscode\Testing\Safe' }
+    let(:keyname) { "HKLM\\Software\\Opscode\\Testing\\Safe" }
     let(:testval1) { { name: "one", type: :string, data: "1" } }
     let(:testval1_wrong_type) { { name: "one", type: :multi_string, data: "1" } }
     let(:testval1_wrong_data) { { name: "one", type: :string, data: "2" } }
@@ -295,7 +295,7 @@ describe Chef::Provider::RegistryKey do
 
   describe "action_create" do
     context "when key exists and type matches" do
-      let(:keyname) { 'hklm\\software\\opscode\\testing\\dword' }
+      let(:keyname) { "hklm\\software\\opscode\\testing\\dword" }
       let(:dword_passed_as_integer) { { name: "one", type: :dword, data: 12345 } }
       let(:testval1) { { name: "one", type: :dword, data: "12345" } }
       before do
@@ -349,7 +349,7 @@ describe Chef::Provider::RegistryKey do
       end
 
       context "and key does not exist" do
-        let(:keyname) { 'hklm\\software\\opscode\\testing\\sensitive\missing' }
+        let(:keyname) { "hklm\\software\\opscode\\testing\\sensitive\\missing" }
         let(:testval1) { { name: "one", type: :string, data: "first_value" } }
 
         before(:each) do
@@ -368,7 +368,7 @@ describe Chef::Provider::RegistryKey do
 
   describe "action_create_if_missing" do
     context "when sensitive is true" do
-      let(:keyname) { 'hklm\\software\\opscode\\testing\\create_if_missing\\sensitive' }
+      let(:keyname) { "hklm\\software\\opscode\\testing\\create_if_missing\\sensitive" }
       let(:testval1) { { name: "one", type: :string, data: "first_value" } }
 
       before(:each) do

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

@@ -33,7 +33,7 @@ describe Chef::Provider::Service::Windows, "load_current_resource" do
 
   # Actual response from Win32::Service.config_info('chef-client')
   let(:chef_service_binary_path_name) do
-    'C:\\opscode\\chef\\embedded\\bin\\ruby.exe C:\\opscode\\chef\\bin\\chef-windows-service'
+    "C:\\opscode\\chef\\embedded\\bin\\ruby.exe C:\\opscode\\chef\\bin\\chef-windows-service"
   end
   let(:chef_service_config_info) do
     double("Struct::ServiceConfigInfo",
@@ -153,11 +153,11 @@ describe Chef::Provider::Service::Windows, "load_current_resource" do
           service_type: "share process",
           start_type: "demand start",
           error_control: "normal",
-          binary_path_name: 'C:\\Windows\\system32\\svchost.exe -k LocalServiceNetworkRestricted',
+          binary_path_name: "C:\\Windows\\system32\\svchost.exe -k LocalServiceNetworkRestricted",
           load_order_group: "TDI",
           tag_id: 0,
           dependencies: %w{NSI Tdx Afd},
-          service_start_name: 'NT Authority\\LocalService',
+          service_start_name: "NT Authority\\LocalService",
           display_name: "DHCP Client")
       )
     end
@@ -169,11 +169,11 @@ describe Chef::Provider::Service::Windows, "load_current_resource" do
             service_type: "share process",
             start_type: "demand start",
             error_control: "normal",
-            binary_path_name: 'C:\\Windows\\system32\\svchost.exe -k LocalServiceNetworkRestricted',
+            binary_path_name: "C:\\Windows\\system32\\svchost.exe -k LocalServiceNetworkRestricted",
             load_order_group: "TDI",
             tag_id: 0,
             dependencies: %w{NSI Tdx Afd},
-            service_start_name: 'NT Authority\\LocalService',
+            service_start_name: "NT Authority\\LocalService",
             display_name: "DHCP Client")
         )
       end

data/spec/unit/provider/subversion_spec.rb

@@ -190,7 +190,7 @@ describe Chef::Provider::Subversion do
   it "runs an export with the --force option" do
     allow(::File).to receive(:directory?).with("/my/deploy").and_return(true)
     expected_cmd = "svn export --force -q   -r12345 http://svn.example.org/trunk/ /my/deploy/dir"
-    expect(@provider).to receive(:shell_out!).with(expected_cmd, {})
+    expect(@provider).to receive(:shell_out!).with(expected_cmd)
     @provider.run_action(:force_export)
     expect(@resource).to be_updated
   end
@@ -198,7 +198,7 @@ describe Chef::Provider::Subversion do
   it "runs the checkout command for action_checkout" do
     allow(::File).to receive(:directory?).with("/my/deploy").and_return(true)
     expected_cmd = "svn checkout -q   -r12345 http://svn.example.org/trunk/ /my/deploy/dir"
-    expect(@provider).to receive(:shell_out!).with(expected_cmd, {})
+    expect(@provider).to receive(:shell_out!).with(expected_cmd)
     @provider.run_action(:checkout)
     expect(@resource).to be_updated
   end
@@ -248,7 +248,7 @@ describe Chef::Provider::Subversion do
     allow(@provider).to receive(:find_current_revision).and_return("11410")
     allow(@provider).to receive(:current_revision_matches_target_revision?).and_return(false)
     expected_cmd = "svn update -q   -r12345 /my/deploy/dir"
-    expect(@provider).to receive(:shell_out!).with(expected_cmd, {})
+    expect(@provider).to receive(:shell_out!).with(expected_cmd)
     @provider.run_action(:sync)
     expect(@resource).to be_updated
   end
@@ -265,7 +265,7 @@ describe Chef::Provider::Subversion do
   it "runs the export_command on action_export" do
     allow(::File).to receive(:directory?).with("/my/deploy").and_return(true)
     expected_cmd = "svn export --force -q   -r12345 http://svn.example.org/trunk/ /my/deploy/dir"
-    expect(@provider).to receive(:shell_out!).with(expected_cmd, {})
+    expect(@provider).to receive(:shell_out!).with(expected_cmd)
     @provider.run_action(:export)
     expect(@resource).to be_updated
   end

data/spec/unit/provider/windows_env_spec.rb

@@ -358,7 +358,7 @@ describe "windows_env provider", :windows_only do
   context "when environment is PATH" do
     describe "for PATH" do
       let(:system_root) { "%SystemRoot%" }
-      let(:system_root_value) { 'D:\Windows' }
+      let(:system_root_value) { "D:\\Windows" }
       let(:new_resource) do
         new_resource = Chef::Resource::WindowsEnv.new("PATH", run_context)
         new_resource.value(system_root)

data/spec/unit/provider/zypper_repository_spec.rb

@@ -103,7 +103,7 @@ describe Chef::Provider::ZypperRepository do
 
   describe "#escaped_repo_name" do
     it "returns an escaped repo name" do
-      expect(provider.escaped_repo_name).to eq('Nginx\\ Repository')
+      expect(provider.escaped_repo_name).to eq("Nginx\\ Repository")
     end
   end
 

data/spec/unit/resource/chef_client_trusted_certificate_spec.rb

@@ -51,4 +51,18 @@ describe Chef::Resource::ChefClientTrustedCertificate do
       expect(provider.cert_path).to match(%r{trusted_certs/something.pem$})
     end
   end
+
+  describe "sensitive attribute" do
+    context "should be insensitive by default" do
+      it { expect(resource.sensitive).to(be_falsey) }
+    end
+
+    context "when set" do
+      before { resource.sensitive(true) }
+
+      it "should be set on the resource" do
+        expect(resource.sensitive).to(be_truthy)
+      end
+    end
+  end
 end

data/spec/unit/resource/chocolatey_config_spec.rb

@@ -41,7 +41,7 @@ describe Chef::Resource::ChocolateyConfig do
   # we save off the ENV and set ALLUSERSPROFILE so these specs will work on *nix and non-C drive Windows installs
   before(:each) do
     @original_env = ENV.to_hash
-    ENV["ALLUSERSPROFILE"] = 'C:\ProgramData'
+    ENV["ALLUSERSPROFILE"] = "C:\\ProgramData"
   end
 
   after(:each) do

data/spec/unit/resource/chocolatey_feature_spec.rb

@@ -41,7 +41,7 @@ describe Chef::Resource::ChocolateyFeature do
   # we save off the ENV and set ALLUSERSPROFILE so these specs will work on *nix and non-C drive Windows installs
   before(:each) do
     @original_env = ENV.to_hash
-    ENV["ALLUSERSPROFILE"] = 'C:\ProgramData'
+    ENV["ALLUSERSPROFILE"] = "C:\\ProgramData"
   end
 
   after(:each) do

data/spec/unit/resource/chocolatey_source_spec.rb

@@ -54,7 +54,7 @@ describe Chef::Resource::ChocolateySource do
     allow(resource).to receive(:provider_for_action).and_return(enable_provider)
     allow(resource.class).to receive(:new).and_return(current_resource)
     @original_env = ENV.to_hash
-    ENV["ALLUSERSPROFILE"] = 'C:\ProgramData'
+    ENV["ALLUSERSPROFILE"] = "C:\\ProgramData"
   end
 
   after(:each) do

data/spec/unit/resource/kernel_module_spec.rb

@@ -32,10 +32,11 @@ describe Chef::Resource::KernelModule do
     expect(resource.modname).to eql("foo")
   end
 
-  it "supports :create and :flush actions" do
+  it "supports various actions" do
     expect { resource.action :install }.not_to raise_error
     expect { resource.action :uninstall }.not_to raise_error
     expect { resource.action :blacklist }.not_to raise_error
+    expect { resource.action :enable }.not_to raise_error
     expect { resource.action :disable }.not_to raise_error
     expect { resource.action :load }.not_to raise_error
     expect { resource.action :unload }.not_to raise_error

data/spec/unit/resource/macos_user_defaults_spec.rb

@@ -17,120 +17,60 @@
 
 require "spec_helper"
 
-describe Chef::Resource::MacosUserDefaults do
-
-  let(:resource) { Chef::Resource::MacosUserDefaults.new("foo") }
-  let(:provider) { resource.provider_for_action(:write) }
-
-  it "has a resource name of :macos_userdefaults" do
-    expect(resource.resource_name).to eq(:macos_userdefaults)
-  end
-
-  it "the domain property defaults to NSGlobalDomain" do
-    expect(resource.domain).to eq("NSGlobalDomain")
-  end
-
-  it "the value property coerces keys in hashes to strings so we can compare them with plist data" do
-    resource.value "User": "/Library/Managed Installs/way_fake.log"
-    expect(resource.value).to eq({ "User" => "/Library/Managed Installs/way_fake.log" })
-  end
-
-  it "the host property defaults to nil" do
-    expect(resource.host).to be_nil
-  end
-
-  it "the sudo property defaults to false" do
-    expect(resource.sudo).to be false
-  end
-
-  it "sets the default action as :write" do
-    expect(resource.action).to eq([:write])
-  end
-
-  it "supports :write action" do
-    expect { resource.action :write }.not_to raise_error
-  end
-
-  describe "#defaults_export_cmd" do
-    it "exports NSGlobalDomain if no domain is set" do
-      expect(provider.defaults_export_cmd(resource)).to eq(["/usr/bin/defaults", "export", "NSGlobalDomain", "-"])
+describe Chef::Resource::MacosUserDefaults, :macos_only do
+  let(:test_value) { "fakest_key_value" }
+  let(:test_key) { "fakest_key" }
+  let(:node) { Chef::Node.new }
+  let(:events) { Chef::EventDispatch::Dispatcher.new }
+  let(:run_context) { Chef::RunContext.new(node, {}, events) }
+  let(:resource) {
+    Chef::Resource::MacosUserDefaults.new("foo", run_context).tap do |r|
+      r.value test_value
+      r.key test_key
     end
+  }
 
-    it "exports a provided domain" do
-      resource.domain "com.tim"
-      expect(provider.defaults_export_cmd(resource)).to eq(["/usr/bin/defaults", "export", "com.tim", "-"])
+  context "has a default value" do
+    it ":macos_userdefaults for resource name" do
+      expect(resource.resource_name).to eq(:macos_userdefaults)
     end
 
-    it "sets -currentHost if host is 'current'" do
-      resource.host "current"
-      expect(provider.defaults_export_cmd(resource)).to eq(["/usr/bin/defaults", "-currentHost", "export", "NSGlobalDomain", "-"])
+    it "NSGlobalDomain for the domain property" do
+      expect(resource.domain).to eq("NSGlobalDomain")
     end
 
-    it "sets -host 'tim-laptop if host is 'tim-laptop'" do
-      resource.host "tim-laptop"
-      expect(provider.defaults_export_cmd(resource)).to eq(["/usr/bin/defaults", "-host", "tim-laptop", "export", "NSGlobalDomain", "-"])
-    end
-  end
-
-  describe "#defaults_modify_cmd" do
-    # avoid needing to set these required values over and over. We'll overwrite them where necessary
-    before do
-      resource.key = "foo"
-      resource.value = "bar"
-    end
-
-    it "writes to NSGlobalDomain if domain isn't specified" do
-      expect(provider.defaults_modify_cmd).to eq(["/usr/bin/defaults", "write", "NSGlobalDomain", "foo", "-string", "bar"])
-    end
-
-    it "uses the domain property if set" do
-      resource.domain = "MyCustomDomain"
-      expect(provider.defaults_modify_cmd).to eq(["/usr/bin/defaults", "write", "MyCustomDomain", "foo", "-string", "bar"])
+    it "nil for the host property" do
+      expect(resource.host).to be_nil
     end
 
-    it "sets host specific values using host property" do
-      resource.host = "tims_laptop"
-      expect(provider.defaults_modify_cmd).to eq(["/usr/bin/defaults", "-host", "tims_laptop", "write", "NSGlobalDomain", "foo", "-string", "bar"])
+    it "nil for the user property" do
+      expect(resource.user).to be_nil
     end
 
-    it "if host is set to :current it passes CurrentHost" do
-      resource.host = :current
-      expect(provider.defaults_modify_cmd).to eq(["/usr/bin/defaults", "-currentHost", "write", "NSGlobalDomain", "foo", "-string", "bar"])
-    end
-
-    it "raises ArgumentError if bool is specified, but the value can't be made into a bool" do
-      resource.type "bool"
-      expect { provider.defaults_modify_cmd }.to raise_error(ArgumentError)
-    end
-
-    it "autodetects array type and passes individual values" do
-      resource.value = %w{one two three}
-      expect(provider.defaults_modify_cmd).to eq(["/usr/bin/defaults", "write", "NSGlobalDomain", "foo", "-array", "one", "two", "three"])
-    end
-
-    it "autodetects string type and passes a single value" do
-      resource.value = "one"
-      expect(provider.defaults_modify_cmd).to eq(["/usr/bin/defaults", "write", "NSGlobalDomain", "foo", "-string", "one"])
+    it ":write for resource action" do
+      expect(resource.action).to eq([:write])
     end
+  end
 
-    it "autodetects integer type and passes a single value" do
-      resource.value = 1
-      expect(provider.defaults_modify_cmd).to eq(["/usr/bin/defaults", "write", "NSGlobalDomain", "foo", "-int", 1])
+  context ":write" do
+    it "is a supported action" do
+      expect { resource.action :write }.not_to raise_error
     end
 
-    it "autodetects boolean type from TrueClass value and passes a 'TRUE' string" do
-      resource.value = true
-      expect(provider.defaults_modify_cmd).to eq(["/usr/bin/defaults", "write", "NSGlobalDomain", "foo", "-bool", "TRUE"])
+    it "successfully updates the preference" do
+      resource.run_action(:write)
+      expect(resource.get_preference resource).eql? test_value
     end
+  end
 
-    it "autodetects boolean type from FalseClass value and passes a 'FALSE' string" do
-      resource.value = false
-      expect(provider.defaults_modify_cmd).to eq(["/usr/bin/defaults", "write", "NSGlobalDomain", "foo", "-bool", "FALSE"])
+  context ":delete" do
+    it "is a supported action" do
+      expect { resource.action :delete }.not_to raise_error
     end
 
-    it "autodetects dict type from Hash value and flattens keys & values" do
-      resource.value = { "foo" => "bar" }
-      expect(provider.defaults_modify_cmd).to eq(["/usr/bin/defaults", "write", "NSGlobalDomain", "foo", "-dict", "foo", "bar"])
+    it "successfully deletes the preference" do
+      resource.run_action(:delete)
+      expect(resource.get_preference resource).to be_nil
     end
   end
 end