chef 14.14.29 → 14.15.6

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
 
@@ -248,7 +248,7 @@ describe Chef::Role do
   ROLE_DSL = <<~EOR.freeze
     name "ceiling_cat"
     description "like Aliens, but furry"
-EOR
+  EOR
 
   describe "when loading from disk" do
     before do

data/spec/unit/run_context/cookbook_compiler_spec.rb

@@ -107,7 +107,7 @@ describe Chef::RunContext::CookbookCompiler do
       node.run_list("test-with-deps::default", "test-with-circular-deps::default")
 
       compiler.compile_libraries
-      expect(LibraryLoadOrder.load_order).to eq(["dependency1", "dependency2", "test-with-deps", "circular-dep2", "circular-dep1", "test-with-circular-deps"])
+      expect(LibraryLoadOrder.load_order).to eq(%w{dependency1 dependency2 test-with-deps circular-dep2 circular-dep1 test-with-circular-deps})
     end
   end
 
@@ -121,18 +121,18 @@ describe Chef::RunContext::CookbookCompiler do
       node.run_list("test-with-deps::default", "test-with-circular-deps::default")
 
       compiler.compile_lwrps
-      expect(LibraryLoadOrder.load_order).to eq(["dependency1-provider",
-                                             "dependency1-resource",
-                                             "dependency2-provider",
-                                             "dependency2-resource",
-                                             "test-with-deps-provider",
-                                             "test-with-deps-resource",
-                                             "circular-dep2-provider",
-                                             "circular-dep2-resource",
-                                             "circular-dep1-provider",
-                                             "circular-dep1-resource",
-                                             "test-with-circular-deps-provider",
-                                             "test-with-circular-deps-resource"])
+      expect(LibraryLoadOrder.load_order).to eq(%w{dependency1-provider
+                                             dependency1-resource
+                                             dependency2-provider
+                                             dependency2-resource
+                                             test-with-deps-provider
+                                             test-with-deps-resource
+                                             circular-dep2-provider
+                                             circular-dep2-resource
+                                             circular-dep1-provider
+                                             circular-dep1-resource
+                                             test-with-circular-deps-provider
+                                             test-with-circular-deps-resource})
     end
   end
 
@@ -147,12 +147,12 @@ describe Chef::RunContext::CookbookCompiler do
       node.run_list("test-with-deps::default", "test-with-circular-deps::default")
 
       compiler.compile_resource_definitions
-      expect(LibraryLoadOrder.load_order).to eq(["dependency1-definition",
-                                             "dependency2-definition",
-                                             "test-with-deps-definition",
-                                             "circular-dep2-definition",
-                                             "circular-dep1-definition",
-                                             "test-with-circular-deps-definition"])
+      expect(LibraryLoadOrder.load_order).to eq(%w{dependency1-definition
+                                             dependency2-definition
+                                             test-with-deps-definition
+                                             circular-dep2-definition
+                                             circular-dep1-definition
+                                             test-with-circular-deps-definition})
     end
 
   end
@@ -205,14 +205,14 @@ describe Chef::RunContext::CookbookCompiler do
     it "should return an array of cookbook names as symbols without duplicates" do
       node.run_list("test-with-circular-deps::default", "circular-dep1::default", "circular-dep2::default")
 
-      expect(compiler.cookbook_order).to eq([:"circular-dep2",
-                                         :"circular-dep1",
-                                         :"test-with-circular-deps"])
+      expect(compiler.cookbook_order).to eq(%i{circular-dep2
+                                         circular-dep1
+                                         test-with-circular-deps})
     end
 
     it "determines if a cookbook is in the list of cookbooks reachable by dependency" do
       node.run_list("test-with-deps::default", "test-with-deps::server")
-      expect(compiler.cookbook_order).to eq([:dependency1, :dependency2, :"test-with-deps"])
+      expect(compiler.cookbook_order).to eq(%i{dependency1 dependency2 test-with-deps})
       expect(compiler.unreachable_cookbook?(:dependency1)).to be_falsey
       expect(compiler.unreachable_cookbook?(:dependency2)).to be_falsey
       expect(compiler.unreachable_cookbook?(:'test-with-deps')).to be_falsey

data/spec/unit/run_list/run_list_expansion_spec.rb

@@ -94,12 +94,15 @@ describe Chef::RunList::RunListExpansion do
       allow(@expansion).to receive(:fetch_role).and_return(@first_role, @second_role)
       @expansion.expand
       @json = '{"id":"_default","run_list":[{"type":"recipe","name":"lobster::mastercookbook","version":"0.1.0",'
-              .concat(
-'"skipped":false},{"type":"role","name":"rage","children":[{"type":"role","name":"mollusk","children":[],"missing":null,'
-      .concat(
-'"error":null,"skipped":null},{"type":"recipe","name":"crabrevenge","version":null,"skipped":false}],"missing":null,'
-      .concat(
-'"error":null,"skipped":null},{"type":"recipe","name":"fist","version":"0.1","skipped":false}]}')))
+        .concat(
+          '"skipped":false},{"type":"role","name":"rage","children":[{"type":"role","name":"mollusk","children":[],"missing":null,'
+                .concat(
+                  '"error":null,"skipped":null},{"type":"recipe","name":"crabrevenge","version":null,"skipped":false}],"missing":null,'
+                        .concat(
+                          '"error":null,"skipped":null},{"type":"recipe","name":"fist","version":"0.1","skipped":false}]}'
+                        )
+                )
+        )
 
     end
 

data/spec/unit/run_list_spec.rb

@@ -133,7 +133,7 @@ describe Chef::RunList do
     it "should yield each member to your block" do
       @run_list << "foo"
       @run_list << "bar"
-      seen = Array.new
+      seen = []
       @run_list.each { |r| seen << r }
       expect(seen).to be_include("recipe[foo]")
       expect(seen).to be_include("recipe[bar]")

data/spec/unit/runner_spec.rb

@@ -295,7 +295,7 @@ describe Chef::Runner do
       # execution, and schedule delayed actions :second and :third on the first
       # resource. The duplicate actions should "collapse" to a single notification
       # and order should be preserved.
-      expect(SnitchyProvider.all_actions_called).to eq([:first, :first, :second, :third])
+      expect(SnitchyProvider.all_actions_called).to eq(%i{first first second third})
     end
 
     it "executes delayed notifications in the order they were declared" do
@@ -321,7 +321,7 @@ describe Chef::Runner do
       third_resource.notifies(:third_action, first_resource, :delayed)
 
       runner.converge
-      expect(SnitchyProvider.all_actions_called).to eq([:first, :first, :second, :third])
+      expect(SnitchyProvider.all_actions_called).to eq(%i{first first second third})
     end
 
     it "does not fire notifications if the resource was not updated by the last action executed" do
@@ -347,7 +347,7 @@ describe Chef::Runner do
       runner.converge
 
       # All of the resources should only fire once:
-      expect(SnitchyProvider.all_actions_called).to eq([:first, :second, :third])
+      expect(SnitchyProvider.all_actions_called).to eq(%i{first second third})
 
       # all of the resources should be marked as updated for reporting purposes
       expect(first_resource).to be_updated

data/spec/unit/search/query_spec.rb

@@ -149,7 +149,8 @@ describe Chef::Search::Query do
       ],
       "start" => 0,
       "total" => 4,
-    } end
+    }
+    end
 
     let(:big_response_empty) do
       {
@@ -169,7 +170,7 @@ describe Chef::Search::Query do
     it "accepts a type as the first argument" do
       expect { query.search("node") }.not_to raise_error
       expect { query.search(:node) }.not_to raise_error
-      expect { query.search(Hash.new) }.to raise_error(Chef::Exceptions::InvalidSearchQuery, /(Hash)/)
+      expect { query.search({}) }.to raise_error(Chef::Exceptions::InvalidSearchQuery, /(Hash)/)
     end
 
     it "queries for every object of a type by default" do

data/spec/unit/shell/model_wrapper_spec.rb

@@ -57,7 +57,7 @@ describe Shell::ModelWrapper do
     end
 
     it "maps the listed nodes when given a block" do
-      expect(@wrapper.all { |n| n.name }.sort.reverse).to eq(%w{yummy sammich})
+      expect(@wrapper.all(&:name).sort.reverse).to eq(%w{yummy sammich})
     end
   end
 

data/spec/unit/shell/shell_session_spec.rb

@@ -57,8 +57,7 @@ describe Shell::ClientSession do
       load_node: true,
       build_node: true,
       register: true,
-      sync_cookbooks: {}
-    )
+      sync_cookbooks: {})
   end
 
   before do
@@ -94,8 +93,7 @@ describe Shell::SoloSession do
       load_node: true,
       build_node: true,
       register: true,
-      sync_cookbooks: {}
-    )
+      sync_cookbooks: {})
   end
 
   before do
@@ -132,8 +130,7 @@ describe Shell::StandAloneSession do
       load_node: true,
       build_node: true,
       register: true,
-      sync_cookbooks: {}
-    )
+      sync_cookbooks: {})
   end
   let(:recipe) { Chef::Recipe.new(nil, nil, run_context) }
   let(:run_context) { Chef::RunContext.new(node, {}, events) }
@@ -238,11 +235,11 @@ describe Shell::SoloLegacySession do
 
   it "passes the shell CLI args to the client" do
     @client = double("Chef::Client.new",
-                     run_ohai: true,
-                     load_node: true,
-                     build_node: true,
-                     register: true,
-                     sync_cookbooks: {})
+      run_ohai: true,
+      load_node: true,
+      build_node: true,
+      register: true,
+      sync_cookbooks: {})
     expect(Chef::Client).to receive(:new).with(json_attribs, Chef::Config[:shell_config]).and_return(@client)
     @session.json_configuration = json_attribs
     @session.send(:rebuild_node)

data/spec/unit/shell_spec.rb

@@ -30,8 +30,7 @@ ObjectTestHarness = Proc.new do
   end
 
   desc "rspecin'"
-  def rspec_method
-  end
+  def rspec_method; end
 end
 
 class TestJobManager

data/spec/unit/user_spec.rb

@@ -65,7 +65,7 @@ describe Chef::User do
     end
 
     it "should throw an ArgumentError if you feed it anything but a string" do
-      expect { @user.name Hash.new }.to raise_error(ArgumentError)
+      expect { @user.name({}) }.to raise_error(ArgumentError)
     end
   end
 
@@ -84,7 +84,7 @@ describe Chef::User do
     end
 
     it "should throw an ArgumentError if you feed it anything but true or false" do
-      expect { @user.name Hash.new }.to raise_error(ArgumentError)
+      expect { @user.name({}) }.to raise_error(ArgumentError)
     end
   end
 
@@ -99,7 +99,7 @@ describe Chef::User do
     end
 
     it "should throw an ArgumentError if you feed it something lame" do
-      expect { @user.public_key Hash.new }.to raise_error(ArgumentError)
+      expect { @user.public_key({}) }.to raise_error(ArgumentError)
     end
   end
 
@@ -114,7 +114,7 @@ describe Chef::User do
     end
 
     it "should throw an ArgumentError if you feed it something lame" do
-      expect { @user.private_key Hash.new }.to raise_error(ArgumentError)
+      expect { @user.private_key({}) }.to raise_error(ArgumentError)
     end
   end
 

data/spec/unit/user_v1_spec.rb

@@ -37,7 +37,7 @@ describe Chef::UserV1 do
     end
 
     it "should throw an ArgumentError if you feed it something lame" do
-      expect { @user.send(method, Hash.new) }.to raise_error(ArgumentError)
+      expect { @user.send(method, {}) }.to raise_error(ArgumentError)
     end
   end
 
@@ -57,7 +57,7 @@ describe Chef::UserV1 do
     end
 
     it "should throw an ArgumentError if you feed it anything but true or false" do
-      expect { @user.send(method, Hash.new) }.to raise_error(ArgumentError)
+      expect { @user.send(method, {}) }.to raise_error(ArgumentError)
     end
   end
 
@@ -95,7 +95,7 @@ describe Chef::UserV1 do
     end
 
     it "should throw an ArgumentError if you feed it anything but a string" do
-      expect { @user.username Hash.new }.to raise_error(ArgumentError)
+      expect { @user.username({}) }.to raise_error(ArgumentError)
     end
   end
 

data/spec/unit/util/backup_spec.rb

@@ -110,7 +110,7 @@ describe Chef::Util::Backup do
     end
     it "should strip the drive letter off for windows" do
       expect(@backup).to receive(:path).and_return('c:\a\b\c.txt')
-      expect(@backup.send(:backup_filename)).to match(%r|^\\a\\b\\c.txt.chef-\d{14}.\d{6}$|)
+      expect(@backup.send(:backup_filename)).to match(/^\\a\\b\\c.txt.chef-\d{14}.\d{6}$/)
     end
     it "should strip the drive letter off for windows (with forwardslashes)" do
       expect(@backup).to receive(:path).and_return("c:/a/b/c.txt")

data/spec/unit/util/dsc/lcm_output_parser_spec.rb

@@ -52,7 +52,7 @@ describe Chef::Util::DSC::LocalConfigurationManager::Parser do
         logtype: [machinename]: LCM:  [ Start  Resource ] [name]
         logtype: [machinename]: LCM:  [ End    Resource ] [name]
         logtype: [machinename]: LCM:  [ End    Set      ]
-EOF
+      EOF
       resources = Chef::Util::DSC::LocalConfigurationManager::Parser.parse(str, false)
       expect(resources.length).to eq(1)
       expect(resources[0].name).to eq("[name]")
@@ -66,7 +66,7 @@ EOF
         logtype: [machinename]: LCM:  [ End    Set      ] [name]
         logtype: [machinename]: LCM:  [ End    Resource ] [name]
         logtype: [machinename]: LCM:  [ End    Set      ]
-EOF
+      EOF
       resources = Chef::Util::DSC::LocalConfigurationManager::Parser.parse(str, false)
       expect(resources[0].changes_state?).to be_truthy
     end
@@ -80,7 +80,7 @@ EOF
         logtype: [machinename]: LCM:  [ End    Set      ] [name]
         logtype: [machinename]: LCM:  [ End    Resource ] [name]
         logtype: [machinename]: LCM:  [ End    Set      ]
-EOF
+      EOF
       resources = Chef::Util::DSC::LocalConfigurationManager::Parser.parse(str, false)
       expect(resources[0].change_log).to match_array(["[name]", "[message]", "[name]"])
     end
@@ -92,7 +92,7 @@ EOF
         logtype: [machinename]: LCM:  [ Skip   Set      ] [name]
         logtype: [machinename]: LCM:  [ End    Resource ] [name]
         logtype: [machinename]: LCM:  [ End    Set      ]
-EOF
+      EOF
       resources = Chef::Util::DSC::LocalConfigurationManager::Parser.parse(str, false)
       expect(resources[0].changes_state?).to be_falsey
     end
@@ -104,7 +104,7 @@ EOF
         logtype: [machinename]: LCM:  [ Skip   Set      ] [name]
         logtype: [machinename]: LCM:  [ End    Resource ] [name]
         logtype: [machinename]: LCM:  [ End    Set      ]
-EOF
+      EOF
       resources = Chef::Util::DSC::LocalConfigurationManager::Parser.parse(str, false)
       expect(resources[0].change_log).to be_empty
     end
@@ -118,7 +118,7 @@ EOF
         ResourcesNotInDesiredState: [name]
         ReturnValue               : 0
         PSComputerName            : .
-EOF
+      EOF
       resources = Chef::Util::DSC::LocalConfigurationManager::Parser.parse(str, true)
       expect(resources.length).to eq(1)
       expect(resources[0].name).to eq("[name]")
@@ -131,7 +131,7 @@ EOF
         ResourcesNotInDesiredState: [name]
         ReturnValue               : 0
         PSComputerName            : .
-EOF
+      EOF
       resources = Chef::Util::DSC::LocalConfigurationManager::Parser.parse(str, true)
       expect(resources[0].changes_state?).to be_truthy
     end
@@ -143,7 +143,7 @@ EOF
         ResourcesNotInDesiredState:
         ReturnValue               : 0
         PSComputerName            : .
-EOF
+      EOF
       resources = Chef::Util::DSC::LocalConfigurationManager::Parser.parse(str, true)
       expect(resources[0].changes_state?).to be_falsey
     end
@@ -155,7 +155,7 @@ EOF
         ResourcesNotInDesiredState:
         ReturnValue               : 0
         PSComputerName            : .
-EOF
+      EOF
       resources = Chef::Util::DSC::LocalConfigurationManager::Parser.parse(str, true)
       expect(resources[0].change_log).to be_empty
     end
@@ -176,7 +176,7 @@ EOF
         logtype: [machinename]: LCM:  [ Start  Set      ]
         logtype: [machinename]: LCM:  [ End    Set      ]
         logtype: [machinename]: LCM:  [ End    Set      ]
-EOF
+      EOF
 
       resources = Chef::Util::DSC::LocalConfigurationManager::Parser.parse(str, false)
       expect(resources[0].changes_state?).to be_falsey
@@ -197,7 +197,7 @@ EOF
         logtype: [machinename]: LCM:  [ End    Set      ]
         logtype: [machinename]: LCM:  [ End    Resource ]
         logtype: [machinename]: LCM:  [ End    Set      ]
-EOF
+      EOF
 
       resources = Chef::Util::DSC::LocalConfigurationManager::Parser.parse(str, false)
       expect(resources[0].changes_state?).to be_falsey
@@ -217,7 +217,7 @@ EOF
         logtype: [machinename]: LCM:  [ End    Set      ]
         logtype: [machinename]: LCM:  [ End    Resource ]
         logtype: [machinename]: LCM:  [ End    Set      ]
-EOF
+      EOF
       resources = Chef::Util::DSC::LocalConfigurationManager::Parser.parse(str, false)
       expect(resources[0].changes_state?).to be_truthy
       expect(resources[0].name).to eql("[name]")
@@ -239,7 +239,7 @@ EOF
         ResourcesNotInDesiredState: [name2]
         ReturnValue               : 0
         PSComputerName            : .
-EOF
+      EOF
 
       resources = Chef::Util::DSC::LocalConfigurationManager::Parser.parse(str, true)
       expect(resources[0].changes_state?).to be_falsey

data/spec/unit/util/dsc/local_configuration_manager_spec.rb

@@ -29,7 +29,7 @@ describe Chef::Util::DSC::LocalConfigurationManager do
       logtype: [machinename]: LCM:  [ Start  Resource ] [name]
       logtype: [machinename]: LCM:  [ End    Resource ] [name]
       logtype: [machinename]: LCM:  [ End    Set      ]
-EOH
+    EOH
   end
 
   let(:no_whatif_lcm_output) do
@@ -40,13 +40,13 @@ EOH
       +                        ~~~~~~~~
           + CategoryInfo          : InvalidArgument: (:) [Start-DscConfiguration], ParameterBindingException
           + FullyQualifiedErrorId : NamedParameterNotFound,SomeCompany.SomeAssembly.Commands.RunSomeCommand
-EOH
+    EOH
   end
 
   let(:dsc_resource_import_failure_output) do
     <<~EOH
       PowerShell provider MSFT_xWebsite failed to execute Test-TargetResource functionality with error message: Please ensure that WebAdministration module is installed. + CategoryInfo : InvalidOperation: (:) [], CimException + FullyQualifiedErrorId : ProviderOperationExecutionFailure + PSComputerName : . PowerShell provider MSFT_xWebsite failed to execute Test-TargetResource functionality with error message: Please ensure that WebAdministration module is installed. + CategoryInfo : InvalidOperation: (:) [], CimException + FullyQualifiedErrorId : ProviderOperationExecutionFailure + PSComputerName : . The SendConfigurationApply function did not succeed. + CategoryInfo : NotSpecified: (root/Microsoft/...gurationManager:String) [], CimException + FullyQualifiedErrorId : MI RESULT 1 + PSComputerName : .
-EOH
+    EOH
   end
 
   let(:lcm_status) do