chef 15.1.36-universal-mingw32 → 15.2.20-universal-mingw32

data/spec/unit/provider/template/content_spec.rb

@@ -30,20 +30,20 @@ describe Chef::Provider::Template::Content do
 
   let(:new_resource) do
     double("Chef::Resource::Template (new)",
-         cookbook_name: "openldap",
-         recipe_name: "default",
-         source_line: "/Users/lamont/solo/cookbooks/openldap/recipes/default.rb:2:in `from_file'",
-         source_line_file: "/Users/lamont/solo/cookbooks/openldap/recipes/default.rb",
-         source_line_number: "2",
-         source: "openldap_stuff.conf.erb",
-         name: "openldap_stuff.conf",
-         path: resource_path,
-         local: false,
-         cookbook: nil,
-         variables: {},
-         inline_helper_blocks: {},
-         inline_helper_modules: [],
-         helper_modules: [])
+      cookbook_name: "openldap",
+      recipe_name: "default",
+      source_line: "/Users/lamont/solo/cookbooks/openldap/recipes/default.rb:2:in `from_file'",
+      source_line_file: "/Users/lamont/solo/cookbooks/openldap/recipes/default.rb",
+      source_line_number: "2",
+      source: "openldap_stuff.conf.erb",
+      name: "openldap_stuff.conf",
+      path: resource_path,
+      local: false,
+      cookbook: nil,
+      variables: {},
+      inline_helper_blocks: {},
+      inline_helper_modules: [],
+      helper_modules: [])
   end
 
   let(:rendered_file_locations) do
@@ -130,20 +130,20 @@ describe Chef::Provider::Template::Content do
   describe "when using location helpers" do
     let(:new_resource) do
       double("Chef::Resource::Template (new)",
-             cookbook_name: "openldap",
-             recipe_name: "default",
-             source_line: CHEF_SPEC_DATA + "/cookbooks/openldap/recipes/default.rb:2:in `from_file'",
-             source_line_file: CHEF_SPEC_DATA + "/cookbooks/openldap/recipes/default.rb",
-             source_line_number: "2",
-             source: "helpers.erb",
-             name: "helpers.erb",
-             path: CHEF_SPEC_DATA + "/cookbooks/openldap/templates/default/helpers.erb",
-             local: false,
-             cookbook: nil,
-             variables: {},
-             inline_helper_blocks: {},
-             inline_helper_modules: [],
-             helper_modules: [])
+        cookbook_name: "openldap",
+        recipe_name: "default",
+        source_line: CHEF_SPEC_DATA + "/cookbooks/openldap/recipes/default.rb:2:in `from_file'",
+        source_line_file: CHEF_SPEC_DATA + "/cookbooks/openldap/recipes/default.rb",
+        source_line_number: "2",
+        source: "helpers.erb",
+        name: "helpers.erb",
+        path: CHEF_SPEC_DATA + "/cookbooks/openldap/templates/default/helpers.erb",
+        local: false,
+        cookbook: nil,
+        variables: {},
+        inline_helper_blocks: {},
+        inline_helper_modules: [],
+        helper_modules: [])
     end
 
     it "creates the template with the rendered content" do

data/spec/unit/provider/windows_task_spec.rb

@@ -20,7 +20,7 @@ require "spec_helper"
 
 describe Chef::Provider::WindowsTask, :windows_only do
   let(:new_resource) { Chef::Resource::WindowsTask.new("sample_task") }
-  let(:current_resource) { Chef::Resource::WindowsTask.new() }
+  let(:current_resource) { Chef::Resource::WindowsTask.new }
 
   let(:provider) do
     node = Chef::Node.new
@@ -265,11 +265,16 @@ describe Chef::Provider::WindowsTask, :windows_only do
 
   # REF: https://msdn.microsoft.com/en-us/library/windows/desktop/aa382063(v=vs.85).aspx
   describe "#days_of_month" do
-    it "returns the binary value 1 if day is set as 1" do
+    it "returns the binary value 1 if day is set as string 1" do
       new_resource.day "1"
       expect(provider.send(:days_of_month)).to eq(1)
     end
 
+    it "returns the binary value 1 if day is set as integer 1" do
+      new_resource.day 1
+      expect(provider.send(:days_of_month)).to eq(1)
+    end
+
     it "returns the binary value 2 if day is set as 2" do
       new_resource.day "2"
       expect(provider.send(:days_of_month)).to eq(2)

data/spec/unit/provider_resolver_spec.rb

@@ -869,7 +869,7 @@ describe Chef::ProviderResolver do
     def self.create_provider_tests(providers, test, expected, filter)
       expected = expected.merge(providers.select { |key, value| key.is_a?(Symbol) })
       providers.each do |key, value|
-        if !key.is_a?(Symbol)
+        unless key.is_a?(Symbol)
           next_test = test.merge({ filter => key })
           next_filter =
             case filter
@@ -888,7 +888,7 @@ describe Chef::ProviderResolver do
         end
       end
       # If there is no filter, we're as deep as we need to go
-      if !filter
+      unless filter
         on_platform test.delete(:platform), test do
           expect_providers(expected)
         end

data/spec/unit/provider_spec.rb

@@ -24,8 +24,7 @@ class NoWhyrunDemonstrator < Chef::Provider
     false
   end
 
-  def load_current_resource
-  end
+  def load_current_resource; end
 
   def action_foo
     @system_state_altered = true
@@ -39,8 +38,7 @@ class ConvergeActionDemonstrator < Chef::Provider
     true
   end
 
-  def load_current_resource
-  end
+  def load_current_resource; end
 
   def action_foo
     converge_by("running a state changing action") do

data/spec/unit/recipe_spec.rb

@@ -94,7 +94,7 @@ describe Chef::Recipe do
           end
         end
 
-        expect(run_context.resource_collection.map { |r| r.name }).to eql(%w{monkey dog cat})
+        expect(run_context.resource_collection.map(&:name)).to eql(%w{monkey dog cat})
       end
 
       it "should return the new resource after creating it" do
@@ -115,7 +115,7 @@ describe Chef::Recipe do
           node.automatic[:platform_version] = "123"
           res = recipe.laughter "timmy"
           expect(res.name).to eql("timmy")
-          res.kind_of?(ShaunTheSheep)
+          res.is_a?(ShaunTheSheep)
         end
 
         it "locate a resource for all platforms" do
@@ -124,7 +124,7 @@ describe Chef::Recipe do
           YourMom.provides :love_and_caring
           res = recipe.love_and_caring "mommy"
           expect(res.name).to eql("mommy")
-          res.kind_of?(YourMom)
+          res.is_a?(YourMom)
         end
 
         describe "when there is more than one resource that resolves on a node" do

data/spec/unit/resource/batch_spec.rb

@@ -22,7 +22,7 @@ describe Chef::Resource::Batch do
   let(:node) { Chef::Node.new }
 
   before(:each) do
-    node.default["kernel"] = Hash.new
+    node.default["kernel"] = {}
     node.default["kernel"][:machine] = :x86_64.to_s
     node.automatic[:os] = "windows"
 

data/spec/unit/resource/cab_package_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Vasundhara Jagdale (<vasundhara.jagdale@msystechnologies.com>)
-# Copyright:: Copyright 2008-2016, Chef Software, Inc.
+# Copyright:: Copyright 2008-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/unit/resource/chef_gem_spec.rb

@@ -53,7 +53,7 @@ describe Chef::Resource::ChefGem, "gem_binary" do
   end
 
   it "sets the gem_binary based on computing it from RbConfig" do
-    expect(resource.gem_binary).to eql("#{RbConfig::CONFIG['bindir']}/gem")
+    expect(resource.gem_binary).to eql("#{RbConfig::CONFIG["bindir"]}/gem")
   end
 
   it "sets compile_time to false by default" do

data/spec/unit/resource/directory_spec.rb

@@ -38,7 +38,7 @@ describe Chef::Resource::Directory do
   it "accepts a string as the path" do
     expect { resource.path "/tmp" }.not_to raise_error
     expect(resource.path).to eql("/tmp")
-    expect { resource.path Hash.new }.to raise_error(ArgumentError)
+    expect { resource.path({}) }.to raise_error(ArgumentError)
   end
 
   it "allows you to have specify whether the action is recursive with true/false" do

data/spec/unit/resource/dnf_package_spec.rb

@@ -64,7 +64,7 @@ describe Chef::Resource::DnfPackage, "flush_cache" do
   end
 
   it "allows you to set the flush timing with an array" do
-    flush_array = [ :before, :after ]
+    flush_array = %i{before after}
     flush_hash = { before: true, after: true }
     resource.flush_cache(flush_array)
     expect(resource.flush_cache).to eq(flush_hash)

data/spec/unit/resource/dsc_resource_spec.rb

@@ -41,7 +41,7 @@ describe Chef::Resource::DscResource do
     end
 
     it "has an ed_actions property with only the `:run` and `:nothing` properties" do
-      expect(dsc_test_resource.allowed_actions.to_set).to eq([:run, :nothing].to_set)
+      expect(dsc_test_resource.allowed_actions.to_set).to eq(%i{run nothing}.to_set)
     end
 
     it "allows the resource property to be set" do

data/spec/unit/resource/file/verification_spec.rb

@@ -128,8 +128,7 @@ describe Chef::Resource::File::Verification do
       before(:each) do
         class Chef::Resource::File::Verification::Turtle < Chef::Resource::File::Verification
           provides :cats
-          def verify(path, opts)
-          end
+          def verify(path, opts); end
         end
         allow(Chef::Resource::File::Verification::Turtle).to receive(:new).and_return(registered_verification)
       end

data/spec/unit/resource/file_spec.rb

@@ -85,7 +85,7 @@ describe Chef::Resource::File do
   it "accepts a string as the path" do
     expect { resource.path "/tmp" }.not_to raise_error
     expect(resource.path).to eql("/tmp")
-    expect { resource.path Hash.new }.to raise_error(ArgumentError)
+    expect { resource.path({}) }.to raise_error(ArgumentError)
   end
 
   describe "when it has a path, owner, group, mode, and checksum" do

data/spec/unit/resource/group_spec.rb

@@ -96,7 +96,7 @@ end
 describe Chef::Resource::Group, "members" do
   let(:resource) { Chef::Resource::Group.new("fakey_fakerton") }
 
-  [ :users, :members].each do |method|
+  %i{users members}.each do |method|
     it "(#{method}) allows a String and coerces it to an Array" do
       resource.send(method, "some_user")
       expect(resource.send(method)).to eql(["some_user"])

data/spec/unit/resource/kernel_module_spec.rb

@@ -36,6 +36,7 @@ describe Chef::Resource::KernelModule 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 :disable }.not_to raise_error
     expect { resource.action :load }.not_to raise_error
     expect { resource.action :unload }.not_to raise_error
     expect { resource.action :delete }.to raise_error(ArgumentError)

data/spec/unit/resource/link_spec.rb

@@ -63,7 +63,7 @@ describe Chef::Resource::Link do
   end
 
   it "does not accept a Hash for the link source via 'to'" do
-    expect { resource.to Hash.new }.to raise_error(ArgumentError)
+    expect { resource.to({}) }.to raise_error(ArgumentError)
   end
 
   it "allows you to set a link source via 'to'" do

data/spec/unit/resource/locale_spec.rb

@@ -91,7 +91,7 @@ describe Chef::Resource::Locale do
       end
       context "without lang" do
         it "returns an empty array" do
-          resource.lang()
+          resource.lang
           resource.lc_env({ "LC_TIME" => "en_AG.utf8", "LC_MESSAGES" => "en_AG.utf8" })
           expect(provider.unavailable_locales).to eq([])
         end
@@ -99,14 +99,14 @@ describe Chef::Resource::Locale do
       context "without lc_env" do
         it "returns an empty array" do
           resource.lang("en_US")
-          resource.lc_env()
+          resource.lc_env
           expect(provider.unavailable_locales).to eq([])
         end
       end
       context "without both" do
         it "returns an empty array" do
-          resource.lang()
-          resource.lc_env()
+          resource.lang
+          resource.lc_env
           expect(provider.unavailable_locales).to eq([])
         end
       end
@@ -122,7 +122,7 @@ describe Chef::Resource::Locale do
       end
       context "without lang" do
         it "returns list" do
-          resource.lang()
+          resource.lang
           resource.lc_env({ "LC_TIME" => "en_AG.utf8", "LC_MESSAGES" => "en_US.utf8" })
           expect(provider.unavailable_locales).to eq(["en_US.utf8"])
         end
@@ -130,14 +130,14 @@ describe Chef::Resource::Locale do
       context "without lc_env" do
         it "returns list" do
           resource.lang("de_DE")
-          resource.lc_env()
+          resource.lc_env
           expect(provider.unavailable_locales).to eq(["de_DE"])
         end
       end
       context "without both" do
         it "returns an empty array" do
-          resource.lang()
-          resource.lc_env()
+          resource.lang
+          resource.lc_env
           expect(provider.unavailable_locales).to eq([])
         end
       end
@@ -166,7 +166,7 @@ describe Chef::Resource::Locale do
     end
     context "without lang" do
       it "returns a valid string" do
-        resource.lang()
+        resource.lang
         resource.lc_env({ "LC_TIME" => "en_AG.utf8", "LC_MESSAGES" => "en_AG.utf8" })
         expect(provider.new_content).to eq("LC_MESSAGES=en_AG.utf8\nLC_TIME=en_AG.utf8\n")
       end
@@ -174,14 +174,14 @@ describe Chef::Resource::Locale do
     context "without lc_env" do
       it "returns a valid string" do
         resource.lang("en_US")
-        resource.lc_env()
+        resource.lc_env
         expect(provider.new_content).to eq("LANG=en_US\n")
       end
     end
     context "without both" do
       it "returns string with only new-line character" do
-        resource.lang()
-        resource.lc_env()
+        resource.lang
+        resource.lc_env
         expect(provider.new_content).to eq("\n")
       end
     end

data/spec/unit/resource/osx_profile_spec.rb

@@ -21,7 +21,8 @@ require "spec_helper"
 describe Chef::Resource::OsxProfile do
   let(:resource) do
     Chef::Resource::OsxProfile.new(
-    "fakey_fakerton")
+      "fakey_fakerton"
+    )
   end
 
   it "has a resource name of profile" do

data/spec/unit/resource/powershell_script_spec.rb

@@ -23,7 +23,7 @@ describe Chef::Resource::PowershellScript do
   before(:each) do
     node = Chef::Node.new
 
-    node.default["kernel"] = Hash.new
+    node.default["kernel"] = {}
     node.default["kernel"][:machine] = :x86_64.to_s
     node.automatic[:os] = "windows"
 
@@ -61,7 +61,7 @@ describe Chef::Resource::PowershellScript do
 
     it "inherits exactly the :cwd, :environment, :group, :path, :user, :umask, :architecture, :elevated properties from a parent resource class" do
       inherited_difference = Chef::Resource::PowershellScript.guard_inherited_attributes -
-        [:cwd, :environment, :group, :path, :user, :umask, :architecture, :elevated ]
+        %i{cwd environment group path user umask architecture elevated}
 
       expect(inherited_difference).to eq([])
     end
@@ -87,7 +87,8 @@ describe Chef::Resource::PowershellScript do
     it "enables convert_boolean_return by default for guards in the context of powershell_script when no guard params are specified" do
       allow_any_instance_of(Chef::GuardInterpreter::ResourceGuardInterpreter).to receive(:evaluate_action).and_return(true)
       allow_any_instance_of(Chef::GuardInterpreter::ResourceGuardInterpreter).to receive(:block_from_attributes).with(
-        { convert_boolean_return: true, code: "$true" }).and_return(Proc.new {})
+        { convert_boolean_return: true, code: "$true" }
+      ).and_return(Proc.new {})
       resource.only_if("$true")
     end
 
@@ -98,21 +99,24 @@ describe Chef::Resource::PowershellScript do
       file_resource.guard_interpreter :powershell_script
 
       allow_any_instance_of(Chef::GuardInterpreter::ResourceGuardInterpreter).to receive(:block_from_attributes).with(
-        { convert_boolean_return: true, code: "$true" }).and_return(Proc.new {})
+        { convert_boolean_return: true, code: "$true" }
+      ).and_return(Proc.new {})
       resource.only_if("$true")
     end
 
     it "enables convert_boolean_return by default for guards in the context of powershell_script when guard params are specified" do
       guard_parameters = { cwd: "/etc/chef", architecture: :x86_64 }
       allow_any_instance_of(Chef::GuardInterpreter::ResourceGuardInterpreter).to receive(:block_from_attributes).with(
-        { convert_boolean_return: true, code: "$true" }.merge(guard_parameters)).and_return(Proc.new {})
+        { convert_boolean_return: true, code: "$true" }.merge(guard_parameters)
+      ).and_return(Proc.new {})
       resource.only_if("$true", guard_parameters)
     end
 
     it "passes convert_boolean_return as true if it was specified as true in a guard parameter" do
       guard_parameters = { cwd: "/etc/chef", convert_boolean_return: true, architecture: :x86_64 }
       allow_any_instance_of(Chef::GuardInterpreter::ResourceGuardInterpreter).to receive(:block_from_attributes).with(
-        { convert_boolean_return: true, code: "$true" }.merge(guard_parameters)).and_return(Proc.new {})
+        { convert_boolean_return: true, code: "$true" }.merge(guard_parameters)
+      ).and_return(Proc.new {})
       resource.only_if("$true", guard_parameters)
     end
 
@@ -120,7 +124,8 @@ describe Chef::Resource::PowershellScript do
       other_guard_parameters = { cwd: "/etc/chef", architecture: :x86_64 }
       parameters_with_boolean_disabled = other_guard_parameters.merge({ convert_boolean_return: false, code: "$true" })
       allow_any_instance_of(Chef::GuardInterpreter::ResourceGuardInterpreter).to receive(:block_from_attributes).with(
-        parameters_with_boolean_disabled).and_return(Proc.new {})
+        parameters_with_boolean_disabled
+      ).and_return(Proc.new {})
       resource.only_if("$true", parameters_with_boolean_disabled)
     end
   end

data/spec/unit/resource/registry_key_spec.rb

@@ -152,7 +152,7 @@ describe Chef::Resource::RegistryKey, "recursive" do
   end
 
   it "does not allow an array" do
-    expect { resource.recursive([:nose, :chin]) }.to raise_error(ArgumentError)
+    expect { resource.recursive(%i{nose chin}) }.to raise_error(ArgumentError)
   end
 
   it "does not allow a string" do
@@ -167,7 +167,7 @@ end
 describe Chef::Resource::RegistryKey, "architecture" do
   let(:resource) { Chef::Resource::RegistryKey.new('HKCU\Software\Raxicoricofallapatorius') }
 
-  [ :i386, :x86_64, :machine ].each do |arch|
+  %i{i386 x86_64 machine}.each do |arch|
     it "allows #{arch} as a symbol" do
       resource.architecture(arch)
       expect(resource.architecture).to eql(arch)
@@ -183,7 +183,7 @@ describe Chef::Resource::RegistryKey, "architecture" do
   end
 
   it "does not allow an array" do
-    expect { resource.architecture([:nose, :chin]) }.to raise_error(ArgumentError)
+    expect { resource.architecture(%i{nose chin}) }.to raise_error(ArgumentError)
   end
 
   it "does not allow a string" do