chef 16.2.73-universal-mingw32 → 16.4.41-universal-mingw32

data/spec/functional/resource/link_spec.rb

@@ -55,13 +55,13 @@ describe Chef::Resource::Link do
   end
 
   after(:each) do
-    begin
-      cleanup_link(to) if File.exists?(to)
-      cleanup_link(target_file) if File.exists?(target_file)
-      cleanup_link(CHEF_SPEC_BACKUP_PATH) if File.exists?(CHEF_SPEC_BACKUP_PATH)
-    rescue
-      puts "Could not remove a file: #{$!}"
-    end
+
+    cleanup_link(to) if File.exist?(to)
+    cleanup_link(target_file) if File.exist?(target_file)
+    cleanup_link(CHEF_SPEC_BACKUP_PATH) if File.exist?(CHEF_SPEC_BACKUP_PATH)
+  rescue
+    puts "Could not remove a file: #{$!}"
+
   end
 
   def user(user)
@@ -273,7 +273,7 @@ describe Chef::Resource::Link do
           resource.run_action(:create)
         end
         it "preserves the hard link" do
-          expect(File.exists?(target_file)).to be_truthy
+          expect(File.exist?(target_file)).to be_truthy
           expect(symlink?(target_file)).to be_falsey
           # Writing to one hardlinked file should cause both
           # to have the new value.
@@ -298,7 +298,7 @@ describe Chef::Resource::Link do
           resource.run_action(:create)
         end
         it "links to the target file" do
-          expect(File.exists?(target_file)).to be_truthy
+          expect(File.exist?(target_file)).to be_truthy
           expect(symlink?(target_file)).to be_falsey
           # Writing to one hardlinked file should cause both
           # to have the new value.
@@ -338,7 +338,7 @@ describe Chef::Resource::Link do
             include_context "delete succeeds"
             it "the :delete action does not delete the target file" do
               resource.run_action(:delete)
-              expect(File.exists?(to)).to be_truthy
+              expect(File.exist?(to)).to be_truthy
             end
           end
           context "pointing somewhere else", :requires_root_or_running_windows do
@@ -366,7 +366,7 @@ describe Chef::Resource::Link do
             include_context "delete succeeds"
             it "the :delete action does not delete the target file" do
               resource.run_action(:delete)
-              expect(File.exists?(to)).to be_truthy
+              expect(File.exist?(to)).to be_truthy
             end
           end
           context "pointing nowhere" do
@@ -383,7 +383,7 @@ describe Chef::Resource::Link do
         context "and the link already exists and is a hard link to the file" do
           before(:each) do
             link(to, target_file)
-            expect(File.exists?(target_file)).to be_truthy
+            expect(File.exist?(target_file)).to be_truthy
             expect(symlink?(target_file)).to be_falsey
           end
           include_context "create symbolic link succeeds"
@@ -403,7 +403,7 @@ describe Chef::Resource::Link do
           it "create errors out" do
             if windows?
               expect { resource.run_action(:create) }.to raise_error(Errno::EACCES)
-            elsif os_x? || solaris? || freebsd? || aix?
+            elsif macos? || solaris? || freebsd? || aix?
               expect { resource.run_action(:create) }.to raise_error(Errno::EPERM)
             else
               expect { resource.run_action(:create) }.to raise_error(Errno::EISDIR)
@@ -582,14 +582,14 @@ describe Chef::Resource::Link do
         context "and the link already exists and is a hard link to the file" do
           before(:each) do
             link(to, target_file)
-            expect(File.exists?(target_file)).to be_truthy
+            expect(File.exist?(target_file)).to be_truthy
             expect(symlink?(target_file)).to be_falsey
           end
           include_context "create hard link is noop"
           include_context "delete succeeds"
           it "the :delete action does not delete the target file" do
             resource.run_action(:delete)
-            expect(File.exists?(to)).to be_truthy
+            expect(File.exist?(to)).to be_truthy
           end
         end
         context "and the link already exists and is a file" do
@@ -606,7 +606,7 @@ describe Chef::Resource::Link do
           it "errors out" do
             if windows?
               expect { resource.run_action(:create) }.to raise_error(Errno::EACCES)
-            elsif os_x? || solaris? || freebsd? || aix?
+            elsif macos? || solaris? || freebsd? || aix?
               expect { resource.run_action(:create) }.to raise_error(Errno::EPERM)
             else
               expect { resource.run_action(:create) }.to raise_error(Errno::EISDIR)
@@ -653,9 +653,9 @@ describe Chef::Resource::Link do
           end
           context "and the link does not yet exist" do
             it "links to the target file" do
-              skip("macOS/FreeBSD/AIX/Solaris symlink? and readlink working on hard links to symlinks") if os_x? || freebsd? || aix? || solaris?
+              skip("macOS/FreeBSD/AIX/Solaris symlink? and readlink working on hard links to symlinks") if macos? || freebsd? || aix? || solaris?
               resource.run_action(:create)
-              expect(File.exists?(target_file)).to be_truthy
+              expect(File.exist?(target_file)).to be_truthy
               # macOS gets angry about this sort of link. Bug in macOS, IMO.
               expect(symlink?(target_file)).to be_truthy
               expect(readlink(target_file)).to eq(canonicalize(@other_target))
@@ -672,9 +672,9 @@ describe Chef::Resource::Link do
           end
           context "and the link does not yet exist" do
             it "links to the target file" do
-              skip("macOS/FreeBSD/AIX/Solaris fails to create hardlinks to broken symlinks") if os_x? || freebsd? || aix? || solaris?
+              skip("macOS/FreeBSD/AIX/Solaris fails to create hardlinks to broken symlinks") if macos? || freebsd? || aix? || solaris?
               resource.run_action(:create)
-              expect(File.exists?(target_file) || File.symlink?(target_file)).to be_truthy
+              expect(File.exist?(target_file) || File.symlink?(target_file)).to be_truthy
               expect(symlink?(target_file)).to be_truthy
               expect(readlink(target_file)).to eq(canonicalize(@other_target))
             end

data/spec/functional/resource/powershell_script_spec.rb

@@ -273,10 +273,10 @@ describe Chef::Resource::WindowsScript::PowershellScript, :windows_only do
 
     context "when running on a 32-bit version of Windows", :windows32_only do
       it "raises an exception if :x86_64 process architecture is specified" do
-        begin
-          expect(resource.architecture(:x86_64)).to raise_error Chef::Exceptions::Win32ArchitectureIncorrect
-        rescue Chef::Exceptions::Win32ArchitectureIncorrect
-        end
+
+        expect(resource.architecture(:x86_64)).to raise_error Chef::Exceptions::Win32ArchitectureIncorrect
+      rescue Chef::Exceptions::Win32ArchitectureIncorrect
+
       end
     end
   end

data/spec/functional/resource/remote_file_spec.rb

@@ -409,13 +409,7 @@ describe Chef::Resource::RemoteFile do
       it "should not create the file" do
         # This can legitimately raise either Errno::EADDRNOTAVAIL or Errno::ECONNREFUSED
         # in different Ruby versions.
-        old_value = RSpec::Expectations.configuration.on_potential_false_positives
-        RSpec::Expectations.configuration.on_potential_false_positives = :nothing
-        begin
-          expect { resource.run_action(:create) }.to raise_error
-        ensure
-          RSpec::Expectations.configuration.on_potential_false_positives = old_value
-        end
+        expect { resource.run_action(:create) }.to raise_error(SystemCallError)
 
         expect(File).not_to exist(path)
       end

data/spec/functional/resource/rpm_spec.rb

@@ -39,7 +39,7 @@ describe Chef::Resource::RpmPackage, :requires_root, external: exclude_test do
     # mytest rpm package works in centos, redhat and in suse without any dependency issues.
     else
       expect(shell_out("rpm -qa | grep mytest").exitstatus).to eq(0)
-      ::File.exists?("/opt/mytest/mytest.sh") # The mytest rpm package contains the mytest.sh file
+      ::File.exist?("/opt/mytest/mytest.sh") # The mytest rpm package contains the mytest.sh file
     end
   end
 
@@ -48,7 +48,7 @@ describe Chef::Resource::RpmPackage, :requires_root, external: exclude_test do
       expect(shell_out("rpm -qa | grep dummy").exitstatus).to eq(1)
     else
       expect(shell_out("rpm -qa | grep mytest").exitstatus).to eq(1)
-      !::File.exists?("/opt/mytest/mytest.sh")
+      !::File.exist?("/opt/mytest/mytest.sh")
     end
   end
 

data/spec/functional/resource/windows_certificate_spec.rb

@@ -390,7 +390,7 @@ describe Chef::Resource::WindowsCertificate, :windows_only do
       end
 
       after do
-        if File.exists?(out_path)
+        if File.exist?(out_path)
           File.delete(out_path)
         end
       end
@@ -405,7 +405,7 @@ describe Chef::Resource::WindowsCertificate, :windows_only do
           expect(no_of_certificates).to eq(1)
         end
         it "Stores Certificate content at given path" do
-          expect(File.exists?(out_path)).to be_truthy
+          expect(File.exist?(out_path)).to be_truthy
         end
         it "Does not converge while fetching" do
           expect(win_certificate).not_to be_updated_by_last_action
@@ -425,7 +425,7 @@ describe Chef::Resource::WindowsCertificate, :windows_only do
           expect(stdout.string.strip).to be_empty
         end
         it "Does not store certificate content at given path" do
-          expect(File.exists?(out_path)).to be_falsy
+          expect(File.exist?(out_path)).to be_falsy
         end
         it "Does not converge while fetching" do
           expect(win_certificate).not_to be_updated_by_last_action

data/spec/functional/resource/windows_font_spec.rb

@@ -0,0 +1,49 @@
+#
+# Author:: Dheeraj Singh Dubey (<ddubey@chef.io>)
+# 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"
+
+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" }
+
+  let(:run_context) do
+    node = Chef::Node.new
+    node.default[:platform] = ohai[:platform]
+    node.default[:platform_version] = ohai[:platform_version]
+    node.default[:os] = ohai[:os]
+    events = Chef::EventDispatch::Dispatcher.new
+    Chef::RunContext.new(node, {}, events)
+  end
+
+  subject do
+    resource = Chef::Resource::WindowsFont.new(resource_name, run_context)
+    resource.source resource_source
+    resource
+  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/windows_security_policy_spec.rb

@@ -17,11 +17,8 @@
 #
 
 require "spec_helper"
-require "chef/mixin/powershell_out"
 
 describe Chef::Resource::WindowsSecurityPolicy, :windows_only do
-  include Chef::Mixin::PowershellExec
-
   let(:secoption) { "MaximumPasswordAge" }
   let(:secvalue) { "30" }
   let(:windows_test_run_context) do

data/spec/functional/resource/windows_user_privilege_spec.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require_relative "../../spec_helper"
+require "spec_helper"
 
 describe Chef::Resource::WindowsUserPrivilege, :windows_only do
   let(:principal) { nil }

data/spec/functional/run_lock_spec.rb

@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require_relative "../spec_helper"
+require "spec_helper"
 require "chef/client"
 
 describe Chef::RunLock do
@@ -61,17 +61,17 @@ describe Chef::RunLock do
     let!(:p1) { ClientProcess.new(self, "p1") }
     let!(:p2) { ClientProcess.new(self, "p2") }
     after(:each) do |example|
-      begin
-        p1.stop
-        p2.stop
-      rescue
-        example.exception = $!
-        raise
-      ensure
-        if example.exception
-          print_events
-        end
+
+      p1.stop
+      p2.stop
+    rescue
+      example.exception = $!
+      raise
+    ensure
+      if example.exception
+        print_events
       end
+
     end
 
     def print_events
@@ -435,6 +435,7 @@ describe Chef::RunLock do
 
     class TestRunLock < Chef::RunLock
       attr_accessor :client_process
+
       def create_lock
         super
         client_process.fire_event("created lock")
@@ -444,21 +445,21 @@ describe Chef::RunLock do
     def start
       example.log_event("#{name}.start")
       @pid = fork do
-        begin
-          Timeout.timeout(CLIENT_PROCESS_TIMEOUT) do
-            run_lock = TestRunLock.new(example.lockfile)
-            run_lock.client_process = self
-            fire_event("started")
-            run_lock.acquire
-            fire_event("acquired lock")
-            run_lock.save_pid
-            fire_event("saved pid")
-            exit!(0)
-          end
-        rescue
-          fire_event($!.message.lines.join(" // "))
-          raise
+
+        Timeout.timeout(CLIENT_PROCESS_TIMEOUT) do
+          run_lock = TestRunLock.new(example.lockfile)
+          run_lock.client_process = self
+          fire_event("started")
+          run_lock.acquire
+          fire_event("acquired lock")
+          run_lock.save_pid
+          fire_event("saved pid")
+          exit!(0)
         end
+      rescue
+        fire_event($!.message.lines.join(" // "))
+        raise
+
       end
       example.log_event("#{name}.start forked (pid #{pid})")
     end

data/spec/functional/shell_spec.rb

@@ -97,13 +97,13 @@ describe Shell do
       [output, e.status]
     end
 
-    it "boots correctly with -lauto" do
+    it "boots correctly with -lauto", :executables do
       output, exitstatus = run_chef_shell_with("-lauto")
       expect(output).to include("done")
       expect(exitstatus).to eq(0)
     end
 
-    it "sets the log_level from the command line" do
+    it "sets the log_level from the command line", :executables do
       output, exitstatus = run_chef_shell_with("-lfatal") do |out, keyboard|
         show_log_level_code = %q[puts "===#{Chef::Log.level}==="]
         keyboard.puts(show_log_level_code)
@@ -114,13 +114,13 @@ describe Shell do
     end
 
     context "on solo mode" do
-      it "starts correctly" do
+      it "starts correctly", :executables do
         output, exitstatus = run_chef_shell_with("--solo")
         expect(output).to include("done")
         expect(exitstatus).to eq(0)
       end
 
-      it "should be able to use the API" do
+      it "should be able to use the API", :executables do
         output, exitstatus = run_chef_shell_with("-s") do |out, keyboard|
           simple_api_get = "api.get('data')"
           keyboard.puts(simple_api_get)
@@ -131,7 +131,7 @@ describe Shell do
       end
     end
 
-    it "sets the override_runlist from the command line" do
+    it "sets the override_runlist from the command line", :executables do
       output, exitstatus = run_chef_shell_with("-o 'override::foo,override::bar'") do |out, keyboard|
         show_recipes_code = %q[puts "#{node["recipes"].inspect}"]
         keyboard.puts(show_recipes_code)

data/spec/functional/util/powershell/cmdlet_spec.rb

@@ -17,7 +17,7 @@
 #
 
 require "chef/json_compat"
-require_relative "../../../spec_helper"
+require "spec_helper"
 
 describe Chef::Util::Powershell::Cmdlet, :windows_powershell_dsc_only do
   before(:all) do

data/spec/functional/version_spec.rb

@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require_relative "../spec_helper"
+require "spec_helper"
 require "chef/mixin/shell_out"
 require "chef/version"
 require "ohai/version"

data/spec/functional/win32/registry_spec.rb

@@ -267,10 +267,10 @@ describe "Chef::Win32::Registry", :windows_only do
   describe "create_key" do
     before(:all) do
       ::Win32::Registry::HKEY_CURRENT_USER.open("Software\\Root") do |reg|
-        begin
-          reg.delete_key("Trunk", true)
-        rescue
-        end
+
+        reg.delete_key("Trunk", true)
+      rescue
+
       end
     end
 
@@ -362,10 +362,10 @@ describe "Chef::Win32::Registry", :windows_only do
     before(:all) do
       ::Win32::Registry::HKEY_CURRENT_USER.create "Software\\Root\\Trunk"
       ::Win32::Registry::HKEY_CURRENT_USER.open("Software\\Root\\Trunk") do |reg|
-        begin
-          reg.delete_key("Red", true)
-        rescue
-        end
+
+        reg.delete_key("Red", true)
+      rescue
+
       end
     end
 

data/spec/functional/win32/service_manager_spec.rb

@@ -125,7 +125,7 @@ describe "Chef::Application::WindowsServiceManager", :windows_only, :system_wind
         it "start should start the service", :volatile do
           service_manager.run(["-a", "start"])
           expect(test_service_state).to eq("running")
-          expect(File.exists?(test_service_file)).to be_truthy
+          expect(File.exist?(test_service_file)).to be_truthy
         end
 
         it "stop should not affect the service" do