chef 17.8.25-universal-mingw32 → 17.9.46-universal-mingw32

data/spec/integration/client/client_spec.rb

@@ -22,7 +22,7 @@ describe "chef-client" do
     # just a normal file
     # (expected_content should be uncompressed)
     @api.get("/recipes.tgz", 200) do
-      File.open(recipes_filename, "rb", &:read)
+      File.binread(recipes_filename)
     end
   end
 

data/spec/spec_helper.rb

@@ -78,9 +78,9 @@ require "spec/support/recipe_dsl_helper"
 # Excludes support/platforms by default
 # Do not change the gsub.
 Dir["spec/support/**/*.rb"]
-  .reject { |f| f =~ %r{^spec/support/platforms} }
-  .reject { |f| f =~ %r{^spec/support/pedant} }
-  .reject { |f| f =~ %r{^spec/support/shared/integration/knife_support} }
+  .grep_v(%r{^spec/support/platforms})
+  .grep_v(%r{^spec/support/pedant})
+  .grep_v(%r{^spec/support/shared/integration/knife_support})
   .map { |f| f.gsub(/.rb$/, "") }
   .map { |f| f.gsub(%r{spec/}, "") }
   .each { |f| require f }
@@ -187,8 +187,6 @@ RSpec.configure do |config|
   config.filter_run_excluding not_rhel7: true if rhel7?
   config.filter_run_excluding not_intel_64bit: true if intel_64bit?
 
-  config.filter_run_excluding libarchive_loading_broken: true if aix? || amazon_linux? || rhel7?
-
   # these let us use chef: ">= 13" or ruby: "~> 2.0.0" or any other Gem::Dependency-style constraint
   config.filter_run_excluding chef: DependencyProc.with(Chef::VERSION)
   config.filter_run_excluding ruby: DependencyProc.with(RUBY_VERSION)

data/spec/support/platform_helpers.rb

@@ -172,7 +172,7 @@ def wpar?
 end
 
 def supports_cloexec?
-  Fcntl.const_defined?("F_SETFD") && Fcntl.const_defined?("FD_CLOEXEC")
+  Fcntl.const_defined?(:F_SETFD) && Fcntl.const_defined?(:FD_CLOEXEC)
 end
 
 def selinux_enabled?

data/spec/support/ruby_installer.rb

@@ -48,4 +48,4 @@ rescue LoadError
   $stderr.puts "Failed to load ruby_installer. Assuming Ruby Installer is not being used."
 end
 
-add_libarchive_dll_directory if RUBY_PLATFORM =~ /mswin|mingw32|windows/
+add_libarchive_dll_directory if RUBY_PLATFORM.match?(/mswin|mingw32|windows/)

data/spec/support/shared/functional/file_resource.rb

@@ -157,7 +157,7 @@ shared_examples_for "a file with the wrong content" do
 
         context "when running :create action" do
           let(:provider) { resource.provider_for_action(:create) }
-          let(:reporter_messages) { provider.instance_variable_get("@converge_actions").actions[0][0] }
+          let(:reporter_messages) { provider.instance_variable_get(:@converge_actions).actions[0][0] }
 
           before do
             provider.run_action
@@ -391,7 +391,7 @@ shared_examples_for "a configured file resource" do
   end
 
   def binread(file)
-    content = File.open(file, "rb", &:read)
+    content = File.binread(file)
     content.force_encoding(Encoding::BINARY) if "".respond_to?(:force_encoding)
     content
   end

data/spec/support/shared/functional/http.rb

@@ -30,7 +30,7 @@ module ChefHTTPShared
   end
 
   def binread(file)
-    content = File.open(file, "rb", &:read)
+    content = File.binread(file)
     content.force_encoding(Encoding::BINARY) if "".respond_to?(:force_encoding)
     content
   end
@@ -51,19 +51,19 @@ module ChefHTTPShared
     # just a normal file
     # (expected_content should be uncompressed)
     @api.get("/nyan_cat.png", 200) do
-      File.open(nyan_uncompressed_filename, "rb", &:read)
+      File.binread(nyan_uncompressed_filename)
     end
 
     # this ends in .gz, we do not uncompress it and drop it on the filesystem as a .gz file (the internet often lies)
     # (expected_content should be compressed)
     @api.get("/nyan_cat.png.gz", 200, nil, { "Content-Type" => "application/gzip", "Content-Encoding" => "gzip" } ) do
-      File.open(nyan_compressed_filename, "rb", &:read)
+      File.binread(nyan_compressed_filename)
     end
 
     # this is an uncompressed file that was compressed by some mod_gzip-ish webserver thingy, so we will expand it
     # (expected_content should be uncompressed)
     @api.get("/nyan_cat_compressed.png", 200, nil, { "Content-Type" => "application/gzip", "Content-Encoding" => "gzip" } ) do
-      File.open(nyan_compressed_filename, "rb", &:read)
+      File.binread(nyan_compressed_filename)
     end
 
     #
@@ -75,7 +75,7 @@ module ChefHTTPShared
       {
         "Content-Length" => nyan_uncompressed_size.to_s,
       }) do
-        File.open(nyan_uncompressed_filename, "rb", &:read)
+        File.binread(nyan_uncompressed_filename)
       end
 
     # (expected_content should be uncompressed)
@@ -85,7 +85,7 @@ module ChefHTTPShared
         "Content-Type" => "application/gzip",
         "Content-Encoding" => "gzip",
       }) do
-        File.open(nyan_compressed_filename, "rb", &:read)
+        File.binread(nyan_compressed_filename)
       end
 
     #
@@ -97,7 +97,7 @@ module ChefHTTPShared
       {
         "Content-Length" => (nyan_uncompressed_size + 1).to_s,
       }) do
-        File.open(nyan_uncompressed_filename, "rb", &:read)
+        File.binread(nyan_uncompressed_filename)
       end
 
     # (expected_content should be uncompressed)
@@ -107,7 +107,7 @@ module ChefHTTPShared
         "Content-Type" => "application/gzip",
         "Content-Encoding" => "gzip",
       }) do
-        File.open(nyan_compressed_filename, "rb", &:read)
+        File.binread(nyan_compressed_filename)
       end
 
     #
@@ -120,7 +120,7 @@ module ChefHTTPShared
         "Content-Length" => (nyan_uncompressed_size + 1).to_s,
         "Transfer-Encoding" => "anything",
       }) do
-        File.open(nyan_uncompressed_filename, "rb", &:read)
+        File.binread(nyan_uncompressed_filename)
       end
 
     #

data/spec/support/shared/unit/provider/useradd_based_user_provider.rb

@@ -169,7 +169,7 @@ shared_examples_for "a useradd-based user provider" do |supported_useradd_option
       before do
         provider.new_resource.system true
         # there is no public API to set attribute's value to nil
-        provider.new_resource.instance_variable_set("@home", nil)
+        provider.new_resource.instance_variable_set(:@home, nil)
       end
 
       it "should not include -m or -d in the command options" do

data/spec/unit/dsl/registry_helper_spec.rb

@@ -31,22 +31,22 @@ describe Chef::Resource::RegistryKey do
 
   context "tests registry dsl" do
     it "resource can access registry_helper method registry_key_exists" do
-      expect(@resource.respond_to?("registry_key_exists?")).to eq(true)
+      expect(@resource.respond_to?(:registry_key_exists?)).to eq(true)
     end
     it "resource can access registry_helper method registry_get_values" do
-      expect(@resource.respond_to?("registry_get_values")).to eq(true)
+      expect(@resource.respond_to?(:registry_get_values)).to eq(true)
     end
     it "resource can access registry_helper method registry_has_subkey" do
-      expect(@resource.respond_to?("registry_has_subkeys?")).to eq(true)
+      expect(@resource.respond_to?(:registry_has_subkeys?)).to eq(true)
     end
     it "resource can access registry_helper method registry_get_subkeys" do
-      expect(@resource.respond_to?("registry_get_subkeys")).to eq(true)
+      expect(@resource.respond_to?(:registry_get_subkeys)).to eq(true)
     end
     it "resource can access registry_helper method registry_value_exists" do
-      expect(@resource.respond_to?("registry_value_exists?")).to eq(true)
+      expect(@resource.respond_to?(:registry_value_exists?)).to eq(true)
     end
     it "resource can access registry_helper method data_value_exists" do
-      expect(@resource.respond_to?("registry_data_exists?")).to eq(true)
+      expect(@resource.respond_to?(:registry_data_exists?)).to eq(true)
     end
   end
 end

data/spec/unit/guard_interpreter/resource_guard_interpreter_spec.rb

@@ -94,7 +94,7 @@ describe Chef::GuardInterpreter::ResourceGuardInterpreter do
 
     describe "script command opts switch" do
       let(:guard_interpreter) { Chef::GuardInterpreter::ResourceGuardInterpreter.new(parent_resource, "exit 0", {}) }
-      let(:resource) { guard_interpreter.instance_variable_get("@resource") }
+      let(:resource) { guard_interpreter.instance_variable_get(:@resource) }
 
       context "resource is a Script" do
         context "and guard_interpreter is a :script" do

data/spec/unit/lwrp_spec.rb

@@ -54,7 +54,7 @@ describe "LWRP" do
     end
 
     it "should not skip loading a resource when there's a top level symbol of the same name" do
-      Object.const_set("LwrpFoo", Class.new)
+      Object.const_set(:LwrpFoo, Class.new)
       file = File.expand_path( "lwrp/resources/foo.rb", CHEF_SPEC_DATA)
       expect(Chef::Log).not_to receive(:info).with(/Skipping/)
       expect(Chef::Log).not_to receive(:trace).with(/anymore/)
@@ -63,7 +63,7 @@ describe "LWRP" do
     end
 
     it "should not skip loading a provider when there's a top level symbol of the same name" do
-      Object.const_set("LwrpBuckPasser", Class.new)
+      Object.const_set(:LwrpBuckPasser, Class.new)
       file = File.expand_path( "lwrp/providers/buck_passer.rb", CHEF_SPEC_DATA)
       expect(Chef::Log).not_to receive(:info).with(/Skipping/)
       expect(Chef::Log).not_to receive(:trace).with(/anymore/)

data/spec/unit/provider/dsc_script_spec.rb

@@ -39,21 +39,21 @@ describe Chef::Provider::DscScript do
       it "describes the resource as converged if there were 0 DSC resources" do
         allow(provider).to receive(:run_configuration).with(:test).and_return([])
         provider.load_current_resource
-        expect(provider.instance_variable_get("@resource_converged")).to be_truthy
+        expect(provider.instance_variable_get(:@resource_converged)).to be_truthy
       end
 
       it "describes the resource as not converged if there is 1 DSC resources that is converged" do
         dsc_resource_info = Chef::Util::DSC::ResourceInfo.new("resource", false, ["nothing will change something"])
         allow(provider).to receive(:run_configuration).with(:test).and_return([dsc_resource_info])
         provider.load_current_resource
-        expect(provider.instance_variable_get("@resource_converged")).to be_truthy
+        expect(provider.instance_variable_get(:@resource_converged)).to be_truthy
       end
 
       it "describes the resource as not converged if there is 1 DSC resources that is not converged" do
         dsc_resource_info = Chef::Util::DSC::ResourceInfo.new("resource", true, ["will change something"])
         allow(provider).to receive(:run_configuration).with(:test).and_return([dsc_resource_info])
         provider.load_current_resource
-        expect(provider.instance_variable_get("@resource_converged")).to be_falsey
+        expect(provider.instance_variable_get(:@resource_converged)).to be_falsey
       end
 
       it "describes the resource as not converged if there are any DSC resources that are not converged" do
@@ -62,7 +62,7 @@ describe Chef::Provider::DscScript do
 
         allow(provider).to receive(:run_configuration).with(:test).and_return([dsc_resource_info1, dsc_resource_info2])
         provider.load_current_resource
-        expect(provider.instance_variable_get("@resource_converged")).to be_falsey
+        expect(provider.instance_variable_get(:@resource_converged)).to be_falsey
       end
 
       it "describes the resource as converged if all DSC resources that are converged" do
@@ -71,7 +71,7 @@ describe Chef::Provider::DscScript do
 
         allow(provider).to receive(:run_configuration).with(:test).and_return([dsc_resource_info1, dsc_resource_info2])
         provider.load_current_resource
-        expect(provider.instance_variable_get("@resource_converged")).to be_truthy
+        expect(provider.instance_variable_get(:@resource_converged)).to be_truthy
       end
     end
 
@@ -126,19 +126,19 @@ describe Chef::Provider::DscScript do
     describe "#generate_description" do
       it "removes the resource name from the beginning of any log line from the LCM" do
         dsc_resource_info = Chef::Util::DSC::ResourceInfo.new("resourcename", true, ["resourcename doing something", "lastline"])
-        provider.instance_variable_set("@dsc_resources_info", [dsc_resource_info])
+        provider.instance_variable_set(:@dsc_resources_info, [dsc_resource_info])
         expect(provider.send(:generate_description)[1]).to match(/converge DSC resource resourcename by doing something/)
       end
 
       it "ignores the last line" do
         dsc_resource_info = Chef::Util::DSC::ResourceInfo.new("resourcename", true, ["resourcename doing something", "lastline"])
-        provider.instance_variable_set("@dsc_resources_info", [dsc_resource_info])
+        provider.instance_variable_set(:@dsc_resources_info, [dsc_resource_info])
         expect(provider.send(:generate_description)[1]).not_to match(/lastline/)
       end
 
       it "reports a dsc resource has not been changed if the LCM reported no change was required" do
         dsc_resource_info = Chef::Util::DSC::ResourceInfo.new("resourcename", false, ["resourcename does nothing", "lastline"])
-        provider.instance_variable_set("@dsc_resources_info", [dsc_resource_info])
+        provider.instance_variable_set(:@dsc_resources_info, [dsc_resource_info])
         expect(provider.send(:generate_description)[1]).to match(/converge DSC resource resourcename by doing nothing/)
       end
     end

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

@@ -61,7 +61,7 @@ describe Chef::Provider::Group::Usermod do
         @provider.action = :modify
         @provider.define_resource_requirements
         @provider.load_current_resource
-        @provider.instance_variable_set("@group_exists", true)
+        @provider.instance_variable_set(:@group_exists, true)
         expect { @provider.run_action(@provider.process_resource_requirements) }.to raise_error(Chef::Exceptions::Group, "setting group members directly is not supported by #{@provider}, must set append true in group")
       end
 
@@ -69,7 +69,7 @@ describe Chef::Provider::Group::Usermod do
         @provider.action = :modify
         @provider.define_resource_requirements
         @provider.load_current_resource
-        @provider.instance_variable_set("@group_exists", true)
+        @provider.instance_variable_set(:@group_exists, true)
         @new_resource.append(true)
         @new_resource.excluded_members(["someone"])
         expect { @provider.run_action(@provider.process_resource_requirements) }.to raise_error(Chef::Exceptions::Group, "excluded_members is not supported by #{@provider}")

data/spec/unit/provider/ifconfig/aix_spec.rb

@@ -68,8 +68,8 @@ describe Chef::Provider::Ifconfig::Aix do
     it "should add an interface if it does not exist" do
       @new_resource.device "en10"
       allow(@provider).to receive(:load_current_resource) do
-        @provider.instance_variable_set("@status", double("Status", exitstatus: 0))
-        @provider.instance_variable_set("@current_resource", Chef::Resource::Ifconfig.new("10.0.0.1", @run_context))
+        @provider.instance_variable_set(:@status, double("Status", exitstatus: 0))
+        @provider.instance_variable_set(:@current_resource, Chef::Resource::Ifconfig.new("10.0.0.1", @run_context))
       end
       command = "chdev -l #{@new_resource.device} -a netaddr=#{@new_resource.name}"
       expect(@provider).to receive(:shell_out_compacted!).with(*command.split(" "))
@@ -82,8 +82,8 @@ describe Chef::Provider::Ifconfig::Aix do
       @new_resource.device "en0"
       @new_resource.metric "1"
       allow(@provider).to receive(:load_current_resource) do
-        @provider.instance_variable_set("@status", double("Status", exitstatus: 0))
-        @provider.instance_variable_set("@current_resource", Chef::Resource::Ifconfig.new("10.0.0.1", @run_context))
+        @provider.instance_variable_set(:@status, double("Status", exitstatus: 0))
+        @provider.instance_variable_set(:@current_resource, Chef::Resource::Ifconfig.new("10.0.0.1", @run_context))
       end
 
       expect { @provider.run_action(:add) }.to raise_error(Chef::Exceptions::Ifconfig, "interface metric property cannot be set for :add action")
@@ -94,8 +94,8 @@ describe Chef::Provider::Ifconfig::Aix do
     it "should enable an interface if it does not exist" do
       @new_resource.device "en10"
       allow(@provider).to receive(:load_current_resource) do
-        @provider.instance_variable_set("@status", double("Status", exitstatus: 0))
-        @provider.instance_variable_set("@current_resource", Chef::Resource::Ifconfig.new("10.0.0.1", @run_context))
+        @provider.instance_variable_set(:@status, double("Status", exitstatus: 0))
+        @provider.instance_variable_set(:@current_resource, Chef::Resource::Ifconfig.new("10.0.0.1", @run_context))
       end
       command = "ifconfig #{@new_resource.device} #{@new_resource.name}"
       expect(@provider).to receive(:shell_out_compacted!).with(*command.split(" "))
@@ -110,8 +110,8 @@ describe Chef::Provider::Ifconfig::Aix do
     it "should not disable an interface if it does not exist" do
       @new_resource.device "en10"
       allow(@provider).to receive(:load_current_resource) do
-        @provider.instance_variable_set("@status", double("Status", exitstatus: 0))
-        @provider.instance_variable_set("@current_resource", Chef::Resource::Ifconfig.new("10.0.0.1", @run_context))
+        @provider.instance_variable_set(:@status, double("Status", exitstatus: 0))
+        @provider.instance_variable_set(:@current_resource, Chef::Resource::Ifconfig.new("10.0.0.1", @run_context))
       end
 
       expect(@provider).not_to receive(:shell_out_compacted!)
@@ -124,10 +124,10 @@ describe Chef::Provider::Ifconfig::Aix do
       before do
         @new_resource.device "en10"
         allow(@provider).to receive(:load_current_resource) do
-          @provider.instance_variable_set("@status", double("Status", exitstatus: 0))
+          @provider.instance_variable_set(:@status, double("Status", exitstatus: 0))
           current_resource = Chef::Resource::Ifconfig.new("10.0.0.1", @run_context)
           current_resource.device @new_resource.device
-          @provider.instance_variable_set("@current_resource", current_resource)
+          @provider.instance_variable_set(:@current_resource, current_resource)
         end
       end
 
@@ -147,8 +147,8 @@ describe Chef::Provider::Ifconfig::Aix do
     it "should not delete an interface if it does not exist" do
       @new_resource.device "en10"
       allow(@provider).to receive(:load_current_resource) do
-        @provider.instance_variable_set("@status", double("Status", exitstatus: 0))
-        @provider.instance_variable_set("@current_resource", Chef::Resource::Ifconfig.new("10.0.0.1", @run_context))
+        @provider.instance_variable_set(:@status, double("Status", exitstatus: 0))
+        @provider.instance_variable_set(:@current_resource, Chef::Resource::Ifconfig.new("10.0.0.1", @run_context))
       end
 
       expect(@provider).not_to receive(:shell_out_compacted!)
@@ -161,10 +161,10 @@ describe Chef::Provider::Ifconfig::Aix do
       before do
         @new_resource.device "en10"
         allow(@provider).to receive(:load_current_resource) do
-          @provider.instance_variable_set("@status", double("Status", exitstatus: 0))
+          @provider.instance_variable_set(:@status, double("Status", exitstatus: 0))
           current_resource = Chef::Resource::Ifconfig.new("10.0.0.1", @run_context)
           current_resource.device @new_resource.device
-          @provider.instance_variable_set("@current_resource", current_resource)
+          @provider.instance_variable_set(:@current_resource, current_resource)
         end
       end
 

data/spec/unit/provider/ifconfig/debian_spec.rb

@@ -42,7 +42,7 @@ describe Chef::Provider::Ifconfig::Debian do
   let(:provider) do
     status = double("Status", exitstatus: 0)
     provider = Chef::Provider::Ifconfig::Debian.new(new_resource, run_context)
-    provider.instance_variable_set("@status", status)
+    provider.instance_variable_set(:@status, status)
     provider.current_resource = current_resource
     allow(provider).to receive(:load_current_resource)
     allow(provider).to receive(:shell_out!)

data/spec/unit/provider/ifconfig/redhat_spec.rb

@@ -40,7 +40,7 @@ describe Chef::Provider::Ifconfig::Redhat do
     @current_resource = Chef::Resource::Ifconfig.new("10.0.0.1", @run_context)
 
     status = double("Status", exitstatus: 0)
-    @provider.instance_variable_set("@status", status)
+    @provider.instance_variable_set(:@status, status)
     @provider.current_resource = @current_resource
 
     config_filename = "/etc/sysconfig/network-scripts/ifcfg-#{@new_resource.device}"

data/spec/unit/provider/ifconfig_spec.rb

@@ -35,7 +35,7 @@ describe Chef::Provider::Ifconfig do
     @current_resource = Chef::Resource::Ifconfig.new("10.0.0.1", @run_context)
 
     status = double("Status", exitstatus: 0)
-    @provider.instance_variable_set("@status", status)
+    @provider.instance_variable_set(:@status, status)
     @provider.current_resource = @current_resource
   end
 
@@ -58,7 +58,7 @@ describe Chef::Provider::Ifconfig do
         @provider.load_current_resource
       end
       it "should track state of ifconfig failure" do
-        expect(@provider.instance_variable_get("@status").exitstatus).not_to eq(0)
+        expect(@provider.instance_variable_get(:@status).exitstatus).not_to eq(0)
       end
       it "should thrown an exception when ifconfig fails" do
         @provider.action = :add
@@ -79,7 +79,7 @@ describe Chef::Provider::Ifconfig do
         @provider.load_current_resource
       end
       it "should track state of ifconfig failure" do
-        expect(@provider.instance_variable_get("@status").exitstatus).not_to eq(0)
+        expect(@provider.instance_variable_get(:@status).exitstatus).not_to eq(0)
       end
       it "should thrown an exception when ifconfig fails" do
         @provider.action = :add

data/spec/unit/provider/remote_file/cache_control_data_spec.rb

@@ -219,11 +219,11 @@ describe Chef::Provider::RemoteFile::CacheControlData do
       let(:truncated_remote_uri) { URI.parse(long_remote_path[0...CACHE_FILE_TRUNCATED_FRIENDLY_FILE_NAME_LENGTH]) }
       let(:truncated_file_cache_path) do
         cache_control_data_truncated = Chef::Provider::RemoteFile::CacheControlData.load_and_validate(truncated_remote_uri, current_file_checksum)
-        cache_control_data_truncated.send("sanitized_cache_file_basename")[0...CACHE_FILE_TRUNCATED_FRIENDLY_FILE_NAME_LENGTH]
+        cache_control_data_truncated.send(:sanitized_cache_file_basename)[0...CACHE_FILE_TRUNCATED_FRIENDLY_FILE_NAME_LENGTH]
       end
 
       it "truncates the file cache path to 102 characters" do
-        normalized_cache_path = cache_control_data.send("sanitized_cache_file_basename")
+        normalized_cache_path = cache_control_data.send(:sanitized_cache_file_basename)
 
         expect(Chef::FileCache).to receive(:store).with("remote_file/" + normalized_cache_path, cache_control_data.json_data)
 
@@ -233,7 +233,7 @@ describe Chef::Provider::RemoteFile::CacheControlData do
       end
 
       it "uses a file cache path that starts with the first #{CACHE_FILE_TRUNCATED_FRIENDLY_FILE_NAME_LENGTH} characters of the URI" do
-        normalized_cache_path = cache_control_data.send("sanitized_cache_file_basename")
+        normalized_cache_path = cache_control_data.send(:sanitized_cache_file_basename)
 
         expect(truncated_file_cache_path.length).to eq(CACHE_FILE_TRUNCATED_FRIENDLY_FILE_NAME_LENGTH)
         expect(normalized_cache_path.start_with?(truncated_file_cache_path)).to eq(true)

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

@@ -49,13 +49,13 @@ describe Chef::Provider::Service::Gentoo do
 
     it "should track when service file is not found in /etc/runlevels" do
       @provider.load_current_resource
-      expect(@provider.instance_variable_get("@found_script")).to be_falsey
+      expect(@provider.instance_variable_get(:@found_script)).to be_falsey
     end
 
     it "should track when service file is found in /etc/runlevels/**/" do
       allow(Dir).to receive(:glob).with("/etc/runlevels/**/chef").and_return(["/etc/runlevels/default/chef"])
       @provider.load_current_resource
-      expect(@provider.instance_variable_get("@found_script")).to be_truthy
+      expect(@provider.instance_variable_get(:@found_script)).to be_truthy
     end
 
     describe "when detecting the service enable state" do

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

@@ -160,7 +160,7 @@ describe Chef::Provider::Service::Upstart do
     it "should track state when the upstart configuration file fails to load" do
       expect(File).to receive(:exist?).and_return false
       @provider.load_current_resource
-      expect(@provider.instance_variable_get("@config_file_found")).to eq(false)
+      expect(@provider.instance_variable_get(:@config_file_found)).to eq(false)
     end
 
     describe "when a status command has been specified" do
@@ -177,7 +177,7 @@ describe Chef::Provider::Service::Upstart do
       it "should track state when the user-provided status command fails" do
         allow(@provider).to receive(:shell_out!).and_raise(Errno::ENOENT)
         @provider.load_current_resource
-        expect(@provider.instance_variable_get("@command_success")).to eq(false)
+        expect(@provider.instance_variable_get(:@command_success)).to eq(false)
       end
 
       it "should set running to false if it catches a Chef::Exceptions::Exec when using a status command" do
@@ -190,7 +190,7 @@ describe Chef::Provider::Service::Upstart do
     it "should track state when we fail to obtain service status via upstart_goal_state" do
       expect(@provider).to receive(:upstart_goal_state).and_raise Chef::Exceptions::Exec
       @provider.load_current_resource
-      expect(@provider.instance_variable_get("@command_success")).to eq(false)
+      expect(@provider.instance_variable_get(:@command_success)).to eq(false)
     end
 
     it "should return the current resource" do

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

@@ -74,7 +74,7 @@ describe Chef::Provider::User::Solaris do
       allow(Tempfile).to receive(:new).with("shadow", "/etc").and_return(temp_file)
       new_resource.password "verysecurepassword"
       provider.manage_user
-      expect(::File.open(password_file.path, "r").read).to match(/adam:verysecurepassword:/)
+      expect(::File.read(password_file.path)).to match(/adam:verysecurepassword:/)
       password_file.unlink
     end
   end

data/spec/unit/resource/archive_file_spec.rb

@@ -29,8 +29,7 @@ rescue LoadError
   end
 end
 
-# Exclude this test on platforms where ffi-libarchive loading is broken
-describe Chef::Resource::ArchiveFile, :libarchive_loading_broken do
+describe Chef::Resource::ArchiveFile, :not_supported_on_aix do
   let(:node) { Chef::Node.new }
   let(:events) { Chef::EventDispatch::Dispatcher.new }
   let(:run_context) { Chef::RunContext.new(node, {}, events) }

data/spec/unit/resource/conditional_spec.rb

@@ -59,7 +59,7 @@ describe Chef::Resource::Conditional do
 
     describe "after running a negative/false command given as a string" do
       before do
-        @status.send("success?=", false)
+        @status.send(:"success?=", false)
         @conditional = Chef::Resource::Conditional.only_if(@parent_resource, "false")
       end
 
@@ -80,7 +80,7 @@ describe Chef::Resource::Conditional do
 
     describe "after running a negative/false command given as an array" do
       before do
-        @status.send("success?=", false)
+        @status.send(:"success?=", false)
         @conditional = Chef::Resource::Conditional.only_if(@parent_resource, ["false"])
       end
 
@@ -162,7 +162,7 @@ describe Chef::Resource::Conditional do
 
     describe "after running a failed/false command given as a string" do
       before do
-        @status.send("success?=", false)
+        @status.send(:"success?=", false)
         @conditional = Chef::Resource::Conditional.not_if(@parent_resource, "false")
       end
 
@@ -183,7 +183,7 @@ describe Chef::Resource::Conditional do
 
     describe "after running a failed/false command given as an array" do
       before do
-        @status.send("success?=", false)
+        @status.send(:"success?=", false)
         @conditional = Chef::Resource::Conditional.not_if(@parent_resource, ["false"])
       end
 

data/spec/unit/resource_spec.rb

@@ -955,7 +955,7 @@ describe Chef::Resource do
         node.name("bumblebee")
         node.automatic[:platform] = "autobots"
         node.automatic[:platform_version] = "6.1"
-        Object.const_set("Soundwave", klz1)
+        Object.const_set(:Soundwave, klz1)
         klz1.provides :soundwave
       end
 
@@ -978,7 +978,7 @@ describe Chef::Resource do
         node.automatic[:platform] = "autobots"
         node.automatic[:platform_version] = "6.1"
         klz2.provides :dinobot, platform: ["autobots"]
-        Object.const_set("Grimlock", klz2)
+        Object.const_set(:Grimlock, klz2)
         klz2.provides :grimlock
       end
 

data/spec/unit/secret_fetcher/hashi_vault_spec.rb

@@ -65,6 +65,52 @@ describe Chef::SecretFetcher::HashiVault do
         fetcher.validate!
       end
     end
+
+    context "and using auth_method: :approle" do
+      it "raises ConfigurationInvalid message when :approle_name or :approle_id are not specified" do
+        fetcher = Chef::SecretFetcher::HashiVault.new( { auth_method: :approle, vault_addr: "https://vault.example.com:8200" }, run_context)
+        expect { fetcher.validate! }.to raise_error(Chef::Exceptions::Secret::ConfigurationInvalid)
+      end
+
+      it "authenticates using the approle_id and approle_secret_id during validation when all configuration is correct" do
+        fetcher = Chef::SecretFetcher::HashiVault.new({
+          auth_method: :approle,
+          approle_id: "idguid",
+          approle_secret_id: "secretguid",
+          vault_addr: "https://vault.example.com:8200" },
+          run_context)
+        auth = instance_double(Vault::Authenticate)
+        allow(auth).to receive(:approle)
+        allow(Vault).to receive(:auth).and_return(auth)
+        expect(auth).to receive(:approle).with("idguid", "secretguid")
+        fetcher.validate!
+      end
+
+      it "looks up the :role_id and :secret_id when all configuration is correct" do
+        fetcher = Chef::SecretFetcher::HashiVault.new({
+          auth_method: :approle,
+          approle_name: "myapprole",
+          token: "t.1234abcd",
+          vault_addr: "https://vault.example.com:8200" },
+          run_context)
+        approle = instance_double(Vault::AppRole)
+        auth = instance_double(Vault::Authenticate)
+        allow(Vault).to receive(:approle).and_return(approle)
+        allow(approle).to receive(:role_id).with("myapprole").and_return("idguid")
+        allow(approle).to receive(:create_secret_id).with("myapprole").and_return(Vault::Secret.new({
+          data: {
+            secret_id: "secretguid",
+            secret_id_accessor: "accessor_guid",
+            secret_id_ttl: 0,
+          },
+          lease_duration: 0,
+          lease_id: "",
+        }))
+        allow(Vault).to receive(:auth).and_return(auth)
+        expect(auth).to receive(:approle).with("idguid", "secretguid")
+        fetcher.validate!
+      end
+    end
   end
 
   context "when fetching a secret from Hashi Vault" do