chef 12.6.0 → 12.7.2

data/spec/unit/provider/powershell_script_spec.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Adam Edwards (<adamed@opscode.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Author:: Adam Edwards (<adamed@chef.io>)
+# Copyright:: Copyright 2013-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
+require "spec_helper"
 describe Chef::Provider::PowershellScript, "action_run" do
 
   let(:powershell_version) { nil }
@@ -33,12 +33,12 @@ describe Chef::Provider::PowershellScript, "action_run" do
   let(:provider) {
     empty_events = Chef::EventDispatch::Dispatcher.new
     run_context = Chef::RunContext.new(node, {}, empty_events)
-    new_resource = Chef::Resource::PowershellScript.new('run some powershell code', run_context)
+    new_resource = Chef::Resource::PowershellScript.new("run some powershell code", run_context)
     Chef::Provider::PowershellScript.new(new_resource, run_context)
   }
 
-  context 'when setting interpreter flags' do
-    context 'on nano' do
+  context "when setting interpreter flags" do
+    context "on nano" do
       before(:each) do
         allow(Chef::Platform).to receive(:windows_nano_server?).and_return(true)
         allow(provider).to receive(:is_forced_32bit).and_return(false)
@@ -48,12 +48,12 @@ describe Chef::Provider::PowershellScript, "action_run" do
       end
 
       it "sets the -Command flag as the last flag" do
-        flags = provider.command.split(' ').keep_if { |flag| flag =~ /^-/ }
+        flags = provider.command.split(" ").keep_if { |flag| flag =~ /^-/ }
         expect(flags.pop).to eq("-Command")
       end
     end
 
-    context 'not on nano' do
+    context "not on nano" do
       before(:each) do
         allow(Chef::Platform).to receive(:windows_nano_server?).and_return(false)
         allow(provider).to receive(:is_forced_32bit).and_return(false)
@@ -63,36 +63,36 @@ describe Chef::Provider::PowershellScript, "action_run" do
       end
 
       it "sets the -File flag as the last flag" do
-        flags = provider.command.split(' ').keep_if { |flag| flag =~ /^-/ }
+        flags = provider.command.split(" ").keep_if { |flag| flag =~ /^-/ }
         expect(flags.pop).to eq("-File")
       end
 
       let(:execution_policy_flag) do
         execution_policy_index = 0
-        provider_flags = provider.flags.split(' ')
+        provider_flags = provider.flags.split(" ")
         execution_policy_specified = false
 
-        provider_flags.find do | value |
+        provider_flags.find do |value|
           execution_policy_index += 1
-          execution_policy_specified = value.downcase == '-ExecutionPolicy'.downcase
+          execution_policy_specified = value.downcase == "-ExecutionPolicy".downcase
         end
 
         execution_policy = execution_policy_specified ? provider_flags[execution_policy_index] : nil
       end
 
-      context 'when running with an unspecified PowerShell version' do
+      context "when running with an unspecified PowerShell version" do
         let(:powershell_version) { nil }
         it "sets the -ExecutionPolicy flag to 'Unrestricted' by default" do
-          expect(execution_policy_flag.downcase).to eq('unrestricted'.downcase)
+          expect(execution_policy_flag.downcase).to eq("unrestricted".downcase)
         end
       end
 
-      { '2.0' => 'Unrestricted',
-        '2.5' => 'Unrestricted',
-        '3.0' => 'Bypass',
-        '3.6' => 'Bypass',
-        '4.0' => 'Bypass',
-        '5.0' => 'Bypass' }.each do | version_policy |
+      { "2.0" => "Unrestricted",
+        "2.5" => "Unrestricted",
+        "3.0" => "Bypass",
+        "3.6" => "Bypass",
+        "4.0" => "Bypass",
+        "5.0" => "Bypass" }.each do |version_policy|
         let(:powershell_version) { version_policy[0].to_f }
         context "when running PowerShell version #{version_policy[0]}" do
           let(:powershell_version) { version_policy[0].to_f }

data/spec/unit/provider/registry_key_spec.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Lamont Granquist (lamont@opscode.com)
-# Copyright:: Copyright (c) 2012 Opscode, Inc.
+# Author:: Lamont Granquist (lamont@chef.io)
+# Copyright:: Copyright 2012-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
+require "spec_helper"
 
 shared_examples_for "a registry key" do
   before(:each) do

data/spec/unit/provider/remote_directory_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Daniel DeLeo (<dan@kallistec.com>)
-# Copyright:: Copyright (c) 2010 Daniel DeLeo
+# Copyright:: Copyright 2010-2016, Daniel DeLeo
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,10 +16,10 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'digest/md5'
-require 'tmpdir'
-require 'chef/mixin/file_class'
+require "spec_helper"
+require "digest/md5"
+require "tmpdir"
+require "chef/mixin/file_class"
 
 class Chef::CFCCheck
   include Chef::Mixin::FileClass
@@ -32,7 +32,7 @@ describe Chef::Provider::RemoteDirectory do
     @resource = Chef::Resource::RemoteDirectory.new(File.join(Dir.tmpdir, "tafty"))
     # in CHEF_SPEC_DATA/cookbooks/openldap/files/default/remotedir
     @resource.source "remotedir"
-    @resource.cookbook('openldap')
+    @resource.cookbook("openldap")
 
     @cookbook_repo = ::File.expand_path(::File.join(CHEF_SPEC_DATA, "cookbooks"))
     Chef::Cookbook::FileVendor.fetch_from_disk(@cookbook_repo)
@@ -110,7 +110,7 @@ describe Chef::Provider::RemoteDirectory do
       @resource.path(@destination_dir)
     end
 
-    after {FileUtils.rm_rf(@destination_dir)}
+    after { FileUtils.rm_rf(@destination_dir) }
 
     # CHEF-3552
     it "creates the toplevel directory without error " do
@@ -121,12 +121,12 @@ describe Chef::Provider::RemoteDirectory do
 
     it "transfers the directory with all contents" do
       @provider.run_action(:create)
-      expect(::File.exist?(@destination_dir + '/remote_dir_file1.txt')).to be_truthy
-      expect(::File.exist?(@destination_dir + '/remote_dir_file2.txt')).to be_truthy
-      expect(::File.exist?(@destination_dir + '/remotesubdir/remote_subdir_file1.txt')).to be_truthy
-      expect(::File.exist?(@destination_dir + '/remotesubdir/remote_subdir_file2.txt')).to be_truthy
-      expect(::File.exist?(@destination_dir + '/remotesubdir/.a_dotfile')).to be_truthy
-      expect(::File.exist?(@destination_dir + '/.a_dotdir/.a_dotfile_in_a_dotdir')).to be_truthy
+      expect(::File.exist?(@destination_dir + "/remote_dir_file1.txt")).to be_truthy
+      expect(::File.exist?(@destination_dir + "/remote_dir_file2.txt")).to be_truthy
+      expect(::File.exist?(@destination_dir + "/remotesubdir/remote_subdir_file1.txt")).to be_truthy
+      expect(::File.exist?(@destination_dir + "/remotesubdir/remote_subdir_file2.txt")).to be_truthy
+      expect(::File.exist?(@destination_dir + "/remotesubdir/.a_dotfile")).to be_truthy
+      expect(::File.exist?(@destination_dir + "/.a_dotdir/.a_dotfile_in_a_dotdir")).to be_truthy
     end
 
     describe "only if it is missing" do
@@ -134,52 +134,52 @@ describe Chef::Provider::RemoteDirectory do
         @resource.overwrite(true)
         @provider.run_action(:create)
 
-        File.open(@destination_dir + '/remote_dir_file1.txt', 'a') {|f| f.puts "blah blah blah" }
-        File.open(@destination_dir + '/remotesubdir/remote_subdir_file1.txt', 'a') {|f| f.puts "blah blah blah" }
-        file1md5 = Digest::MD5.hexdigest(File.read(@destination_dir + '/remote_dir_file1.txt'))
-        subdirfile1md5 = Digest::MD5.hexdigest(File.read(@destination_dir + '/remotesubdir/remote_subdir_file1.txt'))
+        File.open(@destination_dir + "/remote_dir_file1.txt", "a") { |f| f.puts "blah blah blah" }
+        File.open(@destination_dir + "/remotesubdir/remote_subdir_file1.txt", "a") { |f| f.puts "blah blah blah" }
+        file1md5 = Digest::MD5.hexdigest(File.read(@destination_dir + "/remote_dir_file1.txt"))
+        subdirfile1md5 = Digest::MD5.hexdigest(File.read(@destination_dir + "/remotesubdir/remote_subdir_file1.txt"))
 
         @provider.run_action(:create_if_missing)
 
-        expect(file1md5.eql?(Digest::MD5.hexdigest(File.read(@destination_dir + '/remote_dir_file1.txt')))).to be_truthy
-        expect(subdirfile1md5.eql?(Digest::MD5.hexdigest(File.read(@destination_dir + '/remotesubdir/remote_subdir_file1.txt')))).to be_truthy
+        expect(file1md5.eql?(Digest::MD5.hexdigest(File.read(@destination_dir + "/remote_dir_file1.txt")))).to be_truthy
+        expect(subdirfile1md5.eql?(Digest::MD5.hexdigest(File.read(@destination_dir + "/remotesubdir/remote_subdir_file1.txt")))).to be_truthy
       end
     end
 
     describe "with purging enabled" do
-      before {@resource.purge(true)}
+      before { @resource.purge(true) }
 
       it "removes existing files if purge is true" do
         @provider.run_action(:create)
-        FileUtils.touch(@destination_dir + '/marked_for_death.txt')
-        FileUtils.touch(@destination_dir + '/remotesubdir/marked_for_death_again.txt')
+        FileUtils.touch(@destination_dir + "/marked_for_death.txt")
+        FileUtils.touch(@destination_dir + "/remotesubdir/marked_for_death_again.txt")
         @provider.run_action(:create)
 
-        expect(::File.exist?(@destination_dir + '/remote_dir_file1.txt')).to be_truthy
-        expect(::File.exist?(@destination_dir + '/remote_dir_file2.txt')).to be_truthy
-        expect(::File.exist?(@destination_dir + '/remotesubdir/remote_subdir_file1.txt')).to be_truthy
-        expect(::File.exist?(@destination_dir + '/remotesubdir/remote_subdir_file2.txt')).to be_truthy
+        expect(::File.exist?(@destination_dir + "/remote_dir_file1.txt")).to be_truthy
+        expect(::File.exist?(@destination_dir + "/remote_dir_file2.txt")).to be_truthy
+        expect(::File.exist?(@destination_dir + "/remotesubdir/remote_subdir_file1.txt")).to be_truthy
+        expect(::File.exist?(@destination_dir + "/remotesubdir/remote_subdir_file2.txt")).to be_truthy
 
-        expect(::File.exist?(@destination_dir + '/marked_for_death.txt')).to be_falsey
-        expect(::File.exist?(@destination_dir + '/remotesubdir/marked_for_death_again.txt')).to be_falsey
+        expect(::File.exist?(@destination_dir + "/marked_for_death.txt")).to be_falsey
+        expect(::File.exist?(@destination_dir + "/remotesubdir/marked_for_death_again.txt")).to be_falsey
       end
 
       it "removes files in subdirectories before files above" do
         @provider.run_action(:create)
-        FileUtils.mkdir_p(@destination_dir + '/a/multiply/nested/directory/')
-        FileUtils.touch(@destination_dir + '/a/foo.txt')
-        FileUtils.touch(@destination_dir + '/a/multiply/bar.txt')
-        FileUtils.touch(@destination_dir + '/a/multiply/nested/baz.txt')
-        FileUtils.touch(@destination_dir + '/a/multiply/nested/directory/qux.txt')
+        FileUtils.mkdir_p(@destination_dir + "/a/multiply/nested/directory/")
+        FileUtils.touch(@destination_dir + "/a/foo.txt")
+        FileUtils.touch(@destination_dir + "/a/multiply/bar.txt")
+        FileUtils.touch(@destination_dir + "/a/multiply/nested/baz.txt")
+        FileUtils.touch(@destination_dir + "/a/multiply/nested/directory/qux.txt")
         @provider.run_action(:create)
-        expect(::File.exist?(@destination_dir + '/a/foo.txt')).to be_falsey
-        expect(::File.exist?(@destination_dir + '/a/multiply/bar.txt')).to be_falsey
-        expect(::File.exist?(@destination_dir + '/a/multiply/nested/baz.txt')).to be_falsey
-        expect(::File.exist?(@destination_dir + '/a/multiply/nested/directory/qux.txt')).to be_falsey
+        expect(::File.exist?(@destination_dir + "/a/foo.txt")).to be_falsey
+        expect(::File.exist?(@destination_dir + "/a/multiply/bar.txt")).to be_falsey
+        expect(::File.exist?(@destination_dir + "/a/multiply/nested/baz.txt")).to be_falsey
+        expect(::File.exist?(@destination_dir + "/a/multiply/nested/directory/qux.txt")).to be_falsey
       end
 
       it "removes directory symlinks properly", :not_supported_on_win2k3 do
-        symlinked_dir_path = @destination_dir + '/symlinked_dir'
+        symlinked_dir_path = @destination_dir + "/symlinked_dir"
         @provider.action = :create
         @provider.run_action
 
@@ -202,18 +202,18 @@ describe Chef::Provider::RemoteDirectory do
     end
 
     describe "with overwrite disabled" do
-      before {@resource.purge(false)}
-      before {@resource.overwrite(false)}
+      before { @resource.purge(false) }
+      before { @resource.overwrite(false) }
 
       it "leaves modifications alone" do
         @provider.run_action(:create)
-        ::File.open(@destination_dir + '/remote_dir_file1.txt', 'a') {|f| f.puts "blah blah blah" }
-        ::File.open(@destination_dir + '/remotesubdir/remote_subdir_file1.txt', 'a') {|f| f.puts "blah blah blah" }
-        file1md5 = Digest::MD5.hexdigest(::File.read(@destination_dir + '/remote_dir_file1.txt'))
-        subdirfile1md5 = Digest::MD5.hexdigest(::File.read(@destination_dir + '/remotesubdir/remote_subdir_file1.txt'))
+        ::File.open(@destination_dir + "/remote_dir_file1.txt", "a") { |f| f.puts "blah blah blah" }
+        ::File.open(@destination_dir + "/remotesubdir/remote_subdir_file1.txt", "a") { |f| f.puts "blah blah blah" }
+        file1md5 = Digest::MD5.hexdigest(::File.read(@destination_dir + "/remote_dir_file1.txt"))
+        subdirfile1md5 = Digest::MD5.hexdigest(::File.read(@destination_dir + "/remotesubdir/remote_subdir_file1.txt"))
         @provider.run_action(:create)
-        expect(file1md5.eql?(Digest::MD5.hexdigest(::File.read(@destination_dir + '/remote_dir_file1.txt')))).to be_truthy
-        expect(subdirfile1md5.eql?(Digest::MD5.hexdigest(::File.read(@destination_dir + '/remotesubdir/remote_subdir_file1.txt')))).to be_truthy
+        expect(file1md5.eql?(Digest::MD5.hexdigest(::File.read(@destination_dir + "/remote_dir_file1.txt")))).to be_truthy
+        expect(subdirfile1md5.eql?(Digest::MD5.hexdigest(::File.read(@destination_dir + "/remotesubdir/remote_subdir_file1.txt")))).to be_truthy
       end
     end
 

data/spec/unit/provider/remote_file/cache_control_data_spec.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Daniel DeLeo (<dan@opscode.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Author:: Daniel DeLeo (<dan@chef.io>)
+# Copyright:: Copyright 2013-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,8 +16,8 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'uri'
+require "spec_helper"
+require "uri"
 
 CACHE_FILE_TRUNCATED_FRIENDLY_FILE_NAME_LENGTH = 64
 CACHE_FILE_CHECKSUM_HEX_LENGTH = 32
@@ -136,7 +136,7 @@ describe Chef::Provider::RemoteFile::CacheControlData do
         end
 
         context "and it still is valid JSON" do
-          let(:cache_json_data) { '' }
+          let(:cache_json_data) { "" }
 
           it "returns empty cache control data" do
             expect(cache_control_data.etag).to be_nil
@@ -214,16 +214,16 @@ describe Chef::Provider::RemoteFile::CacheControlData do
     # local file system path limits resulting in exceptions from
     # file system API's on both Windows and Unix systems.
     context "and the URI results in a file cache path that exceeds #{CACHE_FILE_PATH_LIMIT} characters in length" do
-      let(:long_remote_path) { "http://www.bing.com/" +  ('0' * (CACHE_FILE_TRUNCATED_FRIENDLY_FILE_NAME_LENGTH * 2 )) }
+      let(:long_remote_path) { "http://www.bing.com/" + ("0" * (CACHE_FILE_TRUNCATED_FRIENDLY_FILE_NAME_LENGTH * 2 )) }
       let(:uri) { URI.parse(long_remote_path) }
       let(:truncated_remote_uri) { URI.parse(long_remote_path[0...CACHE_FILE_TRUNCATED_FRIENDLY_FILE_NAME_LENGTH]) }
       let(:truncated_file_cache_path) do
         cache_control_data_truncated = Chef::Provider::RemoteFile::CacheControlData.load_and_validate(truncated_remote_uri, current_file_checksum)
-        cache_control_data_truncated.send('sanitized_cache_file_basename')[0...CACHE_FILE_TRUNCATED_FRIENDLY_FILE_NAME_LENGTH]
+        cache_control_data_truncated.send("sanitized_cache_file_basename")[0...CACHE_FILE_TRUNCATED_FRIENDLY_FILE_NAME_LENGTH]
       end
 
       it "truncates the file cache path to 102 characters" do
-        normalized_cache_path = cache_control_data.send('sanitized_cache_file_basename')
+        normalized_cache_path = cache_control_data.send("sanitized_cache_file_basename")
 
         expect(Chef::FileCache).to receive(:store).with("remote_file/" + normalized_cache_path, cache_control_data.json_data)
 
@@ -233,7 +233,7 @@ describe Chef::Provider::RemoteFile::CacheControlData do
       end
 
       it "uses a file cache path that starts with the first #{CACHE_FILE_TRUNCATED_FRIENDLY_FILE_NAME_LENGTH} characters of the URI" do
-        normalized_cache_path = cache_control_data.send('sanitized_cache_file_basename')
+        normalized_cache_path = cache_control_data.send("sanitized_cache_file_basename")
 
         expect(truncated_file_cache_path.length).to eq(CACHE_FILE_TRUNCATED_FRIENDLY_FILE_NAME_LENGTH)
         expect(normalized_cache_path.start_with?(truncated_file_cache_path)).to eq(true)
@@ -243,4 +243,3 @@ describe Chef::Provider::RemoteFile::CacheControlData do
   end
 
 end
-

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

@@ -1,6 +1,6 @@
 #
-# Author:: Lamont Granquist (<lamont@opscode.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Author:: Lamont Granquist (<lamont@chef.io>)
+# Copyright:: Copyright 2013-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
+require "spec_helper"
 
 describe Chef::Provider::RemoteFile::Content do
 
@@ -141,7 +141,6 @@ describe Chef::Provider::RemoteFile::Content do
     it_behaves_like "the resource needs fetching"
   end
 
-
   describe "when the fetcher throws an exception" do
     before do
       allow(new_resource).to receive(:checksum).and_return(nil)
@@ -163,7 +162,7 @@ describe Chef::Provider::RemoteFile::Content do
     # https://github.com/opscode/chef/pull/1358#issuecomment-40853299
     def create_exception(exception_class)
       if [ Net::HTTPServerException, Net::HTTPFatalError ].include? exception_class
-        exception_class.new("message", {"something" => 1})
+        exception_class.new("message", { "something" => 1 })
       else
         exception_class.new
       end
@@ -180,7 +179,7 @@ describe Chef::Provider::RemoteFile::Content do
       Timeout::Error,
       Net::HTTPServerException,
       Net::HTTPFatalError,
-      Net::FTPError
+      Net::FTPError,
     ].each do |exception|
       describe "with an exception of #{exception}" do
         before do

data/spec/unit/provider/remote_file/fetcher_spec.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Lamont Granquist (<lamont@opscode.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Author:: Lamont Granquist (<lamont@chef.io>)
+# Copyright:: Copyright 2013-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
+require "spec_helper"
 
 describe Chef::Provider::RemoteFile::Fetcher do
 

data/spec/unit/provider/remote_file/ftp_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Jesse Campbell (<hikeit@gmail.com>)
-# Copyright:: Copyright (c) 2013 Jesse Campbell
+# Copyright:: Copyright 2013-2016, Jesse Campbell
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
+require "spec_helper"
 
 describe Chef::Provider::RemoteFile::FTP do
   let(:enclosing_directory) {
@@ -38,7 +38,7 @@ describe Chef::Provider::RemoteFile::FTP do
   end
 
   let(:ftp) do
-    ftp = double(Net::FTP, { })
+    ftp = double(Net::FTP, {})
     allow(ftp).to receive(:connect)
     allow(ftp).to receive(:login)
     allow(ftp).to receive(:voidcmd)

data/spec/unit/provider/remote_file/http_spec.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Lamont Granquist (<lamont@opscode.com>)
-# Copyright:: Copyright (c) 2013 Lamont Granquist
+# Author:: Lamont Granquist (<lamont@chef.io>)
+# Copyright:: Copyright 2013-2016, Lamont Granquist
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
+require "spec_helper"
 
 describe Chef::Provider::RemoteFile::HTTP do
 
@@ -61,7 +61,7 @@ describe Chef::Provider::RemoteFile::HTTP do
         end
 
         it "has the user-specified custom headers" do
-          expect(fetcher.headers).to eq({"x-myapp-header" => "custom-header-value"})
+          expect(fetcher.headers).to eq({ "x-myapp-header" => "custom-header-value" })
         end
       end
 
@@ -178,7 +178,6 @@ describe Chef::Provider::RemoteFile::HTTP do
       expect(Chef::HTTP::Simple).to receive(:new).with(*expected_http_args).and_return(rest)
     end
 
-
     describe "and the request does not return new content" do
 
       it "should return a nil tempfile for a 304 HTTPNotModifed" do
@@ -207,7 +206,7 @@ describe Chef::Provider::RemoteFile::HTTP do
       end
 
       context "and the response does not contain an etag" do
-        let(:last_response) { {"etag" => nil} }
+        let(:last_response) { { "etag" => nil } }
         it "does not include an etag in the result" do
           fetcher.fetch
           expect(cache_control_data.etag).to be_nil
@@ -217,7 +216,7 @@ describe Chef::Provider::RemoteFile::HTTP do
       end
 
       context "and the response has an etag header" do
-        let(:last_response) { {"etag" => "abc123"} }
+        let(:last_response) { { "etag" => "abc123" } }
 
         it "includes the etag value in the response" do
           fetcher.fetch
@@ -229,7 +228,7 @@ describe Chef::Provider::RemoteFile::HTTP do
       end
 
       context "and the response has no Date or Last-Modified header" do
-        let(:last_response) { {"date" => nil, "last_modified" => nil} }
+        let(:last_response) { { "date" => nil, "last_modified" => nil } }
         it "does not set an mtime in the result" do
           # RFC 2616 suggests that servers that do not set a Date header do not
           # have a reliable clock, so no use in making them deal with dates.
@@ -243,7 +242,7 @@ describe Chef::Provider::RemoteFile::HTTP do
       context "and the response has a Last-Modified header" do
         let(:last_response) do
           # Last-Modified should be preferred to Date if both are set
-          {"date" => "Fri, 17 May 2013 23:23:23 GMT", "last_modified" => "Fri, 17 May 2013 11:11:11 GMT"}
+          { "date" => "Fri, 17 May 2013 23:23:23 GMT", "last_modified" => "Fri, 17 May 2013 11:11:11 GMT" }
         end
 
         it "sets the mtime to the Last-Modified time in the response" do
@@ -255,7 +254,7 @@ describe Chef::Provider::RemoteFile::HTTP do
 
       context "and the response has a Date header but no Last-Modified header" do
         let(:last_response) do
-          {"date" => "Fri, 17 May 2013 23:23:23 GMT", "last_modified" => nil}
+          { "date" => "Fri, 17 May 2013 23:23:23 GMT", "last_modified" => nil }
         end
 
         it "sets the mtime to the Date in the response" do
@@ -270,7 +269,7 @@ describe Chef::Provider::RemoteFile::HTTP do
       context "and the target file is a tarball [CHEF-3140]" do
 
         let(:uri) { URI.parse("http://opscode.com/tarball.tgz") }
-        let(:expected_http_opts) { {:disable_gzip => true} }
+        let(:expected_http_opts) { { :disable_gzip => true } }
 
         # CHEF-3140
         # Some servers return tarballs as content type tar and encoding gzip, which
@@ -300,4 +299,3 @@ describe Chef::Provider::RemoteFile::HTTP do
   end
 
 end
-