chef 12.13.37 → 12.14.60

data/spec/unit/mixin/powershell_out_spec.rb

@@ -22,9 +22,9 @@ describe Chef::Mixin::PowershellOut do
   let(:shell_out_class) { Class.new { include Chef::Mixin::PowershellOut } }
   subject(:object) { shell_out_class.new }
   let(:architecture) { "something" }
-  let(:flags) {
+  let(:flags) do
     "-NoLogo -NonInteractive -NoProfile -ExecutionPolicy Unrestricted -InputFormat None"
-  }
+  end
 
   describe "#powershell_out" do
     it "runs a command and returns the shell_out object" do

data/spec/unit/mixin/powershell_type_coercions_spec.rb

@@ -27,12 +27,12 @@ end
 describe Chef::Mixin::PowershellTypeCoercions do
   let (:test_class) { Chef::PSTypeTester.new }
 
-  describe '#translate_type' do
+  describe "#translate_type" do
     it "single quotes a string" do
       expect(test_class.translate_type("foo")).to eq("'foo'")
     end
 
-    ["'", '"', '#', "`"].each do |c|
+    ["'", '"', "#", "`"].each do |c|
       it "base64 encodes a string that contains #{c}" do
         expect(test_class.translate_type("#{c}")).to match(Base64.strict_encode64(c))
       end

data/spec/unit/mixin/shell_out_spec.rb

@@ -25,7 +25,7 @@ require "spec_helper"
 describe Chef::Mixin::ShellOut do
   let(:shell_out_class) { Class.new { include Chef::Mixin::ShellOut } }
   subject(:shell_out_obj) { shell_out_class.new }
-  describe '#run_command_compatible_options' do
+  describe "#run_command_compatible_options" do
     subject { shell_out_obj.run_command_compatible_options(command_args) }
     let(:command_args) { [ cmd, options ] }
     let(:cmd) { "echo '#{rand(1000)}'" }

data/spec/unit/mixin/xml_escape_spec.rb

@@ -37,7 +37,7 @@ describe Chef::Mixin::XMLEscape do
   end
 
   it "does not modify ASCII strings" do
-    expect(@escaper.xml_escape('foobarbaz!@#$%^*()')).to eq('foobarbaz!@#$%^*()')
+    expect(@escaper.xml_escape("foobarbaz!@\#$%^*()")).to eq("foobarbaz!@\#$%^*()")
   end
 
   it "converts invalid bytes to asterisks" do
@@ -45,10 +45,10 @@ describe Chef::Mixin::XMLEscape do
   end
 
   it "converts UTF-8 correctly" do
-    expect(@escaper.xml_escape("\xC2\xA9")).to eq('©')
+    expect(@escaper.xml_escape("\xC2\xA9")).to eq("©")
   end
 
   it "converts win 1252 characters correctly" do
-    expect(@escaper.xml_escape("#{0x80.chr}")).to eq('€')
+    expect(@escaper.xml_escape("#{0x80.chr}")).to eq("€")
   end
 end

data/spec/unit/node_spec.rb

@@ -1359,10 +1359,10 @@ describe Chef::Node do
     end
 
     include_examples "to_json equivalent to Chef::JSONCompat.to_json" do
-      let(:jsonable) {
+      let(:jsonable) do
         node.from_file(File.expand_path("nodes/test.example.com.rb", CHEF_SPEC_DATA))
         node
-      }
+      end
     end
   end
 

data/spec/unit/platform/query_helpers_spec.rb

@@ -151,7 +151,7 @@ describe "Chef::Platform#supports_msi?" do
   end
 end
 
-describe 'Chef::Platform#supports_dsc?' do
+describe "Chef::Platform#supports_dsc?" do
   it "returns false if powershell is not present" do
     node = Chef::Node.new
     expect(Chef::Platform.supports_dsc?(node)).to be_falsey
@@ -174,7 +174,7 @@ describe 'Chef::Platform#supports_dsc?' do
   end
 end
 
-describe 'Chef::Platform#supports_dsc_invoke_resource?' do
+describe "Chef::Platform#supports_dsc_invoke_resource?" do
   it "returns false if powershell is not present" do
     node = Chef::Node.new
     expect(Chef::Platform.supports_dsc_invoke_resource?(node)).to be_falsey
@@ -195,7 +195,7 @@ describe 'Chef::Platform#supports_dsc_invoke_resource?' do
   end
 end
 
-describe 'Chef::Platform#dsc_refresh_mode_disabled?' do
+describe "Chef::Platform#dsc_refresh_mode_disabled?" do
   let(:node) { instance_double("Chef::Node") }
   let(:cmdlet) { instance_double("Chef::Util::Powershell::Cmdlet") }
   let(:cmdlet_result) { instance_double("Chef::Util::Powershell::CmdletResult") }

data/spec/unit/property_spec.rb

@@ -1103,18 +1103,18 @@ describe "Chef::Resource.property" do
 
   context "property_type" do
     it "property_types validate their defaults" do
-      expect {
+      expect do
         module ::PropertySpecPropertyTypes
           include Chef::Mixin::Properties
           property_type(is: [:a, :b], default: :c)
         end
-      }.to raise_error(Chef::Exceptions::DeprecatedFeatureError, /Default value :c is invalid for property <property type>./)
-      expect {
+      end.to raise_error(Chef::Exceptions::DeprecatedFeatureError, /Default value :c is invalid for property <property type>./)
+      expect do
         module ::PropertySpecPropertyTypes
           include Chef::Mixin::Properties
           property_type(is: [:a, :b], default: :b)
         end
-      }.not_to raise_error
+      end.not_to raise_error
     end
 
     context "With property_type ABType (is: [:a, :b]) and CDType (is: [:c, :d])" do

data/spec/unit/provider/cookbook_file_spec.rb

@@ -26,12 +26,12 @@ describe Chef::Provider::CookbookFile do
   let(:node) { double("Chef::Node") }
   let(:events) { double("Chef::Events").as_null_object } # mock all the methods
   let(:run_context) { double("Chef::RunContext", :node => node, :events => events) }
-  let(:enclosing_directory) {
+  let(:enclosing_directory) do
     canonicalize_path(File.expand_path(File.join(CHEF_SPEC_DATA, "templates")))
-  }
-  let(:resource_path) {
+  end
+  let(:resource_path) do
     canonicalize_path(File.expand_path(File.join(enclosing_directory, "seattle.txt")))
-  }
+  end
 
   # Subject
 

data/spec/unit/provider/cron/unix_spec.rb

@@ -91,9 +91,9 @@ describe Chef::Provider::Cron::Unix do
       let (:exitstatus) { 2 }
 
       it "should raise an exception if another error occurs" do
-        expect {
+        expect do
           provider.send(:read_crontab)
-        }.to raise_error(Chef::Exceptions::Cron, "Error determining state of #{new_resource.name}, exit: 2")
+        end.to raise_error(Chef::Exceptions::Cron, "Error determining state of #{new_resource.name}, exit: 2")
       end
 
       it "logs the crontab output to debug" do
@@ -130,9 +130,9 @@ describe Chef::Provider::Cron::Unix do
     context "when writing the crontab fails" do
       let(:exitstatus) { 1 }
       it "should raise an exception if the command returns non-zero" do
-        expect {
+        expect do
           provider.send(:write_crontab, "Foo")
-        }.to raise_error(Chef::Exceptions::Cron, /Error updating state of #{new_resource.name}, exit: 1/)
+        end.to raise_error(Chef::Exceptions::Cron, /Error updating state of #{new_resource.name}, exit: 1/)
       end
     end
   end

data/spec/unit/provider/cron_spec.rb

@@ -199,9 +199,9 @@ CRONTAB
 # Chef Name: foo[bar] (baz)
 21 */4 * * * some_prog 1234567
 CRONTAB
-        expect {
+        expect do
           @provider.load_current_resource
-        }.not_to raise_error
+        end.not_to raise_error
       end
     end
 

data/spec/unit/provider/deploy_spec.rb

@@ -167,9 +167,9 @@ describe Chef::Provider::Deploy do
     allow(@provider).to receive(:deploy) { raise "Unexpected error" }
     allow(@provider).to receive(:previous_release_path).and_return("previous_release")
     expect(@provider).not_to receive(:rollback)
-    expect {
+    expect do
       @provider.run_action(:deploy)
-    }.to raise_exception(RuntimeError, "Unexpected error")
+    end.to raise_exception(RuntimeError, "Unexpected error")
   end
 
   it "rollbacks to previous release if error happens on deploy" do
@@ -178,9 +178,9 @@ describe Chef::Provider::Deploy do
     allow(@provider).to receive(:deploy) { raise "Unexpected error" }
     allow(@provider).to receive(:previous_release_path).and_return("previous_release")
     expect(@provider).to receive(:rollback)
-    expect {
+    expect do
       @provider.run_action(:deploy)
-    }.to raise_exception(RuntimeError, "Unexpected error")
+    end.to raise_exception(RuntimeError, "Unexpected error")
   end
 
   describe "on systems without broken Dir.glob results" do
@@ -232,17 +232,17 @@ describe Chef::Provider::Deploy do
         #FileUtils.should_receive(:rm_rf).with("/my/deploy/dir/releases/20040815162342")
         #@provider.run_action(:rollback)
         #@provider.release_path.should eql(NIL) -- no check needed since assertions will fail
-        expect {
+        expect do
           @provider.run_action(:rollback)
-        }.to raise_exception(RuntimeError, "There is no release to rollback to!")
+        end.to raise_exception(RuntimeError, "There is no release to rollback to!")
       end
 
       it "an exception is raised when there are no releases" do
         all_releases = []
         allow(Dir).to receive(:glob).with("/my/deploy/dir/releases/*").and_return(all_releases)
-        expect {
+        expect do
           @provider.run_action(:rollback)
-        }.to raise_exception(RuntimeError, "There is no release to rollback to!")
+        end.to raise_exception(RuntimeError, "There is no release to rollback to!")
       end
     end
   end

data/spec/unit/provider/dsc_resource_spec.rb

@@ -28,11 +28,11 @@ describe Chef::Provider::DscResource do
   end
 
   context "when Powershell does not support Invoke-DscResource" do
-    let (:node) {
+    let (:node) do
       node = Chef::Node.new
       node.automatic[:languages][:powershell][:version] = "4.0"
       node
-    }
+    end
     it "raises a ProviderNotFound exception" do
       expect(provider).not_to receive(:meta_configuration)
       expect { provider.run_action(:run) }.to raise_error(
@@ -44,11 +44,11 @@ describe Chef::Provider::DscResource do
 
     context "when RefreshMode is not set to Disabled" do
       context "and the WMF 5 is a preview release" do
-        let (:node) {
+        let (:node) do
           node = Chef::Node.new
           node.automatic[:languages][:powershell][:version] = "5.0.10018.0"
           node
-        }
+        end
         it "raises an exception" do
           expect(provider).to receive(:dsc_refresh_mode_disabled?).and_return(false)
           expect { provider.run_action(:run) }.to raise_error(
@@ -56,11 +56,11 @@ describe Chef::Provider::DscResource do
         end
       end
       context "and the WMF is 5 RTM or newer" do
-        let (:node) {
+        let (:node) do
           node = Chef::Node.new
           node.automatic[:languages][:powershell][:version] = "5.0.10586.0"
           node
-        }
+        end
         it "does not raises an exception" do
           expect(provider).to receive(:test_resource)
           expect(provider).to receive(:set_resource)
@@ -72,11 +72,11 @@ describe Chef::Provider::DscResource do
   end
 
   context "when the LCM supports Invoke-DscResource" do
-    let (:node) {
+    let (:node) do
       node = Chef::Node.new
       node.automatic[:languages][:powershell][:version] = "5.0.10018.0"
       node
-    }
+    end
     let (:resource_result) { double("CmdletResult", return_value: { "InDesiredState" => true }, stream: "description") }
     let (:invoke_dsc_resource) { double("cmdlet", run!: resource_result) }
     let (:store) { double("ResourceStore", find: resource_records) }
@@ -153,10 +153,11 @@ describe Chef::Provider::DscResource do
       end
 
       context "multiple resource are found" do
-        let (:resource_records) { [
+        let (:resource_records) do
+          [
           { "Module" => { "Name" => "ModuleName1" } },
           { "Module" => { "Name" => "ModuleName2" } },
-        ] }
+        ] end
 
         it "raises MultipleDscResourcesFound" do
           expect { provider.run_action(:run) }.to raise_error(Chef::Exceptions::MultipleDscResourcesFound)

data/spec/unit/provider/dsc_script_spec.rb

@@ -23,11 +23,11 @@ require "spec_helper"
 
 describe Chef::Provider::DscScript do
   context "when DSC is available" do
-    let (:node) {
+    let (:node) do
       node = Chef::Node.new
       node.automatic[:languages][:powershell][:version] = "4.0"
       node
-    }
+    end
     let (:events) { Chef::EventDispatch::Dispatcher.new }
     let (:run_context) { Chef::RunContext.new(node, {}, events) }
     let (:resource) { Chef::Resource::DscScript.new("script", run_context) }
@@ -35,7 +35,7 @@ describe Chef::Provider::DscScript do
       Chef::Provider::DscScript.new(resource, run_context)
     end
 
-    describe '#load_current_resource' do
+    describe "#load_current_resource" do
       it "describes the resource as converged if there were 0 DSC resources" do
         allow(provider).to receive(:run_configuration).with(:test).and_return([])
         provider.load_current_resource
@@ -75,7 +75,7 @@ describe Chef::Provider::DscScript do
       end
     end
 
-    describe '#generate_configuration_document' do
+    describe "#generate_configuration_document" do
       # I think integration tests should cover these cases
 
       it "uses configuration_document_from_script_path when a dsc script file is given" do
@@ -123,7 +123,7 @@ describe Chef::Provider::DscScript do
       end
     end
 
-    describe '#generate_description' do
+    describe "#generate_description" do
       it "removes the resource name from the beginning of any log line from the LCM" do
         dsc_resource_info = Chef::Util::DSC::ResourceInfo.new("resourcename", true, ["resourcename doing something", "lastline"])
         provider.instance_variable_set("@dsc_resources_info", [dsc_resource_info])
@@ -156,16 +156,16 @@ describe Chef::Provider::DscScript do
         it "raises an exception for powershell version '#{version}'" do
           node.automatic[:languages][:powershell][:version] = version
 
-          expect {
+          expect do
             provider.run_action(:run)
-          }.to raise_error(Chef::Exceptions::ProviderNotFound)
+          end.to raise_error(Chef::Exceptions::ProviderNotFound)
         end
       end
 
       it "raises an exception if Powershell is not present" do
-        expect {
+        expect do
           provider.run_action(:run)
-        }.to raise_error(Chef::Exceptions::ProviderNotFound)
+        end.to raise_error(Chef::Exceptions::ProviderNotFound)
       end
 
     end

data/spec/unit/provider/env/windows_spec.rb

@@ -24,16 +24,16 @@ describe Chef::Provider::Env::Windows, :windows_only do
   let(:run_context) { Chef::RunContext.new(node, {}, events) }
 
   context "when environment variable is not PATH" do
-    let(:new_resource) {
+    let(:new_resource) do
       new_resource = Chef::Resource::Env.new("CHEF_WINDOWS_ENV_TEST")
       new_resource.value("foo")
       new_resource
-    }
-    let(:provider) {
+    end
+    let(:provider) do
       provider = Chef::Provider::Env::Windows.new(new_resource, run_context)
       allow(provider).to receive(:env_obj).and_return(double("null object").as_null_object)
       provider
-    }
+    end
 
     describe "action_create" do
       before do
@@ -76,16 +76,16 @@ describe Chef::Provider::Env::Windows, :windows_only do
     describe "for PATH" do
       let(:system_root) { "%SystemRoot%" }
       let(:system_root_value) { 'D:\Windows' }
-      let(:new_resource) {
+      let(:new_resource) do
         new_resource = Chef::Resource::Env.new("PATH")
         new_resource.value(system_root)
         new_resource
-      }
-      let(:provider) {
+      end
+      let(:provider) do
         provider = Chef::Provider::Env::Windows.new(new_resource, run_context)
         allow(provider).to receive(:env_obj).and_return(double("null object").as_null_object)
         provider
-      }
+      end
 
       before do
         stub_const("ENV", { "PATH" => "" })

data/spec/unit/provider/file/content_spec.rb

@@ -28,12 +28,12 @@ describe Chef::Provider::File::Content do
     double("Chef::Provider::File::Resource (current)")
   end
 
-  let(:enclosing_directory) {
+  let(:enclosing_directory) do
     canonicalize_path(File.expand_path(File.join(CHEF_SPEC_DATA, "templates")))
-  }
-  let(:resource_path) {
+  end
+  let(:resource_path) do
     canonicalize_path(File.expand_path(File.join(enclosing_directory, "seattle.txt")))
-  }
+  end
 
   let(:new_resource) do
     double("Chef::Provider::File::Resource (new)", :name => "seattle.txt", :path => resource_path)
@@ -77,9 +77,9 @@ describe Chef::Provider::File::Content do
     end
 
     context "when creating a tempfiles in destdir fails" do
-      let(:enclosing_directory) {
+      let(:enclosing_directory) do
         canonicalize_path("/nonexisting/path")
-      }
+      end
 
       it "returns a tempfile in the tempdir when :file_deployment_uses_destdir is set to :auto" do
         Chef::Config[:file_staging_uses_destdir] = :auto

data/spec/unit/provider/file_spec.rb

@@ -35,12 +35,12 @@ describe Chef::Provider::File do
   let(:node) { double("Chef::Node") }
   let(:events) { double("Chef::Events").as_null_object } # mock all the methods
   let(:run_context) { double("Chef::RunContext", :node => node, :events => events) }
-  let(:enclosing_directory) {
+  let(:enclosing_directory) do
     canonicalize_path(File.expand_path(File.join(CHEF_SPEC_DATA, "templates")))
-  }
-  let(:resource_path) {
+  end
+  let(:resource_path) do
     canonicalize_path(File.expand_path(File.join(enclosing_directory, "seattle.txt")))
-  }
+  end
 
   # Subject
 

data/spec/unit/provider/launchd_spec.rb

@@ -51,7 +51,8 @@ describe Chef::Provider::Launchd do
 </plist>
 XML
 
-    let(:test_hash) do {
+    let(:test_hash) do
+      {
       "Label" => "call.mom.weekly",
       "Program" => "/Library/scripts/call_mom.sh",
       "StartCalendarInterval" => {