chef 14.2.0 → 14.3.37

data/spec/unit/provider/user/solaris_spec.rb

@@ -58,7 +58,7 @@ describe Chef::Provider::User::Solaris do
 
     it "should use its own shadow file writer to set the password" do
       expect(provider).to receive(:write_shadow_file)
-      allow(provider).to receive(:shell_out!).and_return(true)
+      allow(provider).to receive(:shell_out_compacted!).and_return(true)
       provider.manage_user
     end
 
@@ -69,7 +69,7 @@ describe Chef::Provider::User::Solaris do
       password_file.puts "adam:existingpassword:15441::::::"
       password_file.close
       stub_const("Chef::Provider::User::Solaris::PASSWORD_FILE", password_file.path)
-      allow(provider).to receive(:shell_out!).and_return(true)
+      allow(provider).to receive(:shell_out_compacted!).and_return(true)
       # may not be able to write to /etc for tests...
       temp_file = Tempfile.new("shadow")
       allow(Tempfile).to receive(:new).with("shadow", "/etc").and_return(temp_file)
@@ -84,7 +84,7 @@ describe Chef::Provider::User::Solaris do
     context "with a system user" do
       before { new_resource.system(true) }
       it "should not pass -r" do
-        expect(provider).to receive(:shell_out!).with("useradd", "adam")
+        expect(provider).to receive(:shell_out_compacted!).with( "useradd", "adam")
         provider.create_user
       end
     end
@@ -92,7 +92,7 @@ describe Chef::Provider::User::Solaris do
     context "with manage_home" do
       before { new_resource.manage_home(true) }
       it "should not pass -r" do
-        expect(provider).to receive(:shell_out!).with("useradd", "-m", "adam")
+        expect(provider).to receive(:shell_out_compacted!).with( "useradd", "-m", "adam")
         provider.create_user
       end
     end
@@ -162,7 +162,7 @@ describe Chef::Provider::User::Solaris do
     describe "when locking the user" do
       it "should run passwd -l with the new resources username" do
         shell_return = shellcmdresult.new("", "", 0)
-        expect(provider).to receive(:shell_out!).with("passwd", "-l", "adam").and_return(shell_return)
+        expect(provider).to receive(:shell_out_compacted!).with("passwd", "-l", "adam").and_return(shell_return)
         provider.lock_user
       end
     end
@@ -170,7 +170,7 @@ describe Chef::Provider::User::Solaris do
     describe "when unlocking the user" do
       it "should run passwd -u with the new resources username" do
         shell_return = shellcmdresult.new("", "", 0)
-        expect(provider).to receive(:shell_out!).with("passwd", "-u", "adam").and_return(shell_return)
+        expect(provider).to receive(:shell_out_compacted!).with("passwd", "-u", "adam").and_return(shell_return)
         provider.unlock_user
       end
     end

data/spec/unit/provider/windows_env_spec.rb

@@ -36,8 +36,8 @@ describe Chef::Provider::WindowsEnv, :windows_only do
 
   describe "when loading the current status" do
     before do
-      #@current_resource = @new_resource.clone
-      #Chef::Resource::Env.stub(:new).and_return(@current_resource)
+      # @current_resource = @new_resource.clone
+      # Chef::Resource::Env.stub(:new).and_return(@current_resource)
       @provider.current_resource = @current_resource
       allow(@provider).to receive(:env_value).with("FOO").and_return("bar")
       allow(@provider).to receive(:env_key_exists).and_return(true)

data/spec/unit/provider/windows_task_spec.rb

@@ -70,20 +70,20 @@ describe Chef::Provider::WindowsTask, :windows_only do
       new_resource.frequency_modifier 15
       new_resource.random_delay 60
       result = {
-        :start_year => 2017,
-        :start_month => 12,
-        :start_day => 2,
-        :start_hour => 17,
-        :start_minute => 30,
-        :end_month => 0,
-        :end_day => 0,
-        :end_year => 0,
-        :trigger_type => 1,
-        :type => { :once => nil },
-        :random_minutes_interval => 60,
-        :minutes_interval => 15,
-        :run_on_last_day_of_month => false,
-        :run_on_last_week_of_month => false
+        start_year: 2017,
+        start_month: 12,
+        start_day: 2,
+        start_hour: 17,
+        start_minute: 30,
+        end_month: 0,
+        end_day: 0,
+        end_year: 0,
+        trigger_type: 1,
+        type: { once: nil },
+        random_minutes_interval: 60,
+        minutes_interval: 15,
+        run_on_last_day_of_month: false,
+        run_on_last_week_of_month: false,
 
       }
       expect(provider.send(:trigger)).to eq(result)
@@ -145,7 +145,7 @@ describe Chef::Provider::WindowsTask, :windows_only do
       new_resource.frequency_modifier 2
       result = provider.send(:type)
       expect(result).to include(:once)
-      expect(result).to eq({ :once => nil })
+      expect(result).to eq({ once: nil })
     end
 
     it "returns type hash when frequency :daily" do
@@ -286,7 +286,7 @@ describe Chef::Provider::WindowsTask, :windows_only do
     end
   end
 
-  #Ref : https://msdn.microsoft.com/en-us/library/windows/desktop/aa380729(v=vs.85).aspx
+  # Ref : https://msdn.microsoft.com/en-us/library/windows/desktop/aa380729(v=vs.85).aspx
   describe "#days_of_week" do
     it "returns the binary value 2 if day is set as 'Mon'" do
       new_resource.day "Mon"

data/spec/unit/provider/zypper_repository_spec.rb

@@ -20,17 +20,17 @@ require "spec_helper"
 
 # Output of the command:
 # => rpm -qa gpg-pubkey*
-RPM_KEYS = <<-EOF
-gpg-pubkey-307e3d54-4be01a65
-gpg-pubkey-3dbdc284-53674dd4
+RPM_KEYS = <<~EOF.freeze
+  gpg-pubkey-307e3d54-4be01a65
+  gpg-pubkey-3dbdc284-53674dd4
 EOF
 
 # Output of the command:
 # => gpg --with-fingerprint [FILE]
-GPG_FINGER = <<-EOF
-pub  2048R/3DBDC284 2011-08-19 [expires: 2024-06-14]
-      Key fingerprint = 573B FD6B 3D8F BC64 1079  A6AB ABF5 BD82 7BD9 BF62
-uid                            nginx signing key <signing-key@nginx.com>
+GPG_FINGER = <<~EOF.freeze
+  pub  2048R/3DBDC284 2011-08-19 [expires: 2024-06-14]
+        Key fingerprint = 573B FD6B 3D8F BC64 1079  A6AB ABF5 BD82 7BD9 BF62
+  uid                            nginx signing key <signing-key@nginx.com>
 EOF
 
 describe Chef::Provider::ZypperRepository do

data/spec/unit/provider_resolver_spec.rb

@@ -27,7 +27,7 @@ require "fileutils"
 include Chef::Mixin::ConvertToClassName
 
 # Open up Provider so we can write things down easier in here
-#module Chef::Provider
+# module Chef::Provider
 
 describe Chef::ProviderResolver do
   include IntegrationSupport
@@ -428,7 +428,7 @@ describe Chef::ProviderResolver do
 
       # old debian uses the Debian provider (does not have insserv or upstart, or update-rc.d???)
       on_platform "debian", platform_version: "4.0", os: "linux" do
-        #it_behaves_like "a debian platform using the debian provider"
+        # it_behaves_like "a debian platform using the debian provider"
       end
 
       # Debian replaced the debian provider with insserv in the FIXME:VERSION distro
@@ -887,7 +887,7 @@ describe Chef::ProviderResolver do
             },
           },
         },
-      }
+      }.freeze
 
     def self.create_provider_tests(providers, test, expected, filter)
       expected = expected.merge(providers.select { |key, value| key.is_a?(Symbol) })

data/spec/unit/recipe_spec.rb

@@ -110,7 +110,7 @@ describe Chef::Recipe do
         it "locate resource for particular platform" do
           ShaunTheSheep = Class.new(Chef::Resource)
           ShaunTheSheep.resource_name :shaun_the_sheep
-          ShaunTheSheep.provides :laughter, :platform => ["television"]
+          ShaunTheSheep.provides :laughter, platform: ["television"]
           node.automatic[:platform] = "television"
           node.automatic[:platform_version] = "123"
           res = recipe.laughter "timmy"
@@ -183,7 +183,7 @@ describe Chef::Recipe do
 
       it "does not add the resource to the resource collection" do
         zm_resource # force let binding evaluation
-        expect { run_context.resource_collection.resources(:zen_master => "klopp") }.to raise_error(Chef::Exceptions::ResourceNotFound)
+        expect { run_context.resource_collection.resources(zen_master: "klopp") }.to raise_error(Chef::Exceptions::ResourceNotFound)
       end
     end
 
@@ -238,7 +238,7 @@ describe Chef::Recipe do
 
       it "adds the resource to the resource collection" do
         zm_resource # force let binding evaluation
-        expect(run_context.resource_collection.resources(:zen_master => "klopp")).to eq(zm_resource)
+        expect(run_context.resource_collection.resources(zen_master: "klopp")).to eq(zm_resource)
       end
 
       it "will insert another resource if create_if_missing is not set (cloned resource as of Chef-12)" do
@@ -339,7 +339,7 @@ describe Chef::Recipe do
     describe "resource definitions" do
       it "should execute defined resources" do
         crow_define = Chef::ResourceDefinition.new
-        crow_define.define :crow, :peace => false, :something => true do
+        crow_define.define :crow, peace: false, something: true do
           zen_master "lao tzu" do
             peace params[:peace]
             something params[:something]
@@ -349,13 +349,13 @@ describe Chef::Recipe do
         recipe.crow "mine" do
           peace true
         end
-        expect(run_context.resource_collection.resources(:zen_master => "lao tzu").name).to eql("lao tzu")
-        expect(run_context.resource_collection.resources(:zen_master => "lao tzu").something).to eql(true)
+        expect(run_context.resource_collection.resources(zen_master: "lao tzu").name).to eql("lao tzu")
+        expect(run_context.resource_collection.resources(zen_master: "lao tzu").something).to eql(true)
       end
 
       it "should set the node on defined resources" do
         crow_define = Chef::ResourceDefinition.new
-        crow_define.define :crow, :peace => false, :something => true do
+        crow_define.define :crow, peace: false, something: true do
           zen_master "lao tzu" do
             peace params[:peace]
             something params[:something]
@@ -366,12 +366,12 @@ describe Chef::Recipe do
         recipe.crow "mine" do
           something node[:foo]
         end
-        expect(recipe.resources(:zen_master => "lao tzu").something).to eql(false)
+        expect(recipe.resources(zen_master: "lao tzu").something).to eql(false)
       end
 
       it "should return the last statement in the definition as the retval" do
         crow_define = Chef::ResourceDefinition.new
-        crow_define.define :crow, :peace => false, :something => true do
+        crow_define.define :crow, peace: false, something: true do
           "the return val"
         end
         run_context.definitions[:crow] = crow_define
@@ -392,7 +392,7 @@ describe Chef::Recipe do
   end
   CODE
       expect { recipe.instance_eval(code) }.not_to raise_error
-      expect(recipe.resources(:zen_master => "gnome").name).to eql("gnome")
+      expect(recipe.resources(zen_master: "gnome").name).to eql("gnome")
     end
   end
 
@@ -408,7 +408,7 @@ describe Chef::Recipe do
   describe "from_file" do
     it "should load a resource from a ruby file" do
       recipe.from_file(File.join(CHEF_SPEC_DATA, "recipes", "test.rb"))
-      res = recipe.resources(:file => "/etc/nsswitch.conf")
+      res = recipe.resources(file: "/etc/nsswitch.conf")
       expect(res.name).to eql("/etc/nsswitch.conf")
       expect(res.action).to eql([:create])
       expect(res.owner).to eql("root")
@@ -426,7 +426,7 @@ describe Chef::Recipe do
       expect(node).to receive(:loaded_recipe).with(:openldap, "gigantor")
       allow(run_context).to receive(:unreachable_cookbook?).with(:openldap).and_return(false)
       run_context.include_recipe "openldap::gigantor"
-      res = run_context.resource_collection.resources(:cat => "blanket")
+      res = run_context.resource_collection.resources(cat: "blanket")
       expect(res.name).to eql("blanket")
       expect(res.pretty_kitty).to eql(false)
     end
@@ -435,7 +435,7 @@ describe Chef::Recipe do
       expect(node).to receive(:loaded_recipe).with(:openldap, "default")
       allow(run_context).to receive(:unreachable_cookbook?).with(:openldap).and_return(false)
       run_context.include_recipe "openldap"
-      res = run_context.resource_collection.resources(:cat => "blanket")
+      res = run_context.resource_collection.resources(cat: "blanket")
       expect(res.name).to eql("blanket")
       expect(res.pretty_kitty).to eql(true)
     end

data/spec/unit/resource/chocolatey_config_spec.rb

@@ -0,0 +1,98 @@
+#
+# Copyright:: Copyright 2018, 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 "spec_helper"
+
+describe Chef::Resource::ChocolateyConfig do
+
+  let(:resource) { Chef::Resource::ChocolateyConfig.new("fakey_fakerton") }
+  let(:config) do
+    <<-CONFIG
+  <?xml version="1.0" encoding="utf-8"?>
+  <chocolatey xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <config>
+      <add key="containsLegacyPackageInstalls" value="true" description="Install has packages installed prior to 0.9.9 series." />
+    </config>
+    <sources>
+      <source id="chocolatey" value="https://chocolatey.org/api/v2/" disabled="false" bypassProxy="false" selfService="false" adminOnly="false" priority="0" />
+    </sources>
+    <features>
+      <feature name="checksumFiles" enabled="true" setExplicitly="false" description="Checksum files when pulled in from internet (based on package)." />
+    </features>
+    <apiKeys />
+  </chocolatey>
+CONFIG
+  end
+
+  # 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'
+  end
+
+  after(:each) do
+    ENV.clear
+    ENV.update(@original_env)
+  end
+
+  it "has a resource name of :chocolatey_config" do
+    expect(resource.resource_name).to eql(:chocolatey_config)
+  end
+
+  it "is not a preview resource in Chef 15" do
+    pending("Chef 15") unless Chef::VERSION.start_with?("15")
+    expect(resource.class.preview_resource).to be_falsey
+  end
+
+  it "has a name property of config_key" do
+    expect(resource.config_key).to eql("fakey_fakerton")
+  end
+
+  it "sets the default action as :set" do
+    expect(resource.action).to eql([:set])
+  end
+
+  it "supports :set and :unset actions" do
+    expect { resource.action :set }.not_to raise_error
+    expect { resource.action :unset }.not_to raise_error
+  end
+
+  it "bypass_proxy property defaults to false" do
+    expect { resource.bypass_proxy.to be_false }
+  end
+
+  describe "#fetch_config_element" do
+    it "raises and error if the config file cannot be found" do
+      allow(::File).to receive(:exist?).with('C:\ProgramData\chocolatey\config\chocolatey.config').and_return(false)
+      expect { resource.fetch_config_element("foo") }.to raise_error(RuntimeError)
+    end
+
+    it "returns the value if present in the config file" do
+      allow(::File).to receive(:exist?).with('C:\ProgramData\chocolatey\config\chocolatey.config').and_return(true)
+      allow(::File).to receive(:read).with('C:\ProgramData\chocolatey\config\chocolatey.config').and_return(config)
+      expect(resource.fetch_config_element("containsLegacyPackageInstalls")).to eq("true")
+      expect { resource.fetch_config_element("foo") }.not_to raise_error
+    end
+
+    it "returns nil if the element is not present in the config file" do
+      allow(::File).to receive(:exist?).with('C:\ProgramData\chocolatey\config\chocolatey.config').and_return(true)
+      allow(::File).to receive(:read).with('C:\ProgramData\chocolatey\config\chocolatey.config').and_return(config)
+      expect(resource.fetch_config_element("foo")).to be_nil
+      expect { resource.fetch_config_element("foo") }.not_to raise_error
+    end
+  end
+end

data/spec/unit/resource/chocolatey_source_spec.rb

@@ -0,0 +1,102 @@
+#
+# Copyright:: Copyright 2018, 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 "spec_helper"
+
+describe Chef::Resource::ChocolateySource do
+
+  let(:resource) { Chef::Resource::ChocolateySource.new("fakey_fakerton") }
+  let(:config) do
+    <<-CONFIG
+  <?xml version="1.0" encoding="utf-8"?>
+  <chocolatey xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <config>
+      <add key="containsLegacyPackageInstalls" value="true" description="Install has packages installed prior to 0.9.9 series." />
+    </config>
+    <sources>
+      <source id="chocolatey" value="https://chocolatey.org/api/v2/" disabled="false" bypassProxy="false" selfService="false" adminOnly="false" priority="0" />
+    </sources>
+    <features>
+      <feature name="checksumFiles" enabled="true" setExplicitly="false" description="Checksum files when pulled in from internet (based on package)." />
+    </features>
+    <apiKeys />
+  </chocolatey>
+CONFIG
+  end
+
+  # 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'
+  end
+
+  after(:each) do
+    ENV.clear
+    ENV.update(@original_env)
+  end
+
+  it "has a resource name of :chocolatey_source" do
+    expect(resource.resource_name).to eql(:chocolatey_source)
+  end
+
+  it "is not a preview resource in Chef 15" do
+    pending("Chef 15") unless Chef::VERSION.start_with?("15")
+    expect(resource.class.preview_resource).to be_falsey
+  end
+
+  it "has a name property of source_name" do
+    expect(resource.source_name).to eql("fakey_fakerton")
+  end
+
+  it "sets the default action as :add" do
+    expect(resource.action).to eql([:add])
+  end
+
+  it "supports :add and :remove actions" do
+    expect { resource.action :add }.not_to raise_error
+    expect { resource.action :remove }.not_to raise_error
+  end
+
+  it "bypass_proxy property defaults to false" do
+    expect { resource.bypass_proxy.to be_false }
+  end
+
+  it "priority property defaults to 0" do
+    expect { resource.priority.to eq(0) }
+  end
+
+  describe "#fetch_source_element" do
+    it "raises and error if the config file cannot be found" do
+      allow(::File).to receive(:exist?).with('C:\ProgramData\chocolatey\config\chocolatey.config').and_return(false)
+      expect { resource.fetch_source_element("foo") }.to raise_error(RuntimeError)
+    end
+
+    it "returns the value if present in the config file" do
+      allow(::File).to receive(:exist?).with('C:\ProgramData\chocolatey\config\chocolatey.config').and_return(true)
+      allow(::File).to receive(:read).with('C:\ProgramData\chocolatey\config\chocolatey.config').and_return(config)
+      expect(resource.fetch_source_element("chocolatey")["value"]).to eq("https://chocolatey.org/api/v2/")
+      expect { resource.fetch_source_element("foo") }.not_to raise_error
+    end
+
+    it "returns nil if the element is not present in the config file" do
+      allow(::File).to receive(:exist?).with('C:\ProgramData\chocolatey\config\chocolatey.config').and_return(true)
+      allow(::File).to receive(:read).with('C:\ProgramData\chocolatey\config\chocolatey.config').and_return(config)
+      expect(resource.fetch_source_element("foo")).to be_nil
+      expect { resource.fetch_source_element("foo") }.not_to raise_error
+    end
+  end
+end