chef 15.1.36-universal-mingw32 → 15.2.20-universal-mingw32

data/spec/unit/resource/rhsm_repo_spec.rb

@@ -60,5 +60,11 @@ describe Chef::Resource::RhsmRepo do
         expect(provider.repo_enabled?("differentrepo")).to eq(false)
       end
     end
+
+    context "when user pass wildcard" do
+      it "returns true" do
+        expect(provider.repo_enabled?("*")).to eq(true)
+      end
+    end
   end
 end

data/spec/unit/resource/service_spec.rb

@@ -167,7 +167,7 @@ describe Chef::Resource::Service do
   end
 
   it "allows you to set what features this resource supports as an array" do
-    support_array = [ :status, :restart ]
+    support_array = %i{status restart}
     support_hash = { status: true, restart: true }
     resource.supports(support_array)
     expect(resource.supports).to eq(support_hash)

data/spec/unit/resource/template_spec.rb

@@ -147,7 +147,7 @@ describe Chef::Resource::Template do
     end
 
     it "compiles helper methods with arguments into a module" do
-      resource.helper(:shout) { |quiet| quiet.upcase }
+      resource.helper(:shout, &:upcase)
       modules = resource.helper_modules
       o = Object.new
       modules.each { |m| o.extend(m) }
@@ -186,7 +186,7 @@ describe Chef::Resource::Template do
     end
 
     it "raises an error when no block or module name is given for helpers definition" do
-      expect { resource.helpers() }.to raise_error(Chef::Exceptions::ValidationFailed)
+      expect { resource.helpers }.to raise_error(Chef::Exceptions::ValidationFailed)
     end
 
     it "raises an error when a non-module is given for helpers definition" do

data/spec/unit/resource/windows_env_spec.rb

@@ -47,7 +47,7 @@ describe Chef::Resource::WindowsEnv do
   end
 
   it "does not accept a Hash for the env value via 'to'" do
-    expect { resource.value Hash.new }.to raise_error(ArgumentError)
+    expect { resource.value({}) }.to raise_error(ArgumentError)
   end
 
   it "allows you to set an env value via 'to'" do

data/spec/unit/resource/windows_service_spec.rb

@@ -48,7 +48,7 @@ describe Chef::Resource::WindowsService, "initialize" do
     expect { resource.action :unmask }.not_to raise_error
   end
 
-  [:automatic, :manual, :disabled].each do |type|
+  %i{automatic manual disabled}.each do |type|
     it "supports setting startup_type property to #{type.inspect}" do
       resource.startup_type type
       expect(resource.startup_type).to eql(type)
@@ -69,7 +69,7 @@ describe Chef::Resource::WindowsService, "initialize" do
     end
   end
 
-  [:automatic, :manual, :disabled].each do |type|
+  %i{automatic manual disabled}.each do |type|
     it "supports setting startup_type property to #{type.inspect}" do
       resource.startup_type type
       expect(resource.startup_type).to eql(type)
@@ -84,11 +84,11 @@ describe Chef::Resource::WindowsService, "initialize" do
   # Properties that are Strings
   %i{description service_name binary_path_name load_order_group dependencies
      run_as_user run_as_password display_name}.each do |prop|
-    it "support setting #{prop} property with a String" do
-      resource.send("#{prop}=", "some value")
-      expect(resource.send(prop)).to eq("some value")
-    end
-  end
+       it "support setting #{prop} property with a String" do
+         resource.send("#{prop}=", "some value")
+         expect(resource.send(prop)).to eq("some value")
+       end
+     end
 
   # Properties that are Integers
   %i{desired_access error_control service_type}.each do |prop|

data/spec/unit/resource/windows_task_spec.rb

@@ -356,7 +356,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
 
   context "#validate_idle_time" do
     it "raises error if frequency is not :on_idle" do
-      [:minute, :hourly, :daily, :weekly, :monthly, :once, :on_logon, :onstart, :none].each do |frequency|
+      %i{minute hourly daily weekly monthly once on_logon onstart none}.each do |frequency|
         expect { resource.send(:validate_idle_time, 5, frequency) }.to raise_error(ArgumentError, "idle_time property is only valid for tasks that run on_idle")
       end
     end
@@ -374,7 +374,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
     end
 
     it "does not raises error if idle_time is not set for other frequencies" do
-      [:minute, :hourly, :daily, :weekly, :monthly, :once, :on_logon, :onstart, :none].each do |frequency|
+      %i{minute hourly daily weekly monthly once on_logon onstart none}.each do |frequency|
         expect { resource.send(:validate_idle_time, nil, frequency) }.not_to raise_error
       end
     end

data/spec/unit/resource/windows_uac_spec.rb

@@ -24,7 +24,7 @@ describe Chef::Resource::WindowsUac do
     expect(resource.resource_name).to eql(:windows_uac)
   end
 
-  [:no_prompt, :secure_prompt_for_creds, :secure_prompt_for_consent, :prompt_for_creds, :prompt_for_consent, :prompt_for_consent_non_windows_binaries].each do |val|
+  %i{no_prompt secure_prompt_for_creds secure_prompt_for_consent prompt_for_creds prompt_for_consent prompt_for_consent_non_windows_binaries}.each do |val|
     it "the consent_behavior_admins property accepts :#{val}" do
       expect { resource.consent_behavior_admins val }.not_to raise_error(ArgumentError)
     end
@@ -34,7 +34,7 @@ describe Chef::Resource::WindowsUac do
     expect { resource.consent_behavior_admins :bogus }.to raise_error(ArgumentError)
   end
 
-  [:auto_deny, :secure_prompt_for_creds, :prompt_for_creds].each do |val|
+  %i{auto_deny secure_prompt_for_creds prompt_for_creds}.each do |val|
     it "the consent_behavior_users property accepts :#{val}" do
       expect { resource.consent_behavior_users val }.not_to raise_error(ArgumentError)
     end

data/spec/unit/resource/yum_package_spec.rb

@@ -95,7 +95,7 @@ describe Chef::Resource::YumPackage, "flush_cache" do
   end
 
   it "should allow you to set the flush timing with an array" do
-    flush_array = [ :before, :after ]
+    flush_array = %i{before after}
     flush_hash = { before: true, after: true }
     @resource.flush_cache(flush_array)
     expect(@resource.flush_cache).to eq(flush_hash)

data/spec/unit/resource_collection/resource_list_spec.rb

@@ -19,7 +19,7 @@
 require "spec_helper"
 
 describe Chef::ResourceCollection::ResourceList do
-  let(:resource_list) { Chef::ResourceCollection::ResourceList.new() }
+  let(:resource_list) { Chef::ResourceCollection::ResourceList.new }
   let(:resource) { Chef::Resource::ZenMaster.new("makoto") }
   let(:second_resource) { Chef::Resource::ZenMaster.new("hattori") }
 

data/spec/unit/resource_collection/resource_set_spec.rb

@@ -92,7 +92,7 @@ describe Chef::ResourceCollection::ResourceSet do
       collection.insert_as(zen_master)
       collection.insert_as(zen_follower)
       check_by_names(collection.find(zen_master: [zen_master_name], zen_follower: [zen_follower_name]),
-                     zen_master_name, zen_follower_name)
+        zen_master_name, zen_follower_name)
     end
 
     it "should find resources of multiple kinds (:zen_master => a, :zen_follower => b with custom names)" do
@@ -100,7 +100,7 @@ describe Chef::ResourceCollection::ResourceSet do
       collection.insert_as(zen_master2, :zzz, "name2")
       collection.insert_as(zen_follower, :yyy, "name3")
       check_by_names(collection.find(zzz: %w{name1 name2}, yyy: ["name3"]),
-                     zen_master_name, zen_follower_name, zen_master2_name)
+        zen_master_name, zen_follower_name, zen_master2_name)
     end
 
     it "should find a resource by string zen_master[a]" do
@@ -118,7 +118,7 @@ describe Chef::ResourceCollection::ResourceSet do
       collection.insert_as(zen_master)
       collection.insert_as(zen_master2)
       check_by_names(collection.find("zen_master[#{zen_master_name},#{zen_master2_name}]"),
-                     zen_master_name, zen_master2_name)
+        zen_master_name, zen_master2_name)
     end
 
     it "should find array names" do
@@ -138,14 +138,14 @@ describe Chef::ResourceCollection::ResourceSet do
       collection.insert_as(zen_master, :zzz, "name1")
       collection.insert_as(zen_master2, :zzz, "name2")
       check_by_names(collection.find("zzz[name1,name2]"),
-                     zen_master_name, zen_master2_name)
+        zen_master_name, zen_master2_name)
     end
 
     it "should find resources of multiple types by strings of zen_master[a]" do
       collection.insert_as(zen_master)
       collection.insert_as(zen_follower)
       check_by_names(collection.find("zen_master[#{zen_master_name}]", "zen_follower[#{zen_follower_name}]"),
-                     zen_master_name, zen_follower_name)
+        zen_master_name, zen_follower_name)
     end
 
     it "should find resources of multiple types by strings of zen_master[a] with custom names" do
@@ -154,7 +154,7 @@ describe Chef::ResourceCollection::ResourceSet do
       collection.insert_as(zen_master2, :zzz, "name2")
       collection.insert_as(zen_follower, :yyy, "name3")
       check_by_names(collection.find("zzz[name1,name2]", "yyy[name3]"),
-                     zen_master_name, zen_follower_name, zen_master2_name)
+        zen_master_name, zen_follower_name, zen_master2_name)
     end
 
     it "should only keep the last copy when multiple instances of a Resource are inserted" do
@@ -172,7 +172,7 @@ describe Chef::ResourceCollection::ResourceSet do
     end
 
     it "should raise an exception if you pass something other than a string or hash to resource" do
-      expect { collection.find([Array.new]) }.to raise_error(ArgumentError)
+      expect { collection.find([[]]) }.to raise_error(ArgumentError)
     end
 
     it "raises an error when attempting to find a resource that does not exist" do

data/spec/unit/resource_collection/stepable_iterator_spec.rb

@@ -72,7 +72,7 @@ describe Chef::ResourceCollection::StepableIterator do
       @collection << lambda { @snitch_var = 42 }
 
       @iterator = CRSI.for_collection(@collection)
-      @iterator.each { |proc| proc.call }
+      @iterator.each(&:call)
     end
 
     it "allows the iteration to be paused" do
@@ -124,7 +124,7 @@ describe Chef::ResourceCollection::StepableIterator do
     it "allows the iteration to start by being stepped" do
       @snitch_var = nil
       @iterator = CRSI.for_collection(@collection)
-      @iterator.iterate_on(:element) { |proc| proc.call }
+      @iterator.iterate_on(:element, &:call)
       @iterator.step
       expect(@iterator.position).to eq(1)
       expect(@snitch_var).to eq(23)

data/spec/unit/resource_collection_spec.rb

@@ -20,7 +20,7 @@
 require "spec_helper"
 
 describe Chef::ResourceCollection do
-  let(:rc) { Chef::ResourceCollection.new() }
+  let(:rc) { Chef::ResourceCollection.new }
   let(:resource) { Chef::Resource::ZenMaster.new("makoto") }
 
   it "should throw an error when calling a non-delegated method" do
@@ -97,7 +97,7 @@ describe Chef::ResourceCollection do
   describe "each" do
     it "should allow you to iterate over every resource in the collection" do
       load_up_resources
-      results = Array.new
+      results = []
       expect do
         rc.each do |r|
           results << r.name
@@ -119,7 +119,7 @@ describe Chef::ResourceCollection do
   describe "each_index" do
     it "should allow you to iterate over every resource by index" do
       load_up_resources
-      results = Array.new
+      results = []
       expect do
         rc.each_index do |i|
           results << rc[i].name
@@ -246,7 +246,7 @@ describe Chef::ResourceCollection do
     end
 
     it "should raise an exception if you pass something other than a string or hash to resource" do
-      expect { rc.resources([Array.new]) }.to raise_error(ArgumentError)
+      expect { rc.resources([[]]) }.to raise_error(ArgumentError)
     end
 
     it "raises an error when attempting to find a resource that does not exist" do

data/spec/unit/resource_definition_spec.rb

@@ -19,7 +19,7 @@
 require "spec_helper"
 
 describe Chef::ResourceDefinition do
-  let(:defn) { Chef::ResourceDefinition.new() }
+  let(:defn) { Chef::ResourceDefinition.new }
 
   describe "initialize" do
     it "should be a Chef::ResourceDefinition" do
@@ -92,7 +92,7 @@ describe Chef::ResourceDefinition do
 
   it "should raise an exception if prototype_params is not a hash" do
     expect do
-      defn.define :monkey, Array.new do
+      defn.define :monkey, [] do
       end
     end.to raise_error(ArgumentError)
   end

data/spec/unit/resource_inspector_spec.rb

@@ -39,7 +39,7 @@ describe ResourceInspector do
 
     it "returns a hash with required data" do
       expect(subject[:description]).to eq "A dummy resource"
-      expect(subject[:actions]).to match_array [:nothing, :dummy]
+      expect(subject[:actions]).to match_array %i{nothing dummy}
     end
 
     context "excluding built in properties" do

data/spec/unit/resource_reporter_spec.rb

@@ -447,6 +447,7 @@ describe Chef::ResourceReporter do
         # TODO: API takes integer number of milliseconds as a string. This
         # should be an int.
         expect(@first_update_report).to have_key("duration")
+        expect(@first_update_report["duration"]).to be_kind_of(String)
         expect(@first_update_report["duration"].to_i).to be_within(100).of(0)
       end
 
@@ -585,6 +586,7 @@ describe Chef::ResourceReporter do
         # TODO: API takes integer number of milliseconds as a string. This
         # should be an int.
         expect(@first_update_report).to have_key("duration")
+        expect(@first_update_report["duration"]).to be_kind_of(String)
         expect(@first_update_report["duration"].to_i).to be_within(100).of(0)
       end
 
@@ -645,7 +647,7 @@ describe Chef::ResourceReporter do
         expect(rest_client).to receive(:post)
           .with("reports/nodes/spitfire/runs", { action: :start, run_id: @run_id,
                                                  start_time: start_time.to_s },
-               { "X-Ops-Reporting-Protocol-Version" => Chef::ResourceReporter::PROTOCOL_VERSION })
+            { "X-Ops-Reporting-Protocol-Version" => Chef::ResourceReporter::PROTOCOL_VERSION })
           .and_raise(@error)
       end
 
@@ -674,7 +676,7 @@ describe Chef::ResourceReporter do
         @error = Net::HTTPClientException.new("500 message", @response)
         expect(rest_client).to receive(:post)
           .with("reports/nodes/spitfire/runs", { action: :start, run_id: @run_id, start_time: start_time.to_s },
-               { "X-Ops-Reporting-Protocol-Version" => Chef::ResourceReporter::PROTOCOL_VERSION })
+            { "X-Ops-Reporting-Protocol-Version" => Chef::ResourceReporter::PROTOCOL_VERSION })
           .and_raise(@error)
       end
 
@@ -704,7 +706,7 @@ describe Chef::ResourceReporter do
         @error = Net::HTTPClientException.new("500 message", @response)
         expect(rest_client).to receive(:post)
           .with("reports/nodes/spitfire/runs", { action: :start, run_id: @run_id, start_time: start_time.to_s },
-               { "X-Ops-Reporting-Protocol-Version" => Chef::ResourceReporter::PROTOCOL_VERSION })
+            { "X-Ops-Reporting-Protocol-Version" => Chef::ResourceReporter::PROTOCOL_VERSION })
           .and_raise(@error)
       end
 
@@ -725,7 +727,7 @@ describe Chef::ResourceReporter do
         response = { "uri" => "https://example.com/reports/nodes/spitfire/runs/@run_id" }
         expect(rest_client).to receive(:post)
           .with("reports/nodes/spitfire/runs", { action: :start, run_id: @run_id, start_time: start_time.to_s },
-               { "X-Ops-Reporting-Protocol-Version" => Chef::ResourceReporter::PROTOCOL_VERSION })
+            { "X-Ops-Reporting-Protocol-Version" => Chef::ResourceReporter::PROTOCOL_VERSION })
           .and_return(response)
         resource_reporter.run_started(run_status)
       end

data/spec/unit/resource_spec.rb

@@ -115,14 +115,14 @@ describe Chef::Resource do
     it "sets a list of state attributes" do
       resource_class = Class.new(Chef::Resource)
       resource_class.state_attrs(:checksum, :owner, :group, :mode)
-      expect(resource_class.state_attrs).to match_array([:checksum, :owner, :group, :mode])
+      expect(resource_class.state_attrs).to match_array(%i{checksum owner group mode})
     end
 
     it "inherits state attributes from the superclass" do
       resource_class = Class.new(Chef::Resource)
       resource_subclass = Class.new(resource_class)
       resource_class.state_attrs(:checksum, :owner, :group, :mode)
-      expect(resource_subclass.state_attrs).to match_array([:checksum, :owner, :group, :mode])
+      expect(resource_subclass.state_attrs).to match_array(%i{checksum owner group mode})
     end
 
     it "combines inherited state attributes with non-inherited state attributes" do
@@ -130,7 +130,7 @@ describe Chef::Resource do
       resource_subclass = Class.new(resource_class)
       resource_class.state_attrs(:checksum, :owner)
       resource_subclass.state_attrs(:group, :mode)
-      expect(resource_subclass.state_attrs).to match_array([:checksum, :owner, :group, :mode])
+      expect(resource_subclass.state_attrs).to match_array(%i{checksum owner group mode})
     end
 
   end
@@ -157,7 +157,7 @@ describe Chef::Resource do
 
     it "describes its state" do
       resource_state = file_resource.state_for_resource_reporter
-      expect(resource_state.keys).to match_array([:checksum, :owner, :group, :mode])
+      expect(resource_state.keys).to match_array(%i{checksum owner group mode})
       expect(resource_state[:checksum]).to eq("abc123")
       expect(resource_state[:owner]).to eq("root")
       expect(resource_state[:group]).to eq("wheel")
@@ -510,11 +510,11 @@ describe Chef::Resource do
     context "when the resource has a property with a default" do
       let(:resource_class) { Class.new(Chef::Resource) { property :a, default: 1 } }
       it "should include the default in the hash" do
-        expect(resource.to_hash.keys.sort).to eq([:a, :allowed_actions, :params, :provider, :updated,
-          :updated_by_last_action, :before,
-          :name, :source_line,
-          :action, :elapsed_time,
-          :default_guard_interpreter, :guard_interpreter].sort)
+        expect(resource.to_hash.keys.sort).to eq(%i{a allowed_actions params provider updated
+          updated_by_last_action before
+          name source_line
+          action elapsed_time
+          default_guard_interpreter guard_interpreter}.sort)
         expect(resource.to_hash[:name]).to eq "funk"
         expect(resource.to_hash[:a]).to eq 1
       end
@@ -522,11 +522,11 @@ describe Chef::Resource do
 
     it "should convert to a hash" do
       hash = resource.to_hash
-      expected_keys = [ :allowed_actions, :params, :provider, :updated,
-        :updated_by_last_action, :before,
-        :name, :source_line,
-        :action, :elapsed_time,
-        :default_guard_interpreter, :guard_interpreter ]
+      expected_keys = %i{allowed_actions params provider updated
+        updated_by_last_action before
+        name source_line
+        action elapsed_time
+        default_guard_interpreter guard_interpreter}
       expect(hash.keys - expected_keys).to eq([])
       expect(expected_keys - hash.keys).to eq([])
       expect(hash[:name]).to eql("funk")
@@ -838,7 +838,7 @@ describe Chef::Resource do
     it "should print \"skipped due to action :nothing\" message for doc formatter when action is :nothing" do
       fdoc = Chef::Formatters.new(:doc, STDOUT, STDERR)
       allow(run_context).to receive(:events).and_return(fdoc)
-      expect(fdoc).to receive(:puts).with(" (skipped due to action :nothing)", anything())
+      expect(fdoc).to receive(:puts).with(" (skipped due to action :nothing)", anything)
       resource.should_skip?(:nothing)
     end
 
@@ -1118,8 +1118,8 @@ describe Chef::Resource do
     end
 
     context "with an array action" do
-      before { resource.action([:two, :one]) }
-      it { is_expected.to eq [:two, :one] }
+      before { resource.action(%i{two one}) }
+      it { is_expected.to eq %i{two one} }
     end
 
     context "with an assignment" do
@@ -1128,8 +1128,8 @@ describe Chef::Resource do
     end
 
     context "with an array assignment" do
-      before { resource.action = [:two, :one] }
-      it { is_expected.to eq [:two, :one] }
+      before { resource.action = %i{two one} }
+      it { is_expected.to eq %i{two one} }
     end
 
     context "with an invalid action" do
@@ -1166,8 +1166,8 @@ describe Chef::Resource do
     end
 
     context "with an array default action" do
-      let(:default_action) { [:two, :one] }
-      it { is_expected.to eq [:two, :one] }
+      let(:default_action) { %i{two one} }
+      it { is_expected.to eq %i{two one} }
     end
   end
 

data/spec/unit/role_spec.rb

@@ -113,7 +113,7 @@ describe Chef::Role do
     end
 
     it "should throw an ArgumentError if we aren't a kind of hash" do
-      expect { @role.default_attributes(Array.new) }.to raise_error(ArgumentError)
+      expect { @role.default_attributes([]) }.to raise_error(ArgumentError)
     end
   end
 
@@ -128,7 +128,7 @@ describe Chef::Role do
     end
 
     it "should throw an ArgumentError if we aren't a kind of hash" do
-      expect { @role.override_attributes(Array.new) }.to raise_error(ArgumentError)
+      expect { @role.override_attributes([]) }.to raise_error(ArgumentError)
     end
   end