chef 18.5.0 → 18.7.3

data/spec/integration/client/open_ssl_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 describe "openssl checks" do
   let(:openssl_version_default) do
     if windows?
-      "1.0.2zi"
+      "3.0.9"
     elsif macos?
       "1.1.1m"
     else

data/spec/spec_helper.rb

@@ -145,6 +145,7 @@ RSpec.configure do |config|
 
   config.filter_run_excluding windows_only: true unless windows?
   config.filter_run_excluding not_supported_on_windows: true if windows?
+  config.filter_run_excluding not_supported_on_windows_11: true if windows_11?
   config.filter_run_excluding not_supported_on_macos: true if macos?
   config.filter_run_excluding macos_only: true unless macos?
   config.filter_run_excluding not_macos_gte_11: true if macos_gte_11?

data/spec/support/chef_helpers.rb

@@ -69,8 +69,8 @@ def make_canonical_temp_directory
 end
 
 # Check if a cmd exists on the PATH
-def which(cmd)
-  paths = ENV["PATH"].split(File::PATH_SEPARATOR) + [ "/bin", "/usr/bin", "/sbin", "/usr/sbin" ]
+def which(cmd, prepend_path: nil, extra_path: nil)
+  paths = Array(prepend_path) + ENV["PATH"].split(File::PATH_SEPARATOR) + [ "/bin", "/usr/bin", "/sbin", "/usr/sbin" ] + Array(extra_path)
   paths.each do |path|
     filename = File.join(path, cmd)
     return filename if File.executable?(filename)

data/spec/support/platform_helpers.rb

@@ -65,6 +65,12 @@ def windows_gte_10?
   Gem::Requirement.new(">= 10").satisfied_by?(Gem::Version.new(win32_os_version))
 end
 
+def windows_11?
+  return false unless windows?
+
+  Gem::Requirement.new(">= 10.0.22621").satisfied_by?(Gem::Version.new(win32_os_version))
+end
+
 def win32_os_version
   @win32_os_version ||= begin
                           wmi = WmiLite::Wmi.new
@@ -228,6 +234,8 @@ def aes_256_gcm?
 end
 
 def fips_mode_build?
+  return false if ENV.fetch("BUILDKITE_PIPELINE_SLUG", "") =~ /verify$/
+
   if ENV.include?("BUILDKITE_LABEL") # try keying directly off Buildkite environments
     # regex version of chef/chef-foundation:.expeditor/release.omnibus.yml:fips-platforms
     [/el-.*-x86_64/, /el-.*-ppc64/, /el-.*aarch/, /ubuntu-/, /windows-/, /amazon-2/].any? do |os_arch|

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

@@ -245,14 +245,14 @@ shared_examples_for "a file resource" do
 
     include_context "deploying with move"
 
-    describe "when deploying via tmpdir" do
+    describe "when deploying via tmpdir", :not_supported_on_windows_11 do
 
       include_context "deploying via tmpdir"
 
       it_behaves_like "a configured file resource"
     end
 
-    describe "when deploying via destdir" do
+    describe "when deploying via destdir", :not_supported_on_windows_11 do
 
       include_context "deploying via destdir"
 
@@ -912,7 +912,7 @@ shared_examples_for "a configured file resource" do
     dummy_desc
   end
 
-  it_behaves_like "a securable resource without existing target"
+  it_behaves_like "a securable resource without existing target", :not_supported_on_windows_11
 
   context "when the target file has the wrong content" do
     before(:each) do

data/spec/tiny_server.rb

@@ -19,6 +19,7 @@
 require "webrick"
 require "webrick/https"
 require "rack"
+require "rackup"
 require "singleton"
 require "open-uri"
 require "chef/config"
@@ -91,7 +92,7 @@ module TinyServer
 
     def create_server(**extra_options)
       server = WEBrick::HTTPServer.new(**options, **extra_options)
-      server.mount("/", Rack::Handler::WEBrick, API.instance)
+      server.mount("/", Rackup::Handler::WEBrick, API.instance)
       server
     end
   end
@@ -172,7 +173,9 @@ module TinyServer
 
     def initialize(response_code = 200, data = nil, headers = nil, &block)
       @response_code, @data = response_code, data
-      @response_headers = headers ? HEADERS.merge(headers) : HEADERS
+      # .merge creates a new hash, headers is sometimes passed as nil, @response_headers gets mutated somewhere
+      # in processing
+      @response_headers = HEADERS.merge(headers || {})
       @block = block_given? ? block : nil
     end
 

data/spec/unit/mixin/homebrew_spec.rb

@@ -0,0 +1,118 @@
+#
+# Author:: Joshua Timberman (<joshua@chef.io>)
+#
+# Copyright:: Copyright (c) Chef Software Inc.
+#
+# 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::Mixin::Homebrew do
+  let(:homebrew) { Class.new { include Chef::Mixin::Homebrew }.new }
+  let(:uid) { 1001 }
+  let(:username) { "foobar" }
+  let(:alt_brew_path) { "/foo" }
+
+  describe "#find_homebrew_uid" do
+    it "returns the provided UID when an integer is given" do
+      expect(File).to receive(:exist?).exactly(0).times
+      expect(homebrew.find_homebrew_uid(uid)).to eq(uid)
+    end
+
+    it "returns the provided UID when username is given" do
+      expect(File).to receive(:exist?).exactly(0).times
+      allow(Etc).to receive(:getpwnam).with(username).and_return(OpenStruct.new(uid: uid))
+      expect(homebrew.find_homebrew_uid(username)).to eq(uid)
+    end
+
+    it "raises an error when the brew executable is not found" do
+      allow(homebrew).to receive(:homebrew_bin_path).and_raise(Chef::Exceptions::CannotDetermineHomebrewPath)
+      expect { homebrew.find_homebrew_uid }.to raise_error(Chef::Exceptions::CannotDetermineHomebrewPath)
+    end
+
+    it "returns the UID of the owner based on the brew executable" do
+      allow(homebrew).to receive(:homebrew_bin_path).and_return(alt_brew_path)
+      allow(File).to receive(:stat).with(alt_brew_path).and_return(OpenStruct.new(uid: uid))
+      allow(Etc).to receive(:getpwuid).with(uid).and_return(OpenStruct.new(name: username))
+      expect(homebrew.find_homebrew_uid).to eq(uid)
+    end
+  end
+
+  describe "#find_homebrew_username" do
+    it "returns the username for the provided UID" do
+      allow(homebrew).to receive(:find_homebrew_uid).and_return(uid)
+      allow(Etc).to receive(:getpwuid).with(uid).and_return(OpenStruct.new(name: username))
+      expect(homebrew.find_homebrew_username(uid)).to eq(username)
+    end
+  end
+
+  describe "#homebrew_bin_path" do
+    it "returns the correct path when a valid path is provided" do
+      allow(File).to receive(:exist?).with(alt_brew_path).and_return(true)
+      expect(homebrew.homebrew_bin_path(alt_brew_path)).to eq(alt_brew_path)
+    end
+
+    it "raises an error when the brew executable is not found" do
+      allow(homebrew).to receive(:which).and_return(false)
+      expect { homebrew.homebrew_bin_path }.to raise_error(Chef::Exceptions::CannotDetermineHomebrewPath)
+    end
+  end
+
+  shared_examples "successfully find executable" do
+    let(:default_brew_path) { "/usr/local/bin/brew" }
+    let(:default_brew_path_arm) { "/opt/homebrew/bin/brew" }
+    let(:default_brew_path_linux) { "/home/linuxbrew/.linuxbrew/bin/brew" }
+
+    context "debug statement prints owner name" do
+
+      before do
+        expect(Etc).to receive(:getpwuid).with(uid).and_return(OpenStruct.new(name: username))
+      end
+
+      it "returns the owner of the brew executable when it is at a default location for x86_64 machines" do
+        allow(homebrew).to receive(:homebrew_bin_path).and_return(default_brew_path)
+        allow(File).to receive(:stat).with(default_brew_path).and_return(OpenStruct.new(uid: uid))
+        expect(homebrew.find_homebrew_uid).to eq(uid)
+      end
+
+      it "returns the owner of the brew executable when it is at a default location for arm machines" do
+        allow(homebrew).to receive(:homebrew_bin_path).and_return(default_brew_path_arm)
+        allow(File).to receive(:stat).with(default_brew_path_arm).and_return(OpenStruct.new(uid: uid))
+        expect(homebrew.find_homebrew_uid).to eq(uid)
+      end
+
+      it "returns the owner of the brew executable when it is at a default location for linux machines" do
+        allow(homebrew).to receive(:homebrew_bin_path).and_return(default_brew_path_linux)
+        allow(File).to receive(:stat).with(default_brew_path_linux).and_return(OpenStruct.new(uid: uid))
+        expect(homebrew.find_homebrew_uid).to eq(uid)
+      end
+
+      it "returns the owner of the brew executable when it is not at a default location" do
+        allow(homebrew).to receive(:homebrew_bin_path).and_return(alt_brew_path)
+        allow(File).to receive(:stat).with(alt_brew_path).and_return(OpenStruct.new(uid: uid))
+        expect(homebrew.find_homebrew_uid).to eq(uid)
+      end
+    end
+  end
+
+  describe "#When the homebrew user is not provided" do
+
+    include_examples "successfully find executable"
+
+    context "the executable is owned by root" do
+      include_examples "successfully find executable" do
+        let(:uid) { 0 }
+      end
+    end
+  end
+end

data/spec/unit/provider/apt_repository_spec.rb

@@ -230,7 +230,7 @@ C5986B4F1257FFA86632CBA746181433FBB75451
     it "gets a key" do
       simples = double("HTTP")
       allow(simples).to receive(:get).and_return("\"#{key}\"")
-      expect(Chef::HTTP::Simple).to receive(:new).with(url, {}).and_return(simples)
+      expect(Chef::HTTP::Simple).to receive(:new).with(url).and_return(simples)
       expect(provider).to receive(:install_key_from_keyserver).with(key, "keyserver.ubuntu.com")
       provider.install_ppa_key("chef", "main")
     end
@@ -246,43 +246,48 @@ C5986B4F1257FFA86632CBA746181433FBB75451
   describe "#build_repo" do
     it "creates a repository string" do
       target = "deb      http://test/uri unstable main\n"
-      expect(provider.build_repo("http://test/uri", "unstable", "main", false, nil, [])).to eql(target)
+      expect(provider.build_repo("http://test/uri", "unstable", "main", false, nil, nil, [])).to eql(target)
     end
 
     it "creates a repository string with spaces" do
       target = "deb      http://test/uri%20with%20spaces unstable main\n"
-      expect(provider.build_repo("http://test/uri with spaces", "unstable", "main", false, nil, [])).to eql(target)
+      expect(provider.build_repo("http://test/uri with spaces", "unstable", "main", false, nil, nil, [])).to eql(target)
     end
 
     it "creates a repository string with no distribution" do
       target = "deb      http://test/uri main\n"
-      expect(provider.build_repo("http://test/uri", nil, "main", false, nil, [])).to eql(target)
+      expect(provider.build_repo("http://test/uri", nil, "main", false, nil, nil, [])).to eql(target)
     end
 
     it "creates a repository string with source" do
       target = "deb      http://test/uri unstable main\ndeb-src  http://test/uri unstable main\n"
-      expect(provider.build_repo("http://test/uri", "unstable", "main", false, nil, [], true)).to eql(target)
+      expect(provider.build_repo("http://test/uri", "unstable", "main", false, nil, nil, [], true)).to eql(target)
     end
 
     it "creates a repository string with trusted" do
       target = "deb      [trusted=yes] http://test/uri unstable main\n"
-      expect(provider.build_repo("http://test/uri", "unstable", "main", true, nil, [])).to eql(target)
+      expect(provider.build_repo("http://test/uri", "unstable", "main", true, nil, nil, [])).to eql(target)
+    end
+
+    it "creates a repository string with signed-by" do
+      target = "deb      [signed-by=/etc/apt/keyrings/test.gpg] http://test/uri unstable main\n"
+      expect(provider.build_repo("http://test/uri", "unstable", "main", false, nil, "/etc/apt/keyrings/test.gpg", [])).to eql(target)
     end
 
     it "creates a repository string with custom options" do
       target = "deb      [by-hash=no] http://test/uri unstable main\n"
-      expect(provider.build_repo("http://test/uri", "unstable", "main", false, nil, ["by-hash=no"])).to eql(target)
+      expect(provider.build_repo("http://test/uri", "unstable", "main", false, nil, nil, ["by-hash=no"])).to eql(target)
     end
 
     it "creates a repository string with trusted, arch, and custom options" do
       target = "deb      [arch=amd64 trusted=yes by-hash=no] http://test/uri unstable main\n"
-      expect(provider.build_repo("http://test/uri", "unstable", "main", true, "amd64", ["by-hash=no"])).to eql(target)
+      expect(provider.build_repo("http://test/uri", "unstable", "main", true, "amd64", nil, ["by-hash=no"])).to eql(target)
     end
 
     it "handles a ppa repo" do
       target = "deb      http://ppa.launchpad.net/chef/main/ubuntu unstable main\n"
       expect(provider).to receive(:make_ppa_url).with("ppa:chef/main").and_return("http://ppa.launchpad.net/chef/main/ubuntu")
-      expect(provider.build_repo("ppa:chef/main", "unstable", "main", false, nil, [])).to eql(target)
+      expect(provider.build_repo("ppa:chef/main", "unstable", "main", false, nil, nil, [])).to eql(target)
     end
   end
 end

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

@@ -92,7 +92,7 @@ describe Chef::Provider::Package::Chocolatey, :windows_only do
 
   describe "choco searches change with the version" do
     it "Choco V1 uses List" do
-      allow(provider).to receive(:powershell_exec!).with("Get-ItemProperty #{choco_exe} | select-object -expandproperty versioninfo | select-object -expandproperty productversion").and_return(double(result: "1.4.0"))
+      allow(provider).to receive(:powershell_exec!).with("Get-ItemProperty #{choco_exe} | select-object -expandproperty versioninfo | select-object -expandproperty productversion").and_return(double(result: "1.3.0"))
       expect(provider.query_command).to eql("list")
     end
 

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

@@ -19,6 +19,7 @@
 require "spec_helper"
 
 describe Chef::Provider::Package::Homebrew do
+  let(:default_brew_path) { "/usr/local/bin/brew" }
   let(:node) { Chef::Node.new }
   let(:new_resource) { Chef::Resource::HomebrewPackage.new(%w{emacs vim}) }
   let(:current_resource) { Chef::Resource::HomebrewPackage.new("emacs, vim") }
@@ -30,7 +31,6 @@ describe Chef::Provider::Package::Homebrew do
   end
 
   let(:homebrew_uid) { 1001 }
-
   let(:brew_cmd_output_data) { '[{"name":"emacs","full_name":"emacs","oldname":null,"aliases":[],"versioned_formulae":[],"desc":"GNU Emacs text editor","homepage":"https://www.gnu.org/software/emacs/","versions":{"stable":"26.3","devel":null,"head":"HEAD","bottle":true},"urls":{"stable":{"url":"https://ftp.gnu.org/gnu/emacs/emacs-26.3.tar.xz","tag":null,"revision":null}},"revision":0,"version_scheme":0,"bottle":{"stable":{"rebuild":0,"cellar":"/usr/local/Cellar","prefix":"/usr/local","root_url":"https://homebrew.bintray.com/bottles","files":{"catalina":{"url":"https://homebrew.bintray.com/bottles/emacs-26.3.catalina.bottle.tar.gz","sha256":"9ab33f4386ca5f7326a8c28da1324556ec990f682a7ca88641203da0b42dbdae"},"mojave":{"url":"https://homebrew.bintray.com/bottles/emacs-26.3.mojave.bottle.tar.gz","sha256":"8162a26246de7db44c53ea0d0ef0a806140318d19c69e8e5e33aa88ce7e823a8"},"high_sierra":{"url":"https://homebrew.bintray.com/bottles/emacs-26.3.high_sierra.bottle.tar.gz","sha256":"6a2629b6deddf99f81abb1990ecd6c87f0242a0eecbb6b6c2e4c3540e421d4c4"},"sierra":{"url":"https://homebrew.bintray.com/bottles/emacs-26.3.sierra.bottle.tar.gz","sha256":"2a47477e71766d7dd6b16c29ad5ba71817ed80d06212e3261ef3c776e7e9f5a2"}}}},"keg_only":false,"bottle_disabled":false,"options":[],"build_dependencies":["pkg-config"],"dependencies":["gnutls"],"recommended_dependencies":[],"optional_dependencies":[],"uses_from_macos":["libxml2","ncurses"],"requirements":[],"conflicts_with":[],"caveats":null,"installed":[],"linked_keg":null,"pinned":false,"outdated":false},{"name":"vim","full_name":"vim","oldname":null,"aliases":[],"versioned_formulae":[],"desc":"Vi \'workalike\' with many additional features","homepage":"https://www.vim.org/","versions":{"stable":"8.2.0550","devel":null,"head":"HEAD","bottle":true},"urls":{"stable":{"url":"https://github.com/vim/vim/archive/v8.2.0550.tar.gz","tag":null,"revision":null}},"revision":0,"version_scheme":0,"bottle":{"stable":{"rebuild":0,"cellar":"/usr/local/Cellar","prefix":"/usr/local","root_url":"https://homebrew.bintray.com/bottles","files":{"catalina":{"url":"https://homebrew.bintray.com/bottles/vim-8.2.0550.catalina.bottle.tar.gz","sha256":"8f9252500775aa85d8f826af30ca9e1118a56145fc2f961c37abed48bf78cf6b"},"mojave":{"url":"https://homebrew.bintray.com/bottles/vim-8.2.0550.mojave.bottle.tar.gz","sha256":"7566c83b770f3e8c4d4b462a39e5eb26609b37a8f8db6690a2560a3e22ded6b6"},"high_sierra":{"url":"https://homebrew.bintray.com/bottles/vim-8.2.0550.high_sierra.bottle.tar.gz","sha256":"a76e517fc69bf67b6903cb82295bc085c5eb4b46b4659f034c694dd97d2ee2d9"}}}},"keg_only":false,"bottle_disabled":false,"options":[],"build_dependencies":[],"dependencies":["gettext","lua","perl","python","ruby"],"recommended_dependencies":[],"optional_dependencies":[],"uses_from_macos":["ncurses"],"requirements":[],"conflicts_with":["ex-vi","macvim"],"caveats":null,"installed":[{"version":"8.2.0550","used_options":[],"built_as_bottle":true,"poured_from_bottle":true,"runtime_dependencies":[{"full_name":"gettext","version":"0.20.1"},{"full_name":"lua","version":"5.3.5"},{"full_name":"perl","version":"5.30.2"},{"full_name":"gdbm","version":"1.18.1"},{"full_name":"openssl@1.1","version":"1.1.1f"},{"full_name":"readline","version":"8.0.4"},{"full_name":"sqlite","version":"3.31.1"},{"full_name":"xz","version":"5.2.5"},{"full_name":"python","version":"3.7.7"},{"full_name":"libyaml","version":"0.2.2"},{"full_name":"ruby","version":"2.7.1"}],"installed_as_dependency":false,"installed_on_request":true}],"linked_keg":"8.2.0550","pinned":false,"outdated":false}]' }
 
   let(:brew_info_data) do
@@ -297,11 +297,13 @@ describe Chef::Provider::Package::Homebrew do
 
     it "passes a single pkg to the brew command and return stdout" do
       allow(provider).to receive(:shell_out!).and_return(OpenStruct.new(stdout: "zombo"))
+      allow(provider).to receive(:homebrew_bin_path).and_return(default_brew_path)
       expect(provider.brew_cmd_output).to eql("zombo")
     end
 
     it "takes multiple arguments as an array" do
       allow(provider).to receive(:shell_out!).and_return(OpenStruct.new(stdout: "homestarrunner"))
+      allow(provider).to receive(:homebrew_bin_path).and_return(default_brew_path)
       expect(provider.brew_cmd_output("info", "opts", "bananas")).to eql("homestarrunner")
     end
 
@@ -310,6 +312,7 @@ describe Chef::Provider::Package::Homebrew do
 
       it "does not try to read homebrew_user from Package, which does not have it" do
         allow(provider).to receive(:shell_out!).and_return(OpenStruct.new(stdout: "zombo"))
+        allow(provider).to receive(:homebrew_bin_path).and_return(default_brew_path)
         expect(provider.brew_cmd_output).to eql("zombo")
       end
     end

data/spec/unit/provider/registry_key_spec.rb

@@ -26,7 +26,8 @@ shared_examples_for "a registry key" do
     describe "when the key exists" do
       before(:each) do
         expect(@double_registry).to receive(:key_exists?).with(keyname).and_return(true)
-        expect(@double_registry).to receive(:get_values).with(keyname).and_return( testval2 )
+        expect(@double_registry).to receive(:get_values).with(keyname).and_return( [testval2] )
+        @new_resource.only_record_changes false
         @provider.load_current_resource
       end
 
@@ -66,7 +67,7 @@ shared_examples_for "a registry key" do
       end
       it "should do nothing if the if a case insensitive key and the value both exist" do
         @provider.new_resource.key(keyname.downcase)
-        expect(@double_registry).to receive(:get_values).with(keyname.downcase).and_return( testval1 )
+        expect(@double_registry).to receive(:get_values).with(keyname.downcase).and_return( [testval1 ])
         expect(@double_registry).not_to receive(:set_value)
         @provider.load_current_resource
         @provider.action_create
@@ -77,25 +78,25 @@ shared_examples_for "a registry key" do
         expect(@double_registry).to receive(:key_exists?).twice.with(keyname).and_return(true)
       end
       it "should do nothing if the key and the value both exist" do
-        expect(@double_registry).to receive(:get_values).with(keyname).and_return( testval1 )
+        expect(@double_registry).to receive(:get_values).with(keyname).and_return( [testval1] )
         expect(@double_registry).not_to receive(:set_value)
         @provider.load_current_resource
         @provider.action_create
       end
       it "should create the value if the key exists but the value does not" do
-        expect(@double_registry).to receive(:get_values).with(keyname).and_return( testval2 )
+        expect(@double_registry).to receive(:get_values).with(keyname).and_return( [testval2] )
         expect(@double_registry).to receive(:set_value).with(keyname, testval1)
         @provider.load_current_resource
         @provider.action_create
       end
       it "should set the value if the key exists but the data does not match" do
-        expect(@double_registry).to receive(:get_values).with(keyname).and_return( testval1_wrong_data )
+        expect(@double_registry).to receive(:get_values).with(keyname).and_return( [testval1_wrong_data] )
         expect(@double_registry).to receive(:set_value).with(keyname, testval1)
         @provider.load_current_resource
         @provider.action_create
       end
       it "should set the value if the key exists but the type does not match" do
-        expect(@double_registry).to receive(:get_values).with(keyname).and_return( testval1_wrong_type )
+        expect(@double_registry).to receive(:get_values).with(keyname).and_return( [testval1_wrong_type] )
         expect(@double_registry).to receive(:set_value).with(keyname, testval1)
         @provider.load_current_resource
         @provider.action_create
@@ -105,7 +106,7 @@ shared_examples_for "a registry key" do
       it "when a value is in the key, it should do nothing" do
         @provider.new_resource.values([])
         expect(@double_registry).to receive(:key_exists?).twice.with(keyname).and_return(true)
-        expect(@double_registry).to receive(:get_values).with(keyname).and_return( testval1 )
+        expect(@double_registry).to receive(:get_values).with(keyname).and_return( [testval1] )
         expect(@double_registry).not_to receive(:create_key)
         expect(@double_registry).not_to receive(:set_value)
         @provider.load_current_resource
@@ -150,25 +151,25 @@ shared_examples_for "a registry key" do
         expect(@double_registry).to receive(:key_exists?).twice.with(keyname).and_return(true)
       end
       it "should do nothing if the key and the value both exist" do
-        expect(@double_registry).to receive(:get_values).with(keyname).and_return( testval1 )
+        expect(@double_registry).to receive(:get_values).with(keyname).and_return( [testval1] )
         expect(@double_registry).not_to receive(:set_value)
         @provider.load_current_resource
         @provider.action_create_if_missing
       end
       it "should create the value if the key exists but the value does not" do
-        expect(@double_registry).to receive(:get_values).with(keyname).and_return( testval2 )
+        expect(@double_registry).to receive(:get_values).with(keyname).and_return( [testval2] )
         expect(@double_registry).to receive(:set_value).with(keyname, testval1)
         @provider.load_current_resource
         @provider.action_create_if_missing
       end
       it "should not set the value if the key exists but the data does not match" do
-        expect(@double_registry).to receive(:get_values).with(keyname).and_return( testval1_wrong_data )
+        expect(@double_registry).to receive(:get_values).with(keyname).and_return( [testval1_wrong_data] )
         expect(@double_registry).not_to receive(:set_value)
         @provider.load_current_resource
         @provider.action_create_if_missing
       end
       it "should not set the value if the key exists but the type does not match" do
-        expect(@double_registry).to receive(:get_values).with(keyname).and_return( testval1_wrong_type )
+        expect(@double_registry).to receive(:get_values).with(keyname).and_return( [testval1_wrong_type] )
         expect(@double_registry).not_to receive(:set_value)
         @provider.load_current_resource
         @provider.action_create_if_missing
@@ -193,25 +194,25 @@ shared_examples_for "a registry key" do
         expect(@double_registry).to receive(:key_exists?).twice.with(keyname).and_return(true)
       end
       it "deletes the value when the value exists" do
-        expect(@double_registry).to receive(:get_values).with(keyname).and_return( testval1 )
+        expect(@double_registry).to receive(:get_values).with(keyname).and_return( [testval1] )
         expect(@double_registry).to receive(:delete_value).with(keyname, testval1)
         @provider.load_current_resource
         @provider.action_delete
       end
       it "deletes the value when the value exists, but the type is wrong" do
-        expect(@double_registry).to receive(:get_values).with(keyname).and_return( testval1_wrong_type )
+        expect(@double_registry).to receive(:get_values).with(keyname).and_return( [testval1_wrong_type] )
         expect(@double_registry).to receive(:delete_value).with(keyname, testval1)
         @provider.load_current_resource
         @provider.action_delete
       end
       it "deletes the value when the value exists, but the data is wrong" do
-        expect(@double_registry).to receive(:get_values).with(keyname).and_return( testval1_wrong_data )
+        expect(@double_registry).to receive(:get_values).with(keyname).and_return( [testval1_wrong_data] )
         expect(@double_registry).to receive(:delete_value).with(keyname, testval1)
         @provider.load_current_resource
         @provider.action_delete
       end
       it "does not delete the value when the value does not exist" do
-        expect(@double_registry).to receive(:get_values).with(keyname).and_return( testval2 )
+        expect(@double_registry).to receive(:get_values).with(keyname).and_return( [testval2] )
         expect(@double_registry).not_to receive(:delete_value)
         @provider.load_current_resource
         @provider.action_delete
@@ -235,7 +236,7 @@ shared_examples_for "a registry key" do
         expect(@double_registry).to receive(:key_exists?).twice.with(keyname).and_return(true)
       end
       it "deletes the key" do
-        expect(@double_registry).to receive(:get_values).with(keyname).and_return( testval1 )
+        expect(@double_registry).to receive(:get_values).with(keyname).and_return( [testval1] )
         expect(@double_registry).to receive(:delete_key).with(keyname, false)
         @provider.load_current_resource
         @provider.action_delete_key
@@ -303,7 +304,7 @@ describe Chef::Provider::RegistryKey do
       end
 
       it "does not make a change for datatype of data value differing" do
-        expect(@double_registry).to receive(:get_values).with(keyname).and_return( dword_passed_as_integer )
+        expect(@double_registry).to receive(:get_values).with(keyname).and_return( [dword_passed_as_integer] )
         expect(@double_registry).not_to receive(:set_value)
         @provider.load_current_resource
         @provider.action_create

data/spec/unit/provider/route_spec.rb

@@ -117,7 +117,7 @@ describe Chef::Provider::Route do
       @node.automatic_attrs[:platform_family] = "rhel"
 
       route_file = StringIO.new
-      expect(File).to receive(:open).and_yield(route_file)
+      expect(File).to receive(:new).and_return(route_file)
       @resource_add = Chef::Resource::Route.new("192.168.1.0/24 via 192.168.0.1")
       @run_context.resource_collection << @resource_add
       allow(@provider).to receive(:shell_out!).and_return(true)
@@ -225,7 +225,7 @@ describe Chef::Provider::Route do
         @node.automatic_attrs[:platform_family] = platform_family
 
         route_file = StringIO.new
-        expect(File).to receive(:open).with("/etc/sysconfig/network-scripts/route-eth0", "w").and_return(route_file)
+        expect(File).to receive(:new).with("/etc/sysconfig/network-scripts/route-eth0", "w").and_return(route_file)
         @run_context.resource_collection << @new_resource
         @provider.generate_config
       end
@@ -234,10 +234,8 @@ describe Chef::Provider::Route do
         @node.automatic_attrs[:platform_family] = platform_family
 
         route_file = StringIO.new
-        allow(File).to receive(:exist?).and_call_original
-        allow(File).to receive(:open).and_call_original
         allow(File).to receive(:exist?).with("/etc/sysconfig/network").and_return(false)
-        expect(File).to receive(:open).with("/etc/sysconfig/network", "w").and_yield(route_file)
+        expect(File).to receive(:new).with("/etc/sysconfig/network", "w").and_return(route_file)
         @run_context.resource_collection << @default_resource
         @default_provider.generate_config
         expect(route_file.string).to match(/GATEWAY=10\.0\.0\.9/)
@@ -248,7 +246,7 @@ describe Chef::Provider::Route do
       @node.automatic_attrs[:platform_family] = "rhel"
 
       route_file = StringIO.new
-      expect(File).to receive(:open).and_yield(route_file)
+      expect(File).to receive(:new).and_return(route_file)
       @run_context.resource_collection << Chef::Resource::Route.new("192.168.1.0/24 via 192.168.0.1")
       @run_context.resource_collection << Chef::Resource::Route.new("192.168.2.0/24 via 192.168.0.1")
       @run_context.resource_collection << Chef::Resource::Route.new("192.168.3.0/24 via 192.168.0.1")

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

@@ -158,6 +158,7 @@ describe Chef::Provider::User::Windows do
 
   describe "when removing the user" do
     it "should call @net_user.delete" do
+      allow(Chef::ReservedNames::Win32::Security).to receive(:clear_account_rights)
       expect(@net_user).to receive(:delete)
       @provider.remove_user
     end

data/spec/unit/resource/rhsm_repo_spec.rb

@@ -46,7 +46,6 @@ describe Chef::Resource::RhsmRepo do
     before do
       allow(Mixlib::ShellOut).to receive(:new).and_return(cmd)
       allow(cmd).to receive(:run_command)
-      allow(cmd).to receive(:live_stream).and_return(output)
       allow(cmd).to receive(:stdout).and_return(output)
     end
 

data/spec/unit/resource/rhsm_subscription_spec.rb

@@ -92,7 +92,6 @@ describe Chef::Resource::RhsmSubscription do
     before do
       allow(Mixlib::ShellOut).to receive(:new).and_return(cmd)
       allow(cmd).to receive(:run_command)
-      allow(cmd).to receive(:live_stream).and_return(output)
       allow(cmd).to receive(:stdout).and_return(output)
     end
 
@@ -128,7 +127,6 @@ describe Chef::Resource::RhsmSubscription do
     it "parses the output correctly" do
       allow(Mixlib::ShellOut).to receive(:new).and_return(cmd)
       allow(cmd).to receive(:run_command)
-      allow(cmd).to receive(:live_stream).and_return(output)
       allow(cmd).to receive(:stdout).and_return(output)
 
       expect(provider.serials_by_pool["pool1"]).to eq("serial1")

data/spec/unit/resource_inspector_spec.rb

@@ -17,6 +17,20 @@
 require "spec_helper"
 require "chef/resource_inspector"
 
+COMBINED_RESOURCE_TEXT = <<~EOF.freeze
+  class Dummy1 < Chef::Resource::LWRPBase
+    resource_name :dummy1
+    description "A dummy resource"
+    property :first, String, description: "My First Property", introduced: "14.0"
+  end
+
+  class Dummy2 < Chef::Resource::LWRPBase
+    resource_name :dummy2
+    description "Another dummy resource"
+    property :second, String, description: "My Second Property", introduced: "14.0"
+  end
+EOF
+
 class DummyResource < Chef::Resource
   resource_name :dummy
   description "A dummy resource"
@@ -62,4 +76,26 @@ describe Chef::ResourceInspector do
       end
     end
   end
+
+  describe "inspecting a multi-resource file" do
+    # Call the inspector with a fake file containing two resources, and ensure that we get
+    # both of them back!
+    subject {
+      Chef::ResourceInspector.load_from_resources([
+        { "full_path" => "/cookbooks/fake_cookbook/resources/big_resource.rb" },
+      ], false)
+    }
+    it "has elephants" do
+      allow(File).to receive(:file?).with("/cookbooks/fake_cookbook/resources/big_resource.rb").and_return(true)
+      allow(File).to receive(:readable?).with("/cookbooks/fake_cookbook/resources/big_resource.rb").and_return(true)
+      allow(IO).to receive(:read).with("/cookbooks/fake_cookbook/resources/big_resource.rb").and_return(COMBINED_RESOURCE_TEXT)
+      expect(subject.keys.count).to be 2
+      expect(subject.keys.sort).to eq(%i{dummy1 dummy2})
+      # This is correct - because they're not fully realised resources at this point, sensitive and friends are not added yet.
+      expect(subject[:dummy1][:properties].count).to be 1
+      expect(subject[:dummy2][:properties].count).to be 1
+      expect(subject[:dummy1][:properties][0][:description]).to eq "My First Property"
+      expect(subject[:dummy2][:properties][0][:description]).to eq "My Second Property"
+    end
+  end
 end

data/spec/unit/util/powershell/ps_credential_spec.rb

@@ -35,6 +35,12 @@ describe Chef::Util::Powershell::PSCredential do
       end
     end
 
+    context "when inspect is called" do
+      it "should not contain the password" do
+        expect(ps_credential.inspect).not_to match(/#{password}/)
+      end
+    end
+
     context "when to_text is called" do
       it "should not contain the password" do
         allow(ps_credential).to receive(:encrypt).with(password).and_return("encrypted")