chef 12.6.0-universal-mingw32 → 12.7.2-universal-mingw32

data/spec/functional/win32/security_spec.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Serdar Sutay (<serdar@opscode.com>)
-# Copyright:: Copyright (c) 2012 Opscode, Inc.
+# Author:: Serdar Sutay (<serdar@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,12 +16,12 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
+require "spec_helper"
 if Chef::Platform.windows?
-  require 'chef/win32/security'
+  require "chef/win32/security"
 end
 
-describe 'Chef::Win32::Security', :windows_only do
+describe "Chef::Win32::Security", :windows_only do
   it "has_admin_privileges? returns true when running as admin" do
     expect(Chef::ReservedNames::Win32::Security.has_admin_privileges?).to eq(true)
   end
@@ -35,8 +35,8 @@ describe 'Chef::Win32::Security', :windows_only do
     skip "requires user support in mixlib-shellout"
   end
 
-  describe 'get_file_security' do
-    it 'should return a security descriptor when called with a path that exists' do
+  describe "get_file_security" do
+    it "should return a security descriptor when called with a path that exists" do
       security_descriptor = Chef::ReservedNames::Win32::Security.get_file_security(
         "C:\\Program Files")
       # Make sure the security descriptor works
@@ -44,7 +44,7 @@ describe 'Chef::Win32::Security', :windows_only do
     end
   end
 
-  describe 'access_check' do
+  describe "access_check" do
     let(:security_descriptor) {
       Chef::ReservedNames::Win32::Security.get_file_security(
         "C:\\Program Files")
@@ -69,31 +69,31 @@ describe 'Chef::Win32::Security', :windows_only do
 
     let(:desired_access) { Chef::ReservedNames::Win32::Security::FILE_GENERIC_READ }
 
-    it 'should check if the provided token has the desired access' do
-      expect(Chef::ReservedNames::Win32::Security.access_check(security_descriptor, 
+    it "should check if the provided token has the desired access" do
+      expect(Chef::ReservedNames::Win32::Security.access_check(security_descriptor,
                      token, desired_access, mapping)).to be true
     end
   end
 
-  describe 'Chef::Win32::Security::Token' do
+  describe "Chef::Win32::Security::Token" do
     let(:token) {
       Chef::ReservedNames::Win32::Security.open_process_token(
         Chef::ReservedNames::Win32::Process.get_current_process,
         token_rights)
     }
-    context 'with all rights' do
+    context "with all rights" do
       let(:token_rights) { Chef::ReservedNames::Win32::Security::TOKEN_ALL_ACCESS }
 
-      it 'can duplicate a token' do
-        expect{ token.duplicate_token(:SecurityImpersonation) }.not_to raise_error
+      it "can duplicate a token" do
+        expect { token.duplicate_token(:SecurityImpersonation) }.not_to raise_error
       end
     end
 
-    context 'with read only rights' do
+    context "with read only rights" do
       let(:token_rights) { Chef::ReservedNames::Win32::Security::TOKEN_READ }
 
-      it 'raises an exception when trying to duplicate' do
-        expect{ token.duplicate_token(:SecurityImpersonation) }.to raise_error(Chef::Exceptions::Win32APIError)
+      it "raises an exception when trying to duplicate" do
+        expect { token.duplicate_token(:SecurityImpersonation) }.to raise_error(Chef::Exceptions::Win32APIError)
       end
     end
   end

data/spec/functional/win32/service_manager_spec.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Serdar Sutay (<serdar@opscode.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Author:: Serdar Sutay (<serdar@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,9 +16,9 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
+require "spec_helper"
 if Chef::Platform.windows?
-  require 'chef/application/windows_service_manager'
+  require "chef/application/windows_service_manager"
 end
 
 #
@@ -101,8 +101,8 @@ describe "Chef::Application::WindowsServiceManager", :windows_only, :system_wind
       end
 
       it "install => should say service already exists" do
-          service_manager.run(["-a", "install"])
-          expect(@service_manager_output.grep(/already exists/).length).to be > 0
+        service_manager.run(["-a", "install"])
+        expect(@service_manager_output.grep(/already exists/).length).to be > 0
       end
 
       context "and service is stopped" do
@@ -133,7 +133,6 @@ describe "Chef::Application::WindowsServiceManager", :windows_only, :system_wind
           expect(test_service_state).to eq("stopped")
         end
 
-
         ["pause", "resume"].each do |action|
           it "#{action} => should raise error" do
             expect { service_manager.run(["-a", action]) }.to raise_error(SystemCallError)
@@ -211,7 +210,7 @@ describe "Chef::Application::WindowsServiceManager", :windows_only, :system_wind
           end
 
           it "start should raise an error" do
-            expect {service_manager.run(["-a", "start"])}.to raise_error(::Win32::Service::Error)
+            expect { service_manager.run(["-a", "start"]) }.to raise_error(::Win32::Service::Error)
           end
 
         end

data/spec/functional/win32/sid_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Dan Bjorge (<dbjorge@gmail.com>)
-# Copyright:: Copyright (c) 2015 Dan Bjorge
+# Copyright:: Copyright 2015-2016, Dan Bjorge
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,39 +16,39 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
+require "spec_helper"
 if Chef::Platform.windows?
-  require 'chef/win32/security'
+  require "chef/win32/security"
 end
 
-describe 'Chef::ReservedNames::Win32::SID', :windows_only do
+describe "Chef::ReservedNames::Win32::SID", :windows_only do
   if Chef::Platform.windows?
     SID ||= Chef::ReservedNames::Win32::Security::SID
   end
 
-  it 'should resolve default_security_object_group as a sane user group', :windows_not_domain_joined_only do
+  it "should resolve default_security_object_group as a sane user group", :windows_not_domain_joined_only do
     # Domain accounts: domain-specific Domain Users SID
     # Microsoft Accounts: SID.current_user
     # Else: SID.None
     expect(SID.default_security_object_group).to eq(SID.None).or eq(SID.current_user)
   end
 
-  context 'running as an elevated administrator user' do
-    it 'should resolve default_security_object_owner as the Administrators group' do
+  context "running as an elevated administrator user" do
+    it "should resolve default_security_object_owner as the Administrators group" do
       expect(SID.default_security_object_owner).to eq(SID.Administrators)
     end
   end
 
-  context 'running as a non-elevated administrator user' do
-    it 'should resolve default_security_object_owner as the current user' do
-      skip 'requires user support in mixlib-shellout, see security_spec.rb'
+  context "running as a non-elevated administrator user" do
+    it "should resolve default_security_object_owner as the current user" do
+      skip "requires user support in mixlib-shellout, see security_spec.rb"
       expect(SID.default_security_object_owner).to eq(SID.Administrators)
     end
   end
 
-  context 'running as a non-elevated, non-administrator user' do
-    it 'should resolve default_security_object_owner as the current user' do
-      skip 'requires user support in mixlib-shellout, see security_spec.rb'
+  context "running as a non-elevated, non-administrator user" do
+    it "should resolve default_security_object_owner as the current user" do
+      skip "requires user support in mixlib-shellout, see security_spec.rb"
       expect(SID.default_security_object_owner).to eq(SID.current_user)
     end
   end

data/spec/functional/win32/version_info_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Matt Wrock (<matt@mattwrock.com>)
-# Copyright:: Copyright 2015 Chef Software, Inc.
+# Copyright:: Copyright 2015-2016, Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,18 +16,18 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
+require "spec_helper"
 if Chef::Platform.windows?
-  require 'chef/win32/file/version_info'
+  require "chef/win32/file/version_info"
 end
 
 describe "Chef::ReservedNames::Win32::File::VersionInfo", :windows_only do
-  require 'wmi-lite/wmi'
-  let(:file_path) { ENV['ComSpec'] }
+  require "wmi-lite/wmi"
+  let(:file_path) { ENV["ComSpec"] }
   let(:os_version) do
     wmi = WmiLite::Wmi.new
-    os_info = wmi.first_of('Win32_OperatingSystem')
-    os_info['version']
+    os_info = wmi.first_of("Win32_OperatingSystem")
+    os_info["version"]
   end
 
   subject { Chef::ReservedNames::Win32::File::VersionInfo.new(file_path) }

data/spec/functional/win32/versions_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Chirag Jog (<chirag@clogeny.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Copyright:: Copyright 2013-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,16 +16,16 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
+require "spec_helper"
 if Chef::Platform.windows?
-  require 'chef/win32/version'
+  require "chef/win32/version"
 end
 
 describe "Chef::ReservedNames::Win32::Version", :windows_only, :not_supported_on_win2k3 do
   before do
 
     wmi = WmiLite::Wmi.new
-    host = wmi.first_of('Win32_OperatingSystem')
+    host = wmi.first_of("Win32_OperatingSystem")
 
     # Use WMI to determine current OS version.
     # On Win2k8R2 and later, we can dynamically obtain marketing
@@ -37,14 +37,14 @@ describe "Chef::ReservedNames::Win32::Version", :windows_only, :not_supported_on
     # trademark on Win2k8 and Win2k3 that we're not using in our
     # library, so we have to set the expectation statically.
     if Chef::Platform::windows_server_2003?
-      @current_os_version = 'Windows Server 2003 R2'
+      @current_os_version = "Windows Server 2003 R2"
     elsif is_windows_server_2008?(host)
-      @current_os_version = 'Windows Server 2008'
+      @current_os_version = "Windows Server 2008"
     else
       # The name from WMI is actually what we want in Win2k8R2+.
       # So this expectation sould continue to hold without modification
       # as new versions of Windows are released.
-      @current_os_version = host['caption']
+      @current_os_version = host["caption"]
     end
 
     @version = Chef::ReservedNames::Win32::Version.new
@@ -52,7 +52,7 @@ describe "Chef::ReservedNames::Win32::Version", :windows_only, :not_supported_on
 
   def for_each_windows_version(&block)
     @version.methods.each do |method_name|
-      if Chef::ReservedNames::Win32::Version::WIN_VERSIONS.keys.find { | key | method_name.to_s == Chef::ReservedNames::Win32::Version.send(:method_name_from_marketing_name,key) }
+      if Chef::ReservedNames::Win32::Version::WIN_VERSIONS.keys.find { |key| method_name.to_s == Chef::ReservedNames::Win32::Version.send(:method_name_from_marketing_name, key) }
         yield method_name
       end
     end
@@ -98,20 +98,20 @@ describe "Chef::ReservedNames::Win32::Version", :windows_only, :not_supported_on
   def is_windows_server_2008?(wmi_host)
     is_win2k8 = false
 
-    os_version = wmi_host['version']
+    os_version = wmi_host["version"]
 
     # The operating system version is a string in the following form
     # that can be split into components based on the '.' delimiter:
     # MajorVersionNumber.MinorVersionNumber.BuildNumber
-    os_version_components = os_version.split('.')
+    os_version_components = os_version.split(".")
 
     if os_version_components.length < 2
-      raise 'WMI returned a Windows version from Win32_OperatingSystem.Version ' +
-        'with an unexpected format. The Windows version could not be determined.'
+      raise "WMI returned a Windows version from Win32_OperatingSystem.Version " +
+        "with an unexpected format. The Windows version could not be determined."
     end
 
     # Windows 6.0 is Windows Server 2008, so test the major and
     # minor version components
-    is_win2k8 = os_version_components[0] == '6' && os_version_components[1] == '0'
+    is_win2k8 = os_version_components[0] == "6" && os_version_components[1] == "0"
   end
 end

data/spec/integration/client/client_spec.rb

@@ -1,19 +1,18 @@
-require 'support/shared/integration/integration_helper'
-require 'chef/mixin/shell_out'
-require 'tiny_server'
-require 'tmpdir'
-
+require "support/shared/integration/integration_helper"
+require "chef/mixin/shell_out"
+require "tiny_server"
+require "tmpdir"
 
 describe "chef-client" do
 
   def recipes_filename
-    File.join(CHEF_SPEC_DATA, 'recipes.tgz')
+    File.join(CHEF_SPEC_DATA, "recipes.tgz")
   end
 
-  def start_tiny_server(server_opts={})
+  def start_tiny_server(server_opts = {})
     @server = TinyServer::Manager.new(server_opts)
     @server.start
-      @api = TinyServer::API.instance
+    @api = TinyServer::API.instance
     @api.clear
     #
     # trivial endpoints
@@ -48,13 +47,13 @@ describe "chef-client" do
   # cf. CHEF-4914
   let(:chef_client) { "ruby '#{chef_dir}/chef-client' --minimal-ohai" }
 
-  let(:critical_env_vars) { %w(PATH RUBYOPT BUNDLE_GEMFILE GEM_PATH).map {|o| "#{o}=#{ENV[o]}"} .join(' ') }
+  let(:critical_env_vars) { %w{PATH RUBYOPT BUNDLE_GEMFILE GEM_PATH}.map { |o| "#{o}=#{ENV[o]}" } .join(" ") }
 
   when_the_repository "has a cookbook with a no-op recipe" do
-    before { file 'cookbooks/x/recipes/default.rb', '' }
+    before { file "cookbooks/x/recipes/default.rb", "" }
 
     it "should complete with success" do
-      file 'config/client.rb', <<EOM
+      file "config/client.rb", <<EOM
 local_mode true
 cookbook_path "#{path_to('cookbooks')}"
 EOM
@@ -63,7 +62,7 @@ EOM
     end
 
     it "should complete successfully with no other environment variables", :skip => (Chef::Platform.windows?) do
-      file 'config/client.rb', <<EOM
+      file "config/client.rb", <<EOM
 local_mode true
 cookbook_path "#{path_to('cookbooks')}"
 EOM
@@ -79,7 +78,7 @@ EOM
     end
 
     it "should complete successfully with --no-listen" do
-      file 'config/client.rb', <<EOM
+      file "config/client.rb", <<EOM
 local_mode true
 cookbook_path "#{path_to('cookbooks')}"
 EOM
@@ -90,32 +89,32 @@ EOM
 
     it "should be able to node.save with bad utf8 characters in the node data" do
       file "cookbooks/x/attributes/default.rb", 'default["badutf8"] = "Elan Ruusam\xE4e"'
-      result = shell_out("#{chef_client} -z -r 'x::default' --disable-config", :cwd => path_to(''))
+      result = shell_out("#{chef_client} -z -r 'x::default' --disable-config", :cwd => path_to(""))
       result.error!
     end
 
-    context 'and no config file' do
-      it 'should complete with success when cwd is just above cookbooks and paths are not specified' do
-        result = shell_out("#{chef_client} -z -o 'x::default' --disable-config", :cwd => path_to(''))
+    context "and no config file" do
+      it "should complete with success when cwd is just above cookbooks and paths are not specified" do
+        result = shell_out("#{chef_client} -z -o 'x::default' --disable-config", :cwd => path_to(""))
         result.error!
       end
 
-      it 'should complete with success when cwd is below cookbooks and paths are not specified' do
-        result = shell_out("#{chef_client} -z -o 'x::default' --disable-config", :cwd => path_to('cookbooks/x'))
+      it "should complete with success when cwd is below cookbooks and paths are not specified" do
+        result = shell_out("#{chef_client} -z -o 'x::default' --disable-config", :cwd => path_to("cookbooks/x"))
         result.error!
       end
 
-      it 'should fail when cwd is below high above and paths are not specified' do
-        result = shell_out("#{chef_client} -z -o 'x::default' --disable-config", :cwd => File.expand_path('..', path_to('')))
+      it "should fail when cwd is below high above and paths are not specified" do
+        result = shell_out("#{chef_client} -z -o 'x::default' --disable-config", :cwd => File.expand_path("..", path_to("")))
         expect(result.exitstatus).to eq(1)
       end
     end
 
-    context 'and a config file under .chef/knife.rb' do
-      before { file '.chef/knife.rb', 'xxx.xxx' }
+    context "and a config file under .chef/knife.rb" do
+      before { file ".chef/knife.rb", "xxx.xxx" }
 
-      it 'should load .chef/knife.rb when -z is specified' do
-        result = shell_out("#{chef_client} -z -o 'x::default'", :cwd => path_to(''))
+      it "should load .chef/knife.rb when -z is specified" do
+        result = shell_out("#{chef_client} -z -o 'x::default'", :cwd => path_to(""))
         # FATAL: Configuration error NoMethodError: undefined method `xxx' for nil:NilClass
         expect(result.stdout).to include("xxx")
       end
@@ -123,7 +122,7 @@ EOM
     end
 
     it "should complete with success" do
-      file 'config/client.rb', <<EOM
+      file "config/client.rb", <<EOM
 local_mode true
 cookbook_path "#{path_to('cookbooks')}"
 EOM
@@ -132,9 +131,9 @@ EOM
       result.error!
     end
 
-    context 'and a private key' do
+    context "and a private key" do
       before do
-        file 'mykey.pem', <<EOM
+        file "mykey.pem", <<EOM
 -----BEGIN RSA PRIVATE KEY-----
 MIIEogIBAAKCAQEApubutqtYYQ5UiA9QhWP7UvSmsfHsAoPKEVVPdVW/e8Svwpyf
 0Xef6OFWVmBE+W442ZjLOe2y6p2nSnaq4y7dg99NFz6X+16mcKiCbj0RCiGqCvCk
@@ -166,7 +165,7 @@ EOM
       end
 
       it "should complete with success even with a client key" do
-        file 'config/client.rb', <<EOM
+        file "config/client.rb", <<EOM
 local_mode true
 client_key #{path_to('mykey.pem').inspect}
 cookbook_path #{path_to('cookbooks').inspect}
@@ -177,19 +176,19 @@ EOM
       end
 
       it "should run recipes specified directly on the command line" do
-        file 'config/client.rb', <<EOM
+        file "config/client.rb", <<EOM
 local_mode true
 client_key #{path_to('mykey.pem').inspect}
 cookbook_path #{path_to('cookbooks').inspect}
 EOM
 
-        file 'arbitrary.rb', <<EOM
+        file "arbitrary.rb", <<EOM
 file #{path_to('tempfile.txt').inspect} do
   content '1'
 end
 EOM
 
-        file 'arbitrary2.rb', <<EOM
+        file "arbitrary2.rb", <<EOM
 file #{path_to('tempfile2.txt').inspect} do
   content '2'
 end
@@ -198,57 +197,57 @@ EOM
         result = shell_out("#{chef_client} -c \"#{path_to('config/client.rb')}\" #{path_to('arbitrary.rb')} #{path_to('arbitrary2.rb')}", :cwd => chef_dir)
         result.error!
 
-        expect(IO.read(path_to('tempfile.txt'))).to eq('1')
-        expect(IO.read(path_to('tempfile2.txt'))).to eq('2')
+        expect(IO.read(path_to("tempfile.txt"))).to eq("1")
+        expect(IO.read(path_to("tempfile2.txt"))).to eq("2")
       end
 
       it "should run recipes specified as relative paths directly on the command line" do
-        file 'config/client.rb', <<EOM
+        file "config/client.rb", <<EOM
 local_mode true
 client_key #{path_to('mykey.pem').inspect}
 cookbook_path #{path_to('cookbooks').inspect}
 EOM
 
-        file 'arbitrary.rb', <<EOM
+        file "arbitrary.rb", <<EOM
 file #{path_to('tempfile.txt').inspect} do
   content '1'
 end
 EOM
 
-        result = shell_out("#{chef_client} -c \"#{path_to('config/client.rb')}\" arbitrary.rb", :cwd => path_to(''))
+        result = shell_out("#{chef_client} -c \"#{path_to('config/client.rb')}\" arbitrary.rb", :cwd => path_to(""))
         result.error!
 
-        expect(IO.read(path_to('tempfile.txt'))).to eq('1')
+        expect(IO.read(path_to("tempfile.txt"))).to eq("1")
       end
 
       it "should run recipes specified directly on the command line AFTER recipes in the run list" do
-        file 'config/client.rb', <<EOM
+        file "config/client.rb", <<EOM
 local_mode true
 client_key #{path_to('mykey.pem').inspect}
 cookbook_path #{path_to('cookbooks').inspect}
 EOM
 
-        file 'cookbooks/x/recipes/constant_definition.rb', <<EOM
+        file "cookbooks/x/recipes/constant_definition.rb", <<EOM
 class ::Blah
   THECONSTANT = '1'
 end
 EOM
-        file 'arbitrary.rb', <<EOM
+        file "arbitrary.rb", <<EOM
 file #{path_to('tempfile.txt').inspect} do
   content ::Blah::THECONSTANT
 end
 EOM
 
-        result = shell_out("#{chef_client} -c \"#{path_to('config/client.rb')}\" -o x::constant_definition arbitrary.rb", :cwd => path_to(''))
+        result = shell_out("#{chef_client} -c \"#{path_to('config/client.rb')}\" -o x::constant_definition arbitrary.rb", :cwd => path_to(""))
         result.error!
 
-        expect(IO.read(path_to('tempfile.txt'))).to eq('1')
+        expect(IO.read(path_to("tempfile.txt"))).to eq("1")
       end
 
     end
 
     it "should complete with success when passed the -z flag" do
-      file 'config/client.rb', <<EOM
+      file "config/client.rb", <<EOM
 chef_server_url 'http://omg.com/blah'
 cookbook_path "#{path_to('cookbooks')}"
 EOM
@@ -258,7 +257,7 @@ EOM
     end
 
     it "should complete with success when passed the --local-mode flag" do
-      file 'config/client.rb', <<EOM
+      file "config/client.rb", <<EOM
 chef_server_url 'http://omg.com/blah'
 cookbook_path "#{path_to('cookbooks')}"
 EOM
@@ -268,7 +267,7 @@ EOM
     end
 
     it "should not print SSL warnings when running in local-mode" do
-      file 'config/client.rb', <<EOM
+      file "config/client.rb", <<EOM
 chef_server_url 'http://omg.com/blah'
 cookbook_path "#{path_to('cookbooks')}"
 EOM
@@ -279,7 +278,7 @@ EOM
     end
 
     it "should complete with success when passed -z and --chef-zero-port" do
-      file 'config/client.rb', <<EOM
+      file "config/client.rb", <<EOM
 chef_server_url 'http://omg.com/blah'
 cookbook_path "#{path_to('cookbooks')}"
 EOM
@@ -289,7 +288,7 @@ EOM
     end
 
     it "should complete with success when setting the run list with -r" do
-      file 'config/client.rb', <<EOM
+      file "config/client.rb", <<EOM
 chef_server_url 'http://omg.com/blah'
 cookbook_path "#{path_to('cookbooks')}"
 EOM
@@ -302,7 +301,7 @@ EOM
     end
 
     it "should complete with success when using --profile-ruby and output a profile file" do
-      file 'config/client.rb', <<EOM
+      file "config/client.rb", <<EOM
 local_mode true
 cookbook_path "#{path_to('cookbooks')}"
 EOM
@@ -311,7 +310,7 @@ EOM
     end
 
     it "doesn't produce a profile when --profile-ruby is not present" do
-      file 'config/client.rb', <<EOM
+      file "config/client.rb", <<EOM
 local_mode true
 cookbook_path "#{path_to('cookbooks')}"
 EOM
@@ -322,13 +321,13 @@ EOM
 
   when_the_repository "has a cookbook that should fail chef_version checks" do
     before do
-      file 'cookbooks/x/recipes/default.rb', ''
-      file 'cookbooks/x/metadata.rb', <<EOM
+      file "cookbooks/x/recipes/default.rb", ""
+      file "cookbooks/x/metadata.rb", <<EOM
 name 'x'
 version '0.0.1'
 chef_version '~> 999.99'
 EOM
-      file 'config/client.rb', <<EOM
+      file "config/client.rb", <<EOM
 local_mode true
 cookbook_path "#{path_to('cookbooks')}"
 EOM
@@ -342,7 +341,7 @@ EOM
 
   when_the_repository "has a cookbook that uses cheffish resources" do
     before do
-      file 'cookbooks/x/recipes/default.rb', <<-EOM
+      file "cookbooks/x/recipes/default.rb", <<-EOM
         raise "Cheffish was loaded before we used any cheffish things!" if defined?(Cheffish::VERSION)
         ran_block = false
         got_server = with_chef_server 'https://blah.com' do
@@ -353,7 +352,7 @@ EOM
         raise "Cheffish was not loaded when we did cheffish things!" if !defined?(Cheffish::VERSION)
         raise "current_chef_server did not return its value!" if got_server[:chef_server_url] != 'https://blah.com'
       EOM
-      file 'config/client.rb', <<-EOM
+      file "config/client.rb", <<-EOM
         local_mode true
         cookbook_path "#{path_to('cookbooks')}"
       EOM
@@ -367,10 +366,10 @@ EOM
 
   when_the_repository "has a cookbook that uses chef-provisioning resources" do
     before do
-      file 'cookbooks/x/recipes/default.rb', <<-EOM
+      file "cookbooks/x/recipes/default.rb", <<-EOM
         with_driver 'blah'
       EOM
-      file 'config/client.rb', <<-EOM
+      file "config/client.rb", <<-EOM
         local_mode true
         cookbook_path "#{path_to('cookbooks')}"
       EOM
@@ -385,7 +384,7 @@ EOM
 
   when_the_repository "has a cookbook that generates deprecation warnings" do
     before do
-      file 'cookbooks/x/recipes/default.rb', <<-EOM
+      file "cookbooks/x/recipes/default.rb", <<-EOM
         class ::MyResource < Chef::Resource
           use_automatic_resource_name
           property :x, default: []
@@ -412,7 +411,7 @@ EOM
     end
 
     it "should output each deprecation warning only once, at the end of the run" do
-      file 'config/client.rb', <<EOM
+      file "config/client.rb", <<EOM
 local_mode true
 cookbook_path "#{path_to('cookbooks')}"
 # Mimick what happens when you are on the console
@@ -420,7 +419,7 @@ formatters << :doc
 log_level :warn
 EOM
 
-      ENV.delete('CHEF_TREAT_DEPRECATION_WARNINGS_AS_ERRORS')
+      ENV.delete("CHEF_TREAT_DEPRECATION_WARNINGS_AS_ERRORS")
 
       result = shell_out!("#{chef_client} -c \"#{path_to('config/client.rb')}\" -o 'x::default'", :cwd => chef_dir)
       expect(result.error?).to be_falsey
@@ -430,14 +429,14 @@ EOM
       expect(run_complete).to be >= 0
 
       # Make sure there is exactly one result for each, and that it occurs *after* the complete message.
-      expect(match_indices(/nil currently does not overwrite the value of/, result.stdout)).to match([ be > run_complete ])
+      expect(match_indices(/An attempt was made to change x from \[\] to nil by calling x\(nil\). In Chef 12, this does a get rather than a set. In Chef 13, this will change to set the value to nil./, result.stdout)).to match([ be > run_complete ])
     end
   end
 
   when_the_repository "has a cookbook with only an audit recipe" do
 
     before do
-      file 'config/client.rb', <<EOM
+      file "config/client.rb", <<EOM
 local_mode true
 cookbook_path "#{path_to('cookbooks')}"
 audit_mode :enabled
@@ -445,7 +444,7 @@ EOM
     end
 
     it "should exit with a zero code when there is not an audit failure" do
-      file 'cookbooks/audit_test/recipes/succeed.rb', <<-RECIPE
+      file "cookbooks/audit_test/recipes/succeed.rb", <<-RECIPE
 control_group "control group without top level control" do
   it "should succeed" do
     expect(2 - 2).to eq(0)
@@ -459,7 +458,7 @@ end
     end
 
     it "should exit with a non-zero code when there is an audit failure" do
-      file 'cookbooks/audit_test/recipes/fail.rb', <<-RECIPE
+      file "cookbooks/audit_test/recipes/fail.rb", <<-RECIPE
 control_group "control group without top level control" do
   it "should fail" do
     expect(2 - 2).to eq(1)
@@ -486,14 +485,14 @@ end
     let(:tmp_dir) { Dir.mktmpdir("recipe-url") }
 
     it "should complete with success when passed -z and --recipe-url" do
-      file 'config/client.rb', <<EOM
+      file "config/client.rb", <<EOM
 chef_repo_path "#{tmp_dir}"
 EOM
       result = shell_out("#{chef_client} -c \"#{path_to('config/client.rb')}\" --recipe-url=http://localhost:9000/recipes.tgz -o 'x::default' -z", :cwd => tmp_dir)
       result.error!
     end
 
-    it 'should fail when passed --recipe-url and not passed -z' do
+    it "should fail when passed --recipe-url and not passed -z" do
       result = shell_out("#{chef_client} --recipe-url=http://localhost:9000/recipes.tgz", :cwd => tmp_dir)
       expect(result.exitstatus).not_to eq(0)
     end