chef 14.2.0 → 14.3.37

data/spec/functional/resource/remote_file_spec.rb

@@ -360,7 +360,7 @@ describe Chef::Resource::RemoteFile do
 
       it "should raise ContentLengthMismatch" do
         expect { resource.run_action(:create) }.to raise_error(Chef::Exceptions::ContentLengthMismatch)
-        #File.should_not exist(path) # XXX: CHEF-5081
+        # File.should_not exist(path) # XXX: CHEF-5081
       end
     end
 
@@ -373,7 +373,7 @@ describe Chef::Resource::RemoteFile do
 
       it "should raise ContentLengthMismatch" do
         expect { resource.run_action(:create) }.to raise_error(Chef::Exceptions::ContentLengthMismatch)
-        #File.should_not exist(path) # XXX: CHEF-5081
+        # File.should_not exist(path) # XXX: CHEF-5081
       end
     end
 

data/spec/functional/resource/rpm_spec.rb

@@ -22,7 +22,7 @@ require "chef/mixin/shell_out"
 
 # run this test only for following platforms.
 exclude_test = !%w{aix rhel fedora suse}.include?(ohai[:platform_family])
-describe Chef::Resource::RpmPackage, :requires_root, :external => exclude_test do
+describe Chef::Resource::RpmPackage, :requires_root, external: exclude_test do
   include Chef::Mixin::ShellOut
 
   let(:new_resource) do

data/spec/functional/resource/template_spec.rb

@@ -68,7 +68,7 @@ describe Chef::Resource::Template do
   context "when the target file does not exist" do
     it "creates the template with the rendered content using the variable attribute when the :create action is run" do
       resource.source("openldap_variable_stuff.conf.erb")
-      resource.variables(:secret => "nutella")
+      resource.variables(secret: "nutella")
       resource.run_action(:create)
       expect(IO.read(path)).to eq("super secret is nutella")
     end
@@ -112,7 +112,7 @@ describe Chef::Resource::Template do
     context "using single helper syntax referencing @node" do
       before do
         node.normal[:helper_test_attr] = "value from helper method"
-        resource.helper(:helper_method) { "#{@node[:helper_test_attr]}" }
+        resource.helper(:helper_method) { (@node[:helper_test_attr]).to_s }
       end
 
       it_behaves_like "a template with helpers"
@@ -213,21 +213,21 @@ describe Chef::Resource::Template do
   describe "when template variables contain lazy{} calls" do
     it "resolves the DelayedEvaluator" do
       resource.source("openldap_variable_stuff.conf.erb")
-      resource.variables(:secret => Chef::DelayedEvaluator.new { "nutella" })
+      resource.variables(secret: Chef::DelayedEvaluator.new { "nutella" })
       resource.run_action(:create)
       expect(IO.read(path)).to eq("super secret is nutella")
     end
 
     it "does not mutate the resource variables" do
       resource.source("openldap_variable_stuff.conf.erb")
-      resource.variables(:secret => Chef::DelayedEvaluator.new { "nutella" })
+      resource.variables(secret: Chef::DelayedEvaluator.new { "nutella" })
       resource.run_action(:create)
       expect(resource.variables[:secret]).to be_a Chef::DelayedEvaluator
     end
 
     it "resolves the DelayedEvaluator when deeply nested" do
       resource.source("openldap_nested_variable_stuff.erb")
-      resource.variables(:secret => [{ "key" => Chef::DelayedEvaluator.new { "nutella" } }])
+      resource.variables(secret: [{ "key" => Chef::DelayedEvaluator.new { "nutella" } }])
       resource.run_action(:create)
       expect(IO.read(path)).to eq("super secret is nutella")
     end

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

@@ -19,9 +19,9 @@ require "spec_helper"
 require "chef/mixin/shell_out"
 
 metadata = {
-  :mac_osx_only => true,
-  :requires_root => true,
-  :not_supported_on_mac_osx_106 => true,
+  mac_osx_only: true,
+  requires_root: true,
+  not_supported_on_mac_osx_106: true,
 }
 
 describe "Chef::Resource::User with Chef::Provider::User::Dscl provider", metadata do

data/spec/functional/resource/windows_env_spec.rb

@@ -188,7 +188,7 @@ describe Chef::Resource::WindowsEnv, :windows_only do
           test_resource.value("#{path_before};#{env_val}")
           test_resource.run_action(:create)
           expect(ENV["PATH"]).not_to include(env_val)
-          expect(ENV["PATH"]).to include("#{random_name}")
+          expect(ENV["PATH"]).to include((random_name).to_s)
         end
 
         after(:each) do

data/spec/functional/resource/windows_service_spec.rb

@@ -18,7 +18,7 @@
 
 require "spec_helper"
 
-describe Chef::Resource::WindowsService, :windows_only, :system_windows_service_gem_only, :appveyor_only, :broken => true do
+describe Chef::Resource::WindowsService, :windows_only, :system_windows_service_gem_only, :appveyor_only, broken: true do
   # Marking as broken. This test is causing appveyor tests to exit with 116.
 
   include_context "using Win32::Service"

data/spec/functional/resource/windows_task_spec.rb

@@ -46,7 +46,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
       it "creates scheduled task and sets command arguments" do
         subject.command "chef-client -W"
         call_for_create_action
-        #loading current resource again to check new task is creted and it matches task parameters
+        # loading current resource again to check new task is creted and it matches task parameters
         current_resource = call_for_load_current_resource
         expect(current_resource.exists).to eq(true)
         expect(current_resource.task.application_name).to eq("chef-client")
@@ -64,7 +64,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
       it "creates scheduled task and sets command arguments" do
         subject.command "chef-client -W -L 'C:\\chef\\chef-ad-join.log'"
         call_for_create_action
-        #loading current resource again to check new task is creted and it matches task parameters
+        # loading current resource again to check new task is creted and it matches task parameters
         current_resource = call_for_load_current_resource
         expect(current_resource.exists).to eq(true)
         expect(current_resource.task.application_name).to eq("chef-client")
@@ -82,7 +82,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
       it "creates scheduled task and sets command arguments" do
         subject.command '"C:\\Program Files\\example\program.exe" -arg1 --arg2'
         call_for_create_action
-        #loading current resource again to check new task is creted and it matches task parameters
+        # loading current resource again to check new task is creted and it matches task parameters
         current_resource = call_for_load_current_resource
         expect(current_resource.exists).to eq(true)
         expect(current_resource.task.application_name).to eq("C:\\Program Files\\example\\program.exe")
@@ -100,7 +100,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
       it "creates scheduled task and sets command arguments" do
         subject.command "ping http://www.google.com"
         call_for_create_action
-        #loading current resource again to check new task is creted and it matches task parameters
+        # loading current resource again to check new task is creted and it matches task parameters
         current_resource = call_for_load_current_resource
         expect(current_resource.exists).to eq(true)
         expect(current_resource.task.application_name).to eq("ping")
@@ -129,7 +129,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
 
       it "creates a scheduled task to run every 1 hr starting on 09/20/2017" do
         call_for_create_action
-        #loading current resource again to check new task is creted and it matches task parameters
+        # loading current resource again to check new task is creted and it matches task parameters
         current_resource = call_for_load_current_resource
         expect(current_resource.exists).to eq(true)
         expect(current_resource.task.application_name).to eq(task_name)
@@ -161,7 +161,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
 
       it "creates a scheduled task that runs after every 15 minutes" do
         call_for_create_action
-        #loading current resource again to check new task is creted and it matches task parameters
+        # loading current resource again to check new task is creted and it matches task parameters
         current_resource = call_for_load_current_resource
         expect(current_resource.exists).to eq(true)
         trigger_details = current_resource.task.trigger(0)
@@ -209,7 +209,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
 
       it "creates a scheduled task that runs after every 3 hrs" do
         call_for_create_action
-        #loading current resource again to check new task is creted and it matches task parameters
+        # loading current resource again to check new task is creted and it matches task parameters
         current_resource = call_for_load_current_resource
         expect(current_resource.exists).to eq(true)
         trigger_details = current_resource.task.trigger(0)
@@ -254,7 +254,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
 
       it "creates a scheduled task to run daily" do
         call_for_create_action
-        #loading current resource again to check new task is creted and it matches task parameters
+        # loading current resource again to check new task is creted and it matches task parameters
         current_resource = call_for_load_current_resource
         expect(current_resource.exists).to eq(true)
         trigger_details = current_resource.task.trigger(0)
@@ -289,7 +289,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
 
         it "if day property is not set creates a scheduled task to run monthly on first day of the month" do
           call_for_create_action
-          #loading current resource again to check new task is creted and it matches task parameters
+          # loading current resource again to check new task is creted and it matches task parameters
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
           trigger_details = current_resource.task.trigger(0)
@@ -309,7 +309,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
         it "creates a scheduled task to run monthly on first, second and third day of the month" do
           subject.day "1, 2, 3"
           call_for_create_action
-          #loading current resource again to check new task is created and it matches task parameters
+          # loading current resource again to check new task is created and it matches task parameters
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
           trigger_details = current_resource.task.trigger(0)
@@ -330,15 +330,15 @@ describe Chef::Resource::WindowsTask, :windows_only do
         it "creates a scheduled task to run monthly on 1, 2, 3, 4, 8, 20, 21, 15, 28, 31 day of the month" do
           subject.day "1, 2, 3, 4, 8, 20, 21, 15, 28, 31"
           call_for_create_action
-          #loading current resource again to check new task is created and it matches task parameters
+          # loading current resource again to check new task is created and it matches task parameters
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
           trigger_details = current_resource.task.trigger(0)
           expect(current_resource.task.application_name).to eq(task_name)
           expect(trigger_details[:trigger_type]).to eq(4)
           expect(current_resource.task.principals[:run_level]).to eq(1)
-          expect(trigger_details[:type][:days]).to eq(1209548943) #TODO:: windows_task_provider.send(:days_of_month)
-          expect(trigger_details[:type][:months]).to eq(4095) #windows_task_provider.send(:months_of_year)
+          expect(trigger_details[:type][:days]).to eq(1209548943) # TODO:: windows_task_provider.send(:days_of_month)
+          expect(trigger_details[:type][:months]).to eq(4095) # windows_task_provider.send(:months_of_year)
         end
 
         it "does not converge the resource if it is already converged" do
@@ -352,15 +352,15 @@ describe Chef::Resource::WindowsTask, :windows_only do
           subject.day "1, 2, 3, 4, 8, 20, 21, 30"
           subject.months "Jan, Feb, May, Sep, Dec"
           call_for_create_action
-          #loading current resource again to check new task is created and it matches task parameters
+          # loading current resource again to check new task is created and it matches task parameters
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
           trigger_details = current_resource.task.trigger(0)
           expect(current_resource.task.application_name).to eq(task_name)
           expect(trigger_details[:trigger_type]).to eq(4)
           expect(current_resource.task.principals[:run_level]).to eq(1)
-          expect(trigger_details[:type][:days]).to eq(538443919) #TODO:windows_task_provider.send(:days_of_month)
-          expect(trigger_details[:type][:months]).to eq(2323) #windows_task_provider.send(:months_of_year)
+          expect(trigger_details[:type][:days]).to eq(538443919) # TODO:windows_task_provider.send(:days_of_month)
+          expect(trigger_details[:type][:months]).to eq(2323) # windows_task_provider.send(:months_of_year)
         end
 
         it "does not converge the resource if it is already converged" do
@@ -375,7 +375,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
           subject.frequency_modifier "First"
           subject.day "Mon, Fri, Sun"
           call_for_create_action
-          #loading current resource again to check new task is created and it matches task parameters
+          # loading current resource again to check new task is created and it matches task parameters
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
           trigger_details = current_resource.task.trigger(0)
@@ -384,7 +384,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
           expect(current_resource.task.principals[:run_level]).to eq(1)
           expect(trigger_details[:type][:days_of_week]).to eq(35)
           expect(trigger_details[:type][:weeks_of_month]).to eq(1)
-          expect(trigger_details[:type][:months]).to eq(4095) #windows_task_provider.send(:months_of_year)
+          expect(trigger_details[:type][:months]).to eq(4095) # windows_task_provider.send(:months_of_year)
         end
 
         it "does not converge the resource if it is already converged" do
@@ -606,7 +606,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
           subject.day "2"
           subject.start_day "03/07/2018"
           call_for_create_action
-          #loading current resource again to check new task is creted and it matches task parameters
+          # loading current resource again to check new task is creted and it matches task parameters
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
           trigger_details = current_resource.task.trigger(0)
@@ -628,7 +628,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
         it "creates a scheduled task to run monthly on first, second and third day of the month" do
           subject.day "1,2,3"
           call_for_create_action
-          #loading current resource again to check new task is creted and it matches task parameters
+          # loading current resource again to check new task is creted and it matches task parameters
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
           trigger_details = current_resource.task.trigger(0)
@@ -649,7 +649,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
         it "creates a scheduled task to run monthly on each wednesday of the month" do
           subject.frequency_modifier "1"
           call_for_create_action
-          #loading current resource again to check new task is creted and it matches task parameters
+          # loading current resource again to check new task is creted and it matches task parameters
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
           trigger_details = current_resource.task.trigger(0)
@@ -657,7 +657,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
           expect(trigger_details[:trigger_type]).to eq(4)
           expect(current_resource.task.principals[:run_level]).to eq(1)
           expect(trigger_details[:type][:days]).to eq(1)
-          expect(trigger_details[:type][:months]).to eq(4095) #windows_task_provider.send(:months_of_year)
+          expect(trigger_details[:type][:months]).to eq(4095) # windows_task_provider.send(:months_of_year)
         end
 
         it "does not converge the resource if it is already converged" do
@@ -671,16 +671,16 @@ describe Chef::Resource::WindowsTask, :windows_only do
           subject.frequency_modifier "2"
           subject.months = nil
           call_for_create_action
-          #loading current resource again to check new task is creted and it matches task parameters
+          # loading current resource again to check new task is creted and it matches task parameters
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
           trigger_details = current_resource.task.trigger(0)
-          #loading current resource
+          # loading current resource
           expect(current_resource.task.application_name).to eq(task_name)
           expect(trigger_details[:trigger_type]).to eq(4)
           expect(current_resource.task.principals[:run_level]).to eq(1)
           expect(trigger_details[:type][:days]).to eq(1)
-          expect(trigger_details[:type][:months]).to eq(2730) #windows_task_provider.send(:months_of_year)
+          expect(trigger_details[:type][:months]).to eq(2730) # windows_task_provider.send(:months_of_year)
         end
 
         it "does not converge the resource if it is already converged" do
@@ -714,7 +714,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
         it "creates the scheduled task to run once at 5pm" do
           subject.start_time "17:00"
           call_for_create_action
-          #loading current resource again to check new task is creted and it matches task parameters
+          # loading current resource again to check new task is creted and it matches task parameters
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
           trigger_details = current_resource.task.trigger(0)
@@ -745,7 +745,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
 
       it "creates the scheduled task to run weekly" do
         call_for_create_action
-        #loading current resource again to check new task is creted and it matches task parameters
+        # loading current resource again to check new task is creted and it matches task parameters
         current_resource = call_for_load_current_resource
         expect(current_resource.exists).to eq(true)
         trigger_details = current_resource.task.trigger(0)
@@ -765,7 +765,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
         it "creates hte scheduled task for all days of week" do
           subject.day "*"
           call_for_create_action
-          #loading current resource again to check new task is creted and it matches task parameters
+          # loading current resource again to check new task is creted and it matches task parameters
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
           trigger_details = current_resource.task.trigger(0)
@@ -789,7 +789,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
           subject.day "Mon, Fri"
           subject.frequency_modifier 2
           call_for_create_action
-          #loading current resource again to check new task is creted and it matches task parameters
+          # loading current resource again to check new task is creted and it matches task parameters
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
           trigger_details = current_resource.task.trigger(0)
@@ -894,7 +894,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
 
       it "creates the scheduled task to run at system start up" do
         call_for_create_action
-        #loading current resource again to check new task is creted and it matches task parameters
+        # loading current resource again to check new task is creted and it matches task parameters
         current_resource = call_for_load_current_resource
         expect(current_resource.exists).to eq(true)
         trigger_details = current_resource.task.trigger(0)
@@ -914,7 +914,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
           subject.start_day "09/10/2018"
           subject.start_time "15:00"
           call_for_create_action
-          #loading current resource again to check new task is creted and it matches task parameters
+          # loading current resource again to check new task is creted and it matches task parameters
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
           trigger_details = current_resource.task.trigger(0)
@@ -941,7 +941,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
 
       it "creates the scheduled task to on logon" do
         call_for_create_action
-        #loading current resource again to check new task is creted and it matches task parameters
+        # loading current resource again to check new task is creted and it matches task parameters
         current_resource = call_for_load_current_resource
         expect(current_resource.exists).to eq(true)
         trigger_details = current_resource.task.trigger(0)
@@ -961,7 +961,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
           subject.start_day "09/10/2018"
           subject.start_time "15:00"
           call_for_create_action
-          #loading current resource again to check new task is creted and it matches task parameters
+          # loading current resource again to check new task is creted and it matches task parameters
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
           trigger_details = current_resource.task.trigger(0)
@@ -996,7 +996,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
         it "creates the scheduled task to run when system is idle" do
           subject.idle_time 20
           call_for_create_action
-          #loading current resource again to check new task is creted and it matches task parameters
+          # loading current resource again to check new task is creted and it matches task parameters
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
           trigger_details = current_resource.task.trigger(0)
@@ -1021,7 +1021,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
           subject.start_day "09/10/2018"
           subject.start_time "15:00"
           call_for_create_action
-          #loading current resource again to check new task is creted and it matches task parameters
+          # loading current resource again to check new task is creted and it matches task parameters
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
           trigger_details = current_resource.task.trigger(0)
@@ -1049,7 +1049,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
         subject.frequency :minute
         subject.random_delay "20"
         call_for_create_action
-        #loading current resource again to check new task is creted and it matches task parameters
+        # loading current resource again to check new task is creted and it matches task parameters
         current_resource = call_for_load_current_resource
         expect(current_resource.exists).to eq(true)
         trigger_details = current_resource.task.trigger(0)
@@ -1092,7 +1092,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
 
       it "creates the scheduled task to run on demand only" do
         call_for_create_action
-        #loading current resource again to check new task is creted and it matches task parameters
+        # loading current resource again to check new task is creted and it matches task parameters
         current_resource = call_for_load_current_resource
         expect(current_resource.exists).to eq(true)
 
@@ -1109,6 +1109,60 @@ describe Chef::Resource::WindowsTask, :windows_only do
     end
   end
 
+  context "task_name with parent folder" do
+    describe "task_name with path '\\foo\\chef-client-functional-test' " do
+      let(:task_name) { "\\foo\\chef-client-functional-test" }
+      after { delete_task }
+      subject do
+        new_resource = Chef::Resource::WindowsTask.new(task_name, run_context)
+        new_resource.command task_name
+        new_resource.run_level :highest
+        new_resource.frequency :once
+        new_resource.execution_time_limit = 259200 / 60 # converting "PT72H" into minutes and passing here since win32-taskscheduler accespts this
+        new_resource
+      end
+
+      it "creates the scheduled task with task name 'chef-client-functional-test' inside path '\\foo'" do
+        call_for_create_action
+        current_resource = call_for_load_current_resource
+        expect(current_resource.exists).to eq(true)
+        expect(current_resource.task.application_name).to eq(task_name)
+      end
+
+      it "does not converge the resource if it is already converged" do
+        subject.run_action(:create)
+        subject.run_action(:create)
+        expect(subject).not_to be_updated_by_last_action
+      end
+    end
+
+    describe "task_name with path '\\foo\\bar\\chef-client-functional-test' " do
+      let(:task_name) { "\\foo\\bar\\chef-client-functional-test" }
+      after { delete_task }
+      subject do
+        new_resource = Chef::Resource::WindowsTask.new(task_name, run_context)
+        new_resource.command task_name
+        new_resource.run_level :highest
+        new_resource.frequency :once
+        new_resource.execution_time_limit = 259200 / 60 # converting "PT72H" into minutes and passing here since win32-taskscheduler accespts this
+        new_resource
+      end
+
+      it "creates the scheduled task with task with name 'chef-client-functional-test' inside path '\\foo\\bar' " do
+        call_for_create_action
+        current_resource = call_for_load_current_resource
+        expect(current_resource.exists).to eq(true)
+        expect(current_resource.task.application_name).to eq(task_name)
+      end
+
+      it "does not converge the resource if it is already converged" do
+        subject.run_action(:create)
+        subject.run_action(:create)
+        expect(subject).not_to be_updated_by_last_action
+      end
+    end
+  end
+
   describe "Examples of idempotent checks for each frequency" do
     after { delete_task }
     context "For frequency :once" do
@@ -1460,7 +1514,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
       subject.run_action(:run)
       subject.run_action(:end)
       current_resource = call_for_load_current_resource
-      expect(current_resource.task.status).to eq("queued").or eq("ready") #queued or can be ready
+      expect(current_resource.task.status).to eq("queued").or eq("ready") # queued or can be ready
     end
   end