chef 17.10.163 → 18.0.169

data/spec/functional/resource/group_spec.rb

@@ -25,50 +25,39 @@ describe Chef::Resource::Group, :requires_root_or_running_windows do
 
   def group_should_exist(group)
     case ohai[:os]
-    when "freebsd"
-      expect(shell_out("pw groupshow -n #{group}").exitstatus).to eq(0)
-    when "windows"
-      expect { Chef::Util::Windows::NetGroup.new(group).local_get_members }.not_to raise_error
-    else
+    when "linux"
       expect { Etc.getgrnam(group) }.not_to raise_error
       expect(group).to eq(Etc.getgrnam(group).name)
+    when "windows"
+      expect { Chef::Util::Windows::NetGroup.new(group).local_get_members }.not_to raise_error
     end
   end
 
   def user_exist_in_group?(user)
     case ohai[:platform_family]
-    when "freebsd"
-      cmd = Mixlib::ShellOut.new("getent group #{group_name}  #{user}").run_command.stdout
-      if cmd.include? user
-        true
-      else
-        false
-      end
+    when "windows"
+      user_sid = sid_string_from_user(user)
+      user_sid.nil? ? false : Chef::Util::Windows::NetGroup.new(group_name).local_get_members.include?(user_sid)
     when "mac_os_x"
       membership_info = shell_out("dscl . -read /Groups/#{group_name}").stdout
       members = membership_info.split(" ")
       members.shift # Get rid of GroupMembership: string
       members.include?(user)
-    when "windows"
-      user_sid = sid_string_from_user(user)
-      user_sid.nil? ? false : Chef::Util::Windows::NetGroup.new(group_name).local_get_members.include?(user_sid)
     else
-      # TODO For some reason our temporary AIX 7.2 system does not correctly report group membership immediately after changes have been made.
-      # Adding a 2 second delay for this platform is enough to get correct results.
-      # We hope to remove this delay after we get more permanent AIX 7.2 systems in our CI pipeline. reference: https://github.com/chef/release-engineering/issues/1617
-      sleep 2 if aix? && (ohai[:platform_version] == "7.2")
+      # NOTE: For some reason our temporary AIX 7.x systems do not correctly report group membership immediately after changes have been made.
+      # Adding a delay for this platform is enough to get correct results.
+      # reference: https://github.com/chef/release-engineering/issues/1617
+      sleep 3 if aix?
       Etc.getgrnam(group_name).mem.include?(user)
     end
   end
 
   def group_should_not_exist(group)
     case ohai[:os]
-    when "freebsd"
-      expect(shell_out("pw groupshow -n #{group}").exitstatus).to eq(65)
+    when "linux"
+      expect { Etc.getgrnam(group) }.to raise_error(ArgumentError, "can't find group for #{group}")
     when "windows"
       expect { Chef::Util::Windows::NetGroup.new(group).local_get_members }.to raise_error(ArgumentError, /The group name could not be found./)
-    else
-      expect { Etc.getgrnam(group) }.to raise_error(ArgumentError, "can't find group for #{group}")
     end
   end
 
@@ -144,6 +133,10 @@ describe Chef::Resource::Group, :requires_root_or_running_windows do
       temp_resource.append(true)
       temp_resource.run_action(:modify)
       members.each do |member|
+        # NOTE For some reason our temporary AIX 7.x systems do not correctly report group membership immediately after changes have been made.
+        # Adding a delay for this platform is enough to get correct results.
+        # reference: https://github.com/chef/release-engineering/issues/1617
+        sleep 3 if aix?
         expect(user_exist_in_group?(member)).to eq(true)
       end
     end
@@ -169,7 +162,7 @@ describe Chef::Resource::Group, :requires_root_or_running_windows do
     end
 
     # dscl doesn't perform any error checking and will let you add users that don't exist.
-    describe "when no users exist", :not_supported_on_macos, :not_supported_on_freebsd_gte_12_3 do
+    describe "when no users exist", :not_supported_on_macos do
       describe "when append is not set" do
         # excluded_members can only be used when append is set.  It is ignored otherwise.
         let(:excluded_members) { [] }
@@ -210,14 +203,13 @@ describe Chef::Resource::Group, :requires_root_or_running_windows do
         end
       end
 
-      describe "when append is not set", :not_supported_on_freebsd_gte_12_3 do
+      describe "when append is not set" do
         it "should set the group to to contain given members" do
           group_resource.run_action(tested_action)
 
           included_members.each do |member|
             expect(user_exist_in_group?(member)).to eq(true)
           end
-
           (spec_members - included_members).each do |member|
             expect(user_exist_in_group?(member)).to eq(false)
           end
@@ -235,16 +227,14 @@ describe Chef::Resource::Group, :requires_root_or_running_windows do
             included_members.each do |member|
               expect(user_exist_in_group?(member)).to eq(true)
             end
-            unless freebsd?
-              (spec_members - included_members).each do |member|
-                expect(user_exist_in_group?(member)).to eq(false)
-              end
+            (spec_members - included_members).each do |member|
+              expect(user_exist_in_group?(member)).to eq(false)
             end
           end
         end
       end
 
-      describe "when append is set", :not_supported_on_freebsd_gte_12_3 do
+      describe "when append is set" do
         before(:each) do
           group_resource.append(true)
         end
@@ -255,7 +245,6 @@ describe Chef::Resource::Group, :requires_root_or_running_windows do
           included_members.each do |member|
             expect(user_exist_in_group?(member)).to eq(true)
           end
-
           excluded_members.each do |member|
             expect(user_exist_in_group?(member)).to eq(false)
           end
@@ -272,7 +261,6 @@ describe Chef::Resource::Group, :requires_root_or_running_windows do
             included_members.each do |member|
               expect(user_exist_in_group?(member)).to eq(true)
             end
-
             excluded_members.each do |member|
               expect(user_exist_in_group?(member)).to eq(false)
             end
@@ -352,7 +340,7 @@ describe Chef::Resource::Group, :requires_root_or_running_windows do
     expect(group_resource.append).to eq(false)
   end
 
-  describe "group create action", :not_supported_on_freebsd_gte_12_3, :not_supported_on_macos, :not_supported_on_aix do
+  describe "group create action" do
     after(:each) do
       group_resource.run_action(:remove)
       group_should_not_exist(group_name)
@@ -409,7 +397,7 @@ describe Chef::Resource::Group, :requires_root_or_running_windows do
   end
 
   describe "group remove action" do
-    describe "when there is a group", :not_supported_on_freebsd_gte_12_3, :not_supported_on_macos, :not_supported_on_aix do
+    describe "when there is a group" do
       before do
         group_resource.run_action(:create)
         group_should_exist(group_name)
@@ -441,7 +429,7 @@ describe Chef::Resource::Group, :requires_root_or_running_windows do
       end
     end
 
-    describe "when there is a group", :not_supported_on_macos, :not_supported_on_aix do
+    describe "when there is a group", :not_supported_on_freebsd_gte_12_3 do
       it_behaves_like "correct group management"
     end
 
@@ -474,16 +462,12 @@ describe Chef::Resource::Group, :requires_root_or_running_windows do
       end
 
       it "does not raise an error on manage" do
-        if freebsd?
-          allow(shell_out).to receive("pw user show").and_return(double("User"))
-        else
-          allow(Etc).to receive(:getpwnam).and_return(double("User"))
-        end
+        allow(Etc).to receive(:getpwnam).and_return(double("User"))
         expect { group_resource.run_action(:manage) }.not_to raise_error
       end
     end
 
-    describe "when there is a group", :not_supported_on_macos, :not_supported_on_aix do
+    describe "when there is a group", :not_supported_on_freebsd_gte_12_3 do
       it_behaves_like "correct group management"
     end
 

data/spec/functional/resource/link_spec.rb

@@ -345,17 +345,17 @@ describe Chef::Resource::Link do
             let(:test_user) { "test-link-user" }
             before do
               user(test_user).run_action(:create)
-              # TODO For some reason our temporary AIX 7.2 system does not correctly report user existence immediately after changes have been made.
-              # Adding a 2 second delay for this platform is enough to get correct results.
-              # We hope to remove this delay after we get more permanent AIX 7.2 systems in our CI pipeline. reference: https://github.com/chef/release-engineering/issues/1617
-              sleep 2 if aix? && (ohai[:platform_version] == "7.2")
+              # NOTE: For some reason our temporary AIX 7.x systems do not correctly report user existence immediately after changes have been made.
+              # Adding a delay for this platform is enough to get correct results.
+              # reference: https://github.com/chef/release-engineering/issues/1617
+              sleep 3 if aix?
             end
             after do
               user(test_user).run_action(:remove)
-              # TODO For some reason our temporary AIX 7.2 system does not correctly report user existence immediately after changes have been made.
-              # Adding a 2 second delay for this platform is enough to get correct results.
-              # We hope to remove this delay after we get more permanent AIX 7.2 systems in our CI pipeline. reference: https://github.com/chef/release-engineering/issues/1617
-              sleep 2 if aix? && (ohai[:platform_version] == "7.2")
+              # TODO For some reason our temporary AIX 7.x systems do not correctly report user existence immediately after changes have been made.
+              # Adding a delay for this platform is enough to get correct results.
+              # reference: https://github.com/chef/release-engineering/issues/1617
+              sleep 3 if aix?
             end
             before(:each) do
               resource.owner(test_user)

data/spec/functional/resource/macos_userdefaults_spec.rb

@@ -38,12 +38,12 @@ describe Chef::Resource::MacosUserDefaults, :macos_only do
       expect(resource.domain).to eq("NSGlobalDomain")
     end
 
-    it ":all for the host property" do
-      expect(resource.host).to eq(:all)
+    it "nil for the host property" do
+      expect(resource.host).to be_nil
     end
 
-    it ":current for the user property" do
-      expect(resource.user).to eq(:current)
+    it "nil for the user property" do
+      expect(resource.user).to be_nil
     end
 
     it ":write for resource action" do

data/spec/functional/resource/plist_spec.rb

@@ -0,0 +1,25 @@
+require "spec_helper"
+require "plist"
+
+describe Chef::Resource::PlistResource, :macos_only, requires_root: true do
+  include RecipeDSLHelper
+
+  let(:global_prefs) do
+    File.join(Dir.mktmpdir, ".GlobalPreferences.plist")
+  end
+
+  before(:each) do
+    FileUtils.rm_f global_prefs
+  end
+
+  context "make Monday the first DOW" do
+    it "creates a new plist with a hash value" do
+      plist global_prefs do
+        entry "AppleFirstWeekday"
+        value(gregorian: 4)
+      end
+      expect(File.exist?(global_prefs))
+      expect(shell_out!("/usr/libexec/PlistBuddy -c 'Print :\"AppleFirstWeekday\":gregorian' \"#{global_prefs}\"").stdout.to_i).to eq(4)
+    end
+  end
+end

data/spec/functional/resource/user/linux_user_spec.rb

@@ -0,0 +1,127 @@
+#
+# Copyright:: Copyright (c) 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"
+require "chef/mixin/shell_out"
+
+metadata = {
+  requires_root: true,
+  linux_only: true,
+}
+
+describe "Chef::Resource::User with Chef::Provider::User::LinuxUser provider", metadata do
+  include Chef::Mixin::ShellOut
+
+  def clean_user
+    shell_out!("/usr/sbin/userdel #{username}")
+  rescue Mixlib::ShellOut::ShellCommandFailed
+    # Raised when the user is already cleaned
+  end
+
+  def ensure_file_cache_path_exists
+    path = Chef::Config["file_cache_path"]
+    FileUtils.mkdir_p(path) unless File.directory?(path)
+  end
+
+  def user_should_exist
+    expect(shell_out("grep -q #{username} /etc/passwd").error?).to be(false)
+  end
+
+  def check_password(pass, user)
+    expect(shell_out("grep ^#{user}: /etc/shadow | cut -d: -f2 | grep ^#{pass}$").exitstatus).to eq(0)
+  end
+
+  let(:node) do
+    n = Chef::Node.new
+    n.consume_external_attrs(OHAI_SYSTEM.data.dup, {})
+    n
+  end
+
+  let(:events) do
+    Chef::EventDispatch::Dispatcher.new
+  end
+
+  let(:run_context) do
+    Chef::RunContext.new(node, {}, events)
+  end
+
+  let(:username) do
+    "greatchef"
+  end
+
+  let(:uid) { nil }
+  let(:gid) do
+    # SLES 15 doesn't have the "20" group and
+    # so lets just pick the last group... no,
+    # Etc.group.map(&:gid).last does not work
+    Etc.enum_for(:group).map(&:gid).last
+  end
+  let(:home) { nil }
+  let(:manage_home) { false }
+  let(:password) { "XXXYYYZZZ" }
+  let(:comment) { "Great Chef" }
+  let(:shell) { "/bin/bash" }
+  let(:salt) { nil }
+
+  let(:user_resource) do
+    r = Chef::Resource::User::LinuxUser.new("TEST USER RESOURCE", run_context)
+    r.username(username)
+    r.uid(uid)
+    r.gid(gid)
+
+    r.home(home)
+    r.shell(shell)
+    r.comment(comment)
+    r.manage_home(manage_home)
+    r.password(password)
+    r.salt(salt)
+    r
+  end
+
+  before do
+    clean_user
+    ensure_file_cache_path_exists
+  end
+
+  after(:each) do
+    clean_user
+  end
+
+  describe "action :create" do
+    it "should create the user" do
+      user_resource.run_action(:create)
+      user_should_exist
+      check_password(password, username)
+    end
+  end
+
+  describe "when user exists" do
+    before do
+      existing_resource = user_resource.dup
+      existing_resource.run_action(:create)
+      user_should_exist
+    end
+
+    describe "when password is updated" do
+      it "should update the password of the user" do
+        user_resource.password("mykitchen")
+        user_resource.run_action(:create)
+        check_password("mykitchen", username)
+      end
+    end
+  end
+end

data/spec/functional/resource/windows_certificate_spec.rb

@@ -56,34 +56,10 @@ describe Chef::Resource::WindowsCertificate, :windows_only do
   let(:store) { "Chef-Functional-Test" }
   let(:store_name) { "MY" }
   let(:store_location) { "LocalMachine" }
-  let(:test_cert_body) do
-    <<~CERT
------BEGIN CERTIFICATE-----
-MIIDQTCCAimgAwIBAgIQX3zqNCJbsKlEvzCz3Z9aNDANBgkqhkiG9w0BAQsFADAh
-MR8wHQYDVQQDDBZ3d3cuZHVtbXljaGVmdGVzdHMuY29tMCAXDTIwMDMwNTEwMjcw
-NVoYDzIxMjAwMzA1MTAzNzA2WjAhMR8wHQYDVQQDDBZ3d3cuZHVtbXljaGVmdGVz
-dHMuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtuYKDb6woWIH
-HPPOrcVpgJFVxbkjgk+tsYwbIiqR9jtRaKE6nM/awOgn9/dFF4k8KB8Em0sUx7Vq
-J3YhK2N2cAacgP2Frqqf5znpNBBOg968RoZzGx0EiXFvLsqC4y8ggApWTbMXPRk4
-1a7GlpUpSqI3y5cLeEbzwGQKu8I1I+v7P2fTlnJPHarM7sBbL8bieukkFHYu78iV
-u1wpKOCCfs5DTmJu8WN+z1Mar9vyrWMBlt2wBBgNHPz5mcXUzJHTzaI/D9RGgBgF
-V0IkNqISx/IzR62jjj2g6MgTH4G/0mM6O5sxduM4yGmWZNZpVzh0yMLgH619MZlj
-SMQIN3U/SQIDAQABo3MwcTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYB
-BQUHAwIGCCsGAQUFBwMBMCEGA1UdEQQaMBiCFnd3dy5kdW1teWNoZWZ0ZXN0cy5j
-b20wHQYDVR0OBBYEFHwS3gs03m6RcpR+66u4OqGiZdYnMA0GCSqGSIb3DQEBCwUA
-A4IBAQCFHqMjHUfBZahIsKHQIcFCbC1NFh1ZHlJKZzrRBRwRzX19OttHGMyLpDd6
-tM9Ac6LLR8S4QIWg+HF3IrkN+vfTRDZAccj+tIwBRstmdsEz/rAJ79Vb/00mXZQx
-0FPiBDR3hE7On2oo24DU8kJP3v6TrunwtIomVGqrrkwZzvxqyW+WJMB2shGNFw5J
-mKYBiiXsHl4Bi7V4zhXssrLp877sqpNLeXloXBmAlT39SwQTP9ImZaV5R6udqlvo
-Gfgm5PH/WeK6MV3n5ik0v1rS0LwR2o82WlIB6a4iSEbzY3qSLsWOwt8o5QjAVzCR
-tNdbdS3U8nrG73iA2clmF57ARQWC
------END CERTIFICATE-----
-    CERT
-  end
+  let(:download_cert_url) { "https://testingchef.blob.core.windows.net/files/test.cer" }
   let(:cert_output_path) { ::File.join(Chef::Config[:file_cache_path], "output.cer") }
   let(:pfx_output_path) { ::File.join(Chef::Config[:file_cache_path], "output.pfx") }
   let(:key_output_path) { ::File.join(Chef::Config[:file_cache_path], "output.key") }
-  let(:download_cert_url) { "https://testingchef.blob.core.windows.net/files/test.cer" }
   let(:cer_path) { File.join(CHEF_SPEC_DATA, "windows_certificates", "test.cer") }
   let(:base64_path) { File.join(CHEF_SPEC_DATA, "windows_certificates", "base64_test.cer") }
   let(:pem_path) { File.join(CHEF_SPEC_DATA, "windows_certificates", "test.pem") }
@@ -152,7 +128,6 @@ tNdbdS3U8nrG73iA2clmF57ARQWC
     end
 
     it "can add a certificate from a valid url" do
-      stub_request(:get, download_cert_url).to_return(body: test_cert_body)
       resource.source = download_cert_url
       resource.run_action(:create)
 

data/spec/functional/resource/windows_font_spec.rb

@@ -18,7 +18,7 @@
 
 require "spec_helper"
 
-describe Chef::Resource::WindowsFont, :windows_only, :broken do # these tests hang on Chef-16 and Chef-17 in the verify-pipline.
+describe Chef::Resource::WindowsFont, :windows_only do
   let(:resource_name) { "Playmaker.ttf" }
   let(:resource_source) { "https://www.wfonts.com/download/data/2020/05/06/playmaker/Playmaker.ttf" }
 
@@ -37,13 +37,16 @@ describe Chef::Resource::WindowsFont, :windows_only, :broken do # these tests ha
     resource
   end
 
-  it "installs font on first install" do
-    subject.run_action(:install)
-    expect(subject).to be_updated_by_last_action
-  end
+  ## these were commented out because testing hangs in the verify pipeline with them enabled. WEIRD
+  ## that needs to be addressed
 
-  it "does not install font when already installed" do
-    subject.run_action(:install)
-    expect(subject).not_to be_updated_by_last_action
-  end
+  # it "installs font on first install" do
+  #   subject.run_action(:install)
+  #   expect(subject).to be_updated_by_last_action
+  # end
+
+  # it "does not install font when already installed" do
+  #   subject.run_action(:install)
+  #   expect(subject).not_to be_updated_by_last_action
+  # end
 end

data/spec/functional/resource/yum_package_spec.rb

@@ -20,7 +20,7 @@ require "chef/mixin/shell_out"
 
 # run this test only for following platforms.
 exclude_test = !(%w{rhel fedora amazon}.include?(OHAI_SYSTEM[:platform_family]) && !File.exist?("/usr/bin/dnf"))
-describe Chef::Resource::YumPackage, :requires_root, external: exclude_test, not_rhel6: true do
+describe Chef::Resource::YumPackage, :requires_root, external: exclude_test do
   include RecipeDSLHelper
   include Chef::Mixin::ShellOut
 
@@ -57,12 +57,6 @@ describe Chef::Resource::YumPackage, :requires_root, external: exclude_test, not
         baseurl=file://#{CHEF_SPEC_ASSETS}/yumrepo
         enable=1
         gpgcheck=0
-        [chef-yum-empty]
-        name=Chef DNF spec empty repo
-        baseurl=file://#{CHEF_SPEC_ASSETS}/yumrepo-empty
-        enable=1
-        gpgcheck=0
-
       EOF
     end
     # ensure we don't have any stray chef_rpms installed
@@ -1101,16 +1095,6 @@ describe Chef::Resource::YumPackage, :requires_root, external: exclude_test, not
         end.should_not_be_updated
       end
 
-      it "should work to disable a repo" do
-        flush_cache
-        expect {
-          yum_package "chef_rpm" do
-            options "--disablerepo=chef-yum-localtesting --enablerepo=chef-yum-empty"
-            action :install
-          end
-        }.to raise_error(Chef::Exceptions::Package, /No candidate version available/)
-      end
-
       it "when an idempotent install action is run, does not leave repos disabled" do
         flush_cache
         # this is a bit tricky -- we need this action to be idempotent, so that it doesn't recycle any

data/spec/functional/resource/zypper_package_spec.rb

@@ -74,6 +74,18 @@ describe Chef::Resource::ZypperPackage, :requires_root, :suse_only do
       expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$")
     end
 
+    it "install package with source argument" do
+      zypper_package.source = "#{CHEF_SPEC_ASSETS}/zypprepo/chef_rpm-1.10-1.#{pkg_arch}.rpm"
+      zypper_package.run_action(:install)
+      expect(zypper_package.updated_by_last_action?).to be true
+      expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$")
+    end
+
+    it "raises an error when passed a source that does not exist" do
+      zypper_package.source = "#{CHEF_SPEC_ASSETS}/false/zypprepo/chef_rpm-1.10-1.#{pkg_arch}.rpm"
+      expect { zypper_package.run_action(:install) }.to raise_error(Mixlib::ShellOut::ShellCommandFailed)
+    end
+
     it "does not install if the package is installed" do
       preinstall("chef_rpm-1.10-1.#{pkg_arch}.rpm")
       zypper_package.run_action(:install)
@@ -177,15 +189,6 @@ describe Chef::Resource::ZypperPackage, :requires_root, :suse_only do
         expect(zypper_package.updated_by_last_action?).to be true
         expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^package chef_rpm is not installed$")
       end
-
-      context "Package doesn't exist" do
-        let(:package_name) { "nonexistent_repo" }
-        it "does nothing if the package is not installed" do
-          zypper_package.run_action(:remove)
-          expect(zypper_package.updated_by_last_action?).to be false
-        end
-
-      end
     end
 
     context "with no available version" do
@@ -256,7 +259,6 @@ describe Chef::Resource::ZypperPackage, :requires_root, :suse_only do
       expect(shell_out("zypper locks | grep chef_rpm_provides").stdout.chomp).not_to match("chef_rpm_provides")
     end
   end
-
   def remove_package
     pkg_to_remove = Chef::Resource::ZypperPackage.new(package_name, run_context)
     pkg_to_remove.run_action(:remove)

data/spec/functional/shell_spec.rb

@@ -78,7 +78,6 @@ describe Shell do
     def run_chef_shell_with(options)
       # Windows ruby installs don't (always?) have PTY,
       # so hide the require here
-
       require "pty"
 
       # FIXME this is temporary... Solaris envs have TERM set to unknown
@@ -87,7 +86,7 @@ describe Shell do
       ENV["TERM"] = "vt100" if ["", "unknown"].include?(ENV["TERM"].to_s)
 
       config = File.expand_path("shef-config.rb", CHEF_SPEC_DATA)
-      reader, writer, pid = PTY.spawn("bundle exec chef-shell --no-multiline --no-singleline --no-colorize -c #{config} #{options}")
+      reader, writer, pid = PTY.spawn("bundle exec #{ChefUtils::Dist::Infra::SHELL} --no-multiline --no-singleline --no-colorize -c #{config} #{options}")
       read_until(reader, "chef (#{Chef::VERSION})>")
       yield reader, writer if block_given?
       writer.puts('"done"')

data/spec/functional/version_spec.rb

@@ -25,7 +25,7 @@ describe "Chef Versions", :executables do
   include Chef::Mixin::ShellOut
   let(:chef_dir) { File.join(__dir__, "..", "..") }
 
-  binaries = [ ChefUtils::Dist::Infra::CLIENT, "chef-shell", "chef-apply", ChefUtils::Dist::Solo::EXEC ]
+  binaries = [ ChefUtils::Dist::Infra::CLIENT, ChefUtils::Dist::Infra::SHELL, "chef-apply", ChefUtils::Dist::Solo::EXEC ]
 
   binaries.each do |binary|
     it "#{binary} version should be sane" do

data/spec/functional/win32/registry_spec.rb

@@ -395,9 +395,6 @@ describe "Chef::Win32::Registry", :windows_only do
       expect { @registry.get_subkeys("JKLM\\Software\\Root") }.to raise_error(Chef::Exceptions::Win32RegHiveMissing)
     end
     it "returns the array of subkeys for a given key" do
-      ::Win32::Registry.define_method :export_string do |str, enc = (Encoding.default_internal || "utf-8")|
-        str.encode(enc)
-      end
       subkeys = @registry.get_subkeys("HKCU\\Software\\Root")
       reg_subkeys = []
       ::Win32::Registry::HKEY_CURRENT_USER.open("Software\\Root", Win32::Registry::KEY_ALL_ACCESS) do |reg|