chef 12.0.3-x86-mingw32 → 12.1.0.rc.0-x86-mingw32

data/spec/spec_helper.rb

@@ -18,12 +18,6 @@
 # If you need to add anything in here, don't.
 # Add it to one of the files in spec/support
 
-# Configure this first so it doesn't trigger annoying warning when we use it.
-# Main rspec configuration comes later
-RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
-end
-
 # Abuse ruby's constant lookup to avoid undefined constant errors
 module Shell
   JUST_TESTING_MOVE_ALONG = true unless defined? JUST_TESTING_MOVE_ALONG
@@ -89,14 +83,27 @@ Dir["spec/support/**/*.rb"].
 
 OHAI_SYSTEM = Ohai::System.new
 OHAI_SYSTEM.all_plugins("platform")
-TEST_PLATFORM = OHAI_SYSTEM["platform"].dup.freeze
-TEST_PLATFORM_VERSION = OHAI_SYSTEM["platform_version"].dup.freeze
+
+TEST_PLATFORM =
+  (OHAI_SYSTEM['platform'] ||
+  'unknown_test_platform').dup.freeze
+TEST_PLATFORM_VERSION =
+  (OHAI_SYSTEM['platform_version'] ||
+  'unknown_platform_version').dup.freeze
 
 RSpec.configure do |config|
   config.include(Matchers)
   config.filter_run :focus => true
   config.filter_run_excluding :external => true
 
+  # Explicitly disable :should syntax
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+  config.mock_with :rspec do |c|
+    c.syntax = :expect
+  end
+
   # Only run these tests on platforms that are also chef workstations
   config.filter_run_excluding :workstation if solaris? or aix?
 
@@ -122,19 +129,19 @@ RSpec.configure do |config|
   config.filter_run_excluding :aix_only => true unless aix?
   config.filter_run_excluding :supports_cloexec => true unless supports_cloexec?
   config.filter_run_excluding :selinux_only => true unless selinux_enabled?
-  config.filter_run_excluding :ruby_18_only => true unless ruby_18?
-  config.filter_run_excluding :ruby_19_only => true unless ruby_19?
-  config.filter_run_excluding :ruby_gte_19_only => true unless ruby_gte_19?
   config.filter_run_excluding :ruby_20_only => true unless ruby_20?
-  config.filter_run_excluding :ruby_gte_20_only => true unless ruby_gte_20?
+  # chef_gte_XX_only and chef_lt_XX_only pair up correctly with the same XX
+  # number.  please conserve this pattern & resist filling out all the operators
+  config.filter_run_excluding :chef_gte_13_only => true unless chef_gte_13?
+  config.filter_run_excluding :chef_lt_13_only => true unless chef_lt_13?
   config.filter_run_excluding :requires_root => true unless root?
   config.filter_run_excluding :requires_root_or_running_windows => true unless (root? || windows?)
   config.filter_run_excluding :requires_unprivileged_user => true if root?
   config.filter_run_excluding :uses_diff => true unless has_diff?
-  config.filter_run_excluding :ruby_gte_20_and_openssl_gte_101 => true unless (ruby_gte_20? && openssl_gte_101?)
+  config.filter_run_excluding :openssl_gte_101 => true unless openssl_gte_101?
   config.filter_run_excluding :openssl_lt_101 => true unless openssl_lt_101?
-  config.filter_run_excluding :ruby_lt_20 => true unless ruby_lt_20?
   config.filter_run_excluding :aes_256_gcm_only => true unless aes_256_gcm?
+  config.filter_run_excluding :broken => true
 
   running_platform_arch = `uname -m`.strip
 
@@ -159,10 +166,15 @@ RSpec.configure do |config|
   }
 
   config.run_all_when_everything_filtered = true
-  config.treat_symbols_as_metadata_keys_with_true_values = true
 
   config.before(:each) do
     Chef::Config.reset
+
+    # By default, treat deprecation warnings as errors in tests.
+    Chef::Config.treat_deprecation_warnings_as_errors(true)
+
+    # Set environment variable so the setting persists in child processes
+    ENV['CHEF_TREAT_DEPRECATION_WARNINGS_AS_ERRORS'] = "1"
   end
 
   config.before(:suite) do

data/spec/stress/win32/file_spec.rb

@@ -24,14 +24,14 @@ describe 'Chef::ReservedNames::Win32::File', :windows_only do
     @path = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "data", "old_home_dir", "my-dot-emacs"))
   end
 
-  it "should not leak significant memory" do
+  it "should not leak significant memory", :volatile do
     test = lambda { Chef::ReservedNames::Win32::File.symlink?(@path) }
-    test.should_not leak_memory(:warmup => 50000, :iterations => 50000)
+    expect(test).not_to leak_memory(:warmup => 50000, :iterations => 50000)
   end
 
-  it "should not leak handles" do
+  it "should not leak handles", :volatile do
     test = lambda { Chef::ReservedNames::Win32::File.symlink?(@path) }
-    test.should_not leak_handles(:warmup => 50, :iterations => 100)
+    expect(test).not_to leak_handles(:warmup => 50, :iterations => 100)
   end
 
 end

data/spec/stress/win32/security_spec.rb

@@ -49,21 +49,21 @@ describe 'Chef::ReservedNames::Win32::Security', :windows_only do
   end
 
   it "should not leak when retrieving and reading the ACE from a file", :volatile do
-    lambda {
+    expect {
       sids = Chef::ReservedNames::Win32::Security::SecurableObject.new(@monkeyfoo).security_descriptor.dacl.select { |ace| ace.sid }
       GC.start
-    }.should_not leak_memory(:warmup => 50, :iterations => 100)
+    }.not_to leak_memory(:warmup => 50, :iterations => 100)
   end
 
   it "should not leak when creating a new ACL and setting it on a file", :volatile do
     securable_object = Security::SecurableObject.new(@monkeyfoo)
-    lambda {
+    expect {
       securable_object.dacl = Chef::ReservedNames::Win32::Security::ACL.create([
         Chef::ReservedNames::Win32::Security::ACE.access_allowed(Chef::ReservedNames::Win32::Security::SID.Everyone, Chef::ReservedNames::Win32::API::Security::GENERIC_READ),
         Chef::ReservedNames::Win32::Security::ACE.access_denied(Chef::ReservedNames::Win32::Security::SID.from_account("Users"), Chef::ReservedNames::Win32::API::Security::GENERIC_ALL)
       ])
       GC.start
-    }.should_not leak_memory(:warmup => 50, :iterations => 100)
+    }.not_to leak_memory(:warmup => 50, :iterations => 100)
   end
 
 end

data/spec/support/chef_helpers.rb

@@ -67,15 +67,15 @@ end
 # win32/service gem. windows_service_manager tests create a windows
 # service that starts with the system ruby and requires this gem.
 def system_windows_service_gem?
-  windows_service_gem_check_command = "ruby -e 'require \"win32/daemon\"' > /dev/null 2>&1"
+  windows_service_gem_check_command = %q{ruby -r "win32/daemon" -e ":noop"}
   if defined?(Bundler)
     Bundler.with_clean_env do
       # This returns true if the gem can be loaded
-      system windows_service_gem_check_command
+      system(windows_service_gem_check_command)
     end
   else
     # This returns true if the gem can be loaded
-    system windows_service_gem_check_command
+    system(windows_service_gem_check_command)
   end
 end
 

data/spec/support/matchers/leak.rb

@@ -26,11 +26,11 @@ module Matchers
       @variance = opts[:variance] || 5000
     end
 
-    def failure_message_for_should
+    def failure_message
       "expected final measure [#{@final_measure}] to be greater than or within +/- #{@variance} delta of initial measure [#{@initial_measure}]"
     end
 
-    def failure_message_for_should_not
+    def failure_message_when_negated
       "expected final measure [#{@final_measure}] to be less than or within +/- #{@variance} delta of initial measure [#{@initial_measure}]"
     end
 

data/spec/support/mock/platform.rb

@@ -6,7 +6,7 @@
 # testing code that mixes in platform specific modules like +Chef::Mixin::Securable+
 # or +Chef::FileAccessControl+
 def platform_mock(platform = :unix, &block)
-  Chef::Platform.stub(:windows?).and_return(platform == :windows ? true : false)
+  allow(Chef::Platform).to receive(:windows?).and_return(platform == :windows ? true : false)
   ENV['SYSTEMDRIVE'] = (platform == :windows ? 'C:' : nil)
 
   if platform == :windows

data/spec/support/pedant/Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem 'chef-pedant', :github => 'opscode/chef-pedant', :ref => "server-cli-option"

data/spec/support/pedant/pedant_config.rb

@@ -26,7 +26,7 @@
 
 # If you are doing development testing, you can specify the address of
 # the Solr server.  The presence of this parameter will enable tests
-# to force commits to Solr, greatly decreasing the amout of time
+# to force commits to Solr, greatly decreasing the amount of time
 # needed for testing the search endpoint.  This is only an
 # optimization for development!  If you are testing a "live" Chef
 # Server, or otherwise do not have access to the Solr server from your
@@ -36,7 +36,7 @@
 #search_server "http://localhost:8983"
 
 # Related to the 'search_server' parameter, this specifies the maximum
-# amout of time (in seconds) that search endpoint requests should be
+# amount of time (in seconds) that search endpoint requests should be
 # retried before giving up.  If not explicitly set, it will default to
 # 65 seconds; only set it if you know that your Solr commit interval
 # differs significantly from this.
@@ -72,6 +72,13 @@ superuser_name 'admin'
 superuser_key key
 webui_key key
 
+# When we updated Chef to RSpec 3 there were gem conflicts with chef-pedant.
+# We removed chef as a chef-pedant gem dependency in pedant.gemfile, but this
+# caused chef-pedant to fail because it could not query for the chef version
+# on the box pedant is running on. X-Chef-Version isn't needed in server
+# requests for these tests, so we've disabled it.
+ingore_x_chef_version true
+
 # Set the platform_class
 platform_class Pedant::OpenSourcePlatform
 

data/spec/support/pedant/run_pedant.rb

@@ -8,6 +8,7 @@ require 'chef/chef_fs/config'
 require 'tmpdir'
 require 'fileutils'
 require 'chef/version'
+require 'chef/mixin/shell_out'
 
 def start_server(chef_repo_path)
   Dir.mkdir(chef_repo_path) if !File.exists?(chef_repo_path)
@@ -37,28 +38,26 @@ begin
 
   # Capture setup data into master_chef_repo_path
   server = start_server(chef_repo_path)
+  so = nil
 
-  require 'pedant'
-  require 'pedant/opensource'
+  include Chef::Mixin::ShellOut
 
-  #Pedant::Config.rerun = true
+  Bundler.with_clean_env do
 
-  Pedant.config.suite = 'api'
-  Pedant.config[:config_file] = 'spec/support/pedant/pedant_config.rb'
-  Pedant.config.chef_server = server.url
-  Pedant.setup([
-    '--skip-knife',
-    '--skip-validation',
-    '--skip-authentication',
-    '--skip-authorization',
-    '--skip-omnibus'
-  ])
+    shell_out("bundle install --gemfile spec/support/pedant/Gemfile", :live_stream => STDOUT)
 
-  result = RSpec::Core::Runner.run(Pedant.config.rspec_args)
+    pedant_cmd = "chef-pedant " +
+        " --config spec/support/pedant/pedant_config.rb" +
+        " --server '#{server.url}'" +
+        " --skip-knife --skip-validation --skip-authentication" +
+        " --skip-authorization --skip-omnibus"
+    so = shell_out("bundle exec #{pedant_cmd}", :live_stream => STDOUT, :env => {'BUNDLE_GEMFILE' => 'spec/support/pedant/Gemfile'})
+
+  end
 
-  server.stop if server.running?
 ensure
+  server.stop if server && server.running?
   FileUtils.remove_entry_secure(tmpdir) if tmpdir
 end
 
-exit(result)
+exit(so.exitstatus)

data/spec/support/platform_helpers.rb

@@ -6,28 +6,24 @@ class ShellHelpers
   extend Chef::Mixin::ShellOut
 end
 
-def ruby_gte_20?
-  RUBY_VERSION.to_f >= 2.0
-end
-
 def ruby_lt_20?
   !ruby_gte_20?
 end
 
-def ruby_gte_19?
-  RUBY_VERSION.to_f >= 1.9
+def chef_gte_13?
+  Chef::VERSION.split('.').first.to_i >= 13
 end
 
-def ruby_20?
-  !!(RUBY_VERSION =~ /^2.0/)
+def chef_lt_13?
+  Chef::VERSION.split('.').first.to_i < 13
 end
 
-def ruby_19?
-  !!(RUBY_VERSION =~ /^1.9/)
+def ruby_gte_19?
+  RUBY_VERSION.to_f >= 1.9
 end
 
-def ruby_18?
-  !!(RUBY_VERSION =~ /^1.8/)
+def ruby_20?
+  !!(RUBY_VERSION =~ /^2.0/)
 end
 
 def windows?

data/spec/support/shared/functional/directory_resource.rb

@@ -25,7 +25,7 @@ shared_examples_for "a directory resource" do
   context "when the target directory does not exist" do
     before do
       # assert pre-condition
-      File.should_not exist(path)
+      expect(File).not_to exist(path)
     end
 
     describe "when running action :create" do
@@ -35,17 +35,17 @@ shared_examples_for "a directory resource" do
         end
 
         it "creates the directory when the :create action is run" do
-          File.should exist(path)
+          expect(File).to exist(path)
         end
 
         it "is marked updated by last action" do
-          resource.should be_updated_by_last_action
+          expect(resource).to be_updated_by_last_action
         end
       end
 
       context "and the recursive option is set" do
         before do
-          File.should_not exist(path)
+          expect(File).not_to exist(path)
 
           resource.recursive(true)
           @recursive_path = File.join(path, 'red-headed-stepchild')
@@ -54,12 +54,12 @@ shared_examples_for "a directory resource" do
         end
 
         it "recursively creates required directories" do
-          File.should exist(path)
-          File.should exist(@recursive_path)
+          expect(File).to exist(path)
+          expect(File).to exist(@recursive_path)
         end
 
         it "is marked updated by last action" do
-          resource.should be_updated_by_last_action
+          expect(resource).to be_updated_by_last_action
         end
       end
     end
@@ -97,7 +97,7 @@ shared_examples_for "a directory resource" do
       # so we run the resource twice--otherwise the updated_by_last_action test
       # will fail.
       resource.dup.run_action(:create)
-      File.should exist(path)
+      expect(File).to exist(path)
 
       resource.run_action(:create)
     end
@@ -108,11 +108,11 @@ shared_examples_for "a directory resource" do
       end
 
       it "does not re-create the directory" do
-        File.should exist(path)
+        expect(File).to exist(path)
       end
 
       it "is not marked updated by last action" do
-        resource.should_not be_updated_by_last_action
+        expect(resource).not_to be_updated_by_last_action
       end
     end
 
@@ -123,11 +123,11 @@ shared_examples_for "a directory resource" do
         end
 
         it "deletes the directory" do
-          File.should_not exist(path)
+          expect(File).not_to exist(path)
         end
 
         it "is marked as updated by last action" do
-          resource.should be_updated_by_last_action
+          expect(resource).to be_updated_by_last_action
         end
       end
 
@@ -139,7 +139,7 @@ shared_examples_for "a directory resource" do
         end
 
         it "recursively deletes directories" do
-          File.should_not exist(path)
+          expect(File).not_to exist(path)
         end
       end
     end

data/spec/support/shared/functional/file_resource.rb

@@ -48,10 +48,10 @@ end
 shared_examples_for "a file with the wrong content" do
   before do
     # Assert starting state is as expected
-    File.should exist(path)
+    expect(File).to exist(path)
     # Kinda weird, in this case @expected_checksum is the cksum of the file
     # with incorrect content.
-    sha256_checksum(path).should == @expected_checksum
+    expect(sha256_checksum(path)).to eq(@expected_checksum)
   end
 
   describe "when diff is disabled" do
@@ -65,20 +65,20 @@ shared_examples_for "a file with the wrong content" do
         end
 
         it "overwrites the file with the updated content when the :create action is run" do
-          File.stat(path).mtime.should > @expected_mtime
-          sha256_checksum(path).should_not == @expected_checksum
+          expect(File.stat(path).mtime).to be > @expected_mtime
+          expect(sha256_checksum(path)).not_to eq(@expected_checksum)
         end
 
         it "backs up the existing file" do
-          Dir.glob(backup_glob).size.should equal(1)
+          expect(Dir.glob(backup_glob).size).to equal(1)
         end
 
         it "is marked as updated by last action" do
-          resource.should be_updated_by_last_action
+          expect(resource).to be_updated_by_last_action
         end
 
         it "should restore the security contexts on selinux", :selinux_only do
-          selinux_security_context_restored?(path).should be_true
+          expect(selinux_security_context_restored?(path)).to be_truthy
         end
       end
 
@@ -89,11 +89,11 @@ shared_examples_for "a file with the wrong content" do
         end
 
         it "should not attempt to backup the existing file if :backup == 0" do
-          Dir.glob(backup_glob).size.should equal(0)
+          expect(Dir.glob(backup_glob).size).to equal(0)
         end
 
         it "should restore the security contexts on selinux", :selinux_only do
-          selinux_security_context_restored?(path).should be_true
+          expect(selinux_security_context_restored?(path)).to be_truthy
         end
       end
 
@@ -114,16 +114,16 @@ shared_examples_for "a file with the wrong content" do
       end
 
       it "doesn't overwrite the file when the :create_if_missing action is run" do
-        File.stat(path).mtime.should == @expected_mtime
-        sha256_checksum(path).should == @expected_checksum
+        expect(File.stat(path).mtime).to eq(@expected_mtime)
+        expect(sha256_checksum(path)).to eq(@expected_checksum)
       end
 
       it "is not marked as updated" do
-        resource.should_not be_updated_by_last_action
+        expect(resource).not_to be_updated_by_last_action
       end
 
       it "should restore the security contexts on selinux", :selinux_only do
-        selinux_security_context_restored?(path).should be_true
+        expect(selinux_security_context_restored?(path)).to be_truthy
       end
     end
 
@@ -133,11 +133,11 @@ shared_examples_for "a file with the wrong content" do
       end
 
       it "deletes the file" do
-        File.should_not exist(path)
+        expect(File).not_to exist(path)
       end
 
       it "is marked as updated by last action" do
-        resource.should be_updated_by_last_action
+        expect(resource).to be_updated_by_last_action
       end
     end
 
@@ -146,14 +146,14 @@ shared_examples_for "a file with the wrong content" do
   context "when diff is enabled" do
     describe 'sensitive attribute' do
       context "should be insensitive by default" do
-        it { expect(resource.sensitive).to(be_false) }
+        it { expect(resource.sensitive).to(be_falsey) }
       end
 
       context "when set" do
         before { resource.sensitive(true) }
 
         it "should be set on the resource" do
-          expect(resource.sensitive).to(be_true)
+          expect(resource.sensitive).to(be_truthy)
         end
 
         context "when running :create action" do
@@ -181,8 +181,8 @@ end
 shared_examples_for "a file with the correct content" do
   before do
     # Assert starting state is as expected
-    File.should exist(path)
-    sha256_checksum(path).should == @expected_checksum
+    expect(File).to exist(path)
+    expect(sha256_checksum(path)).to eq(@expected_checksum)
   end
 
   include_context "diff disabled"
@@ -192,19 +192,19 @@ shared_examples_for "a file with the correct content" do
       resource.run_action(:create)
     end
     it "does not overwrite the original when the :create action is run" do
-      sha256_checksum(path).should == @expected_checksum
+      expect(sha256_checksum(path)).to eq(@expected_checksum)
     end
 
     it "does not update the mtime of the file when the :create action is run" do
-      File.stat(path).mtime.should == @expected_mtime
+      expect(File.stat(path).mtime).to eq(@expected_mtime)
     end
 
     it "is not marked as updated by last action" do
-      resource.should_not be_updated_by_last_action
+      expect(resource).not_to be_updated_by_last_action
     end
 
     it "should restore the security contexts on selinux", :selinux_only do
-      selinux_security_context_restored?(path).should be_true
+      expect(selinux_security_context_restored?(path)).to be_truthy
     end
   end
 
@@ -214,15 +214,15 @@ shared_examples_for "a file with the correct content" do
     end
 
     it "doesn't overwrite the file when the :create_if_missing action is run" do
-      sha256_checksum(path).should == @expected_checksum
+      expect(sha256_checksum(path)).to eq(@expected_checksum)
     end
 
     it "is not marked as updated by last action" do
-      resource.should_not be_updated_by_last_action
+      expect(resource).not_to be_updated_by_last_action
     end
 
     it "should restore the security contexts on selinux", :selinux_only do
-      selinux_security_context_restored?(path).should be_true
+      expect(selinux_security_context_restored?(path)).to be_truthy
     end
   end
 
@@ -232,11 +232,11 @@ shared_examples_for "a file with the correct content" do
     end
 
     it "deletes the file when the :delete action is run" do
-      File.should_not exist(path)
+      expect(File).not_to exist(path)
     end
 
     it "is marked as updated by last action" do
-      resource.should be_updated_by_last_action
+      expect(resource).to be_updated_by_last_action
     end
   end
 end
@@ -300,7 +300,7 @@ shared_examples_for "a file resource" do
 
       it "successfully doesn't create the file" do
         resource.run_action(:create) # should not raise
-        File.should_not exist(path)
+        expect(File).not_to exist(path)
       end
     end
 
@@ -308,14 +308,14 @@ shared_examples_for "a file resource" do
 
   describe "when setting atomic_update" do
     it "booleans should work" do
-      lambda {resource.atomic_update(true)}.should_not raise_error
-      lambda {resource.atomic_update(false)}.should_not raise_error
+      expect {resource.atomic_update(true)}.not_to raise_error
+      expect {resource.atomic_update(false)}.not_to raise_error
     end
 
     it "anything else should raise an error" do
-      lambda {resource.atomic_update(:copy)}.should raise_error(ArgumentError)
-      lambda {resource.atomic_update(:move)}.should raise_error(ArgumentError)
-      lambda {resource.atomic_update(958)}.should raise_error(ArgumentError)
+      expect {resource.atomic_update(:copy)}.to raise_error(ArgumentError)
+      expect {resource.atomic_update(:move)}.to raise_error(ArgumentError)
+      expect {resource.atomic_update(958)}.to raise_error(ArgumentError)
     end
   end
 
@@ -340,24 +340,24 @@ shared_examples_for "file resource not pointing to a real file" do
 
   describe "when force_unlink is set to true" do
     it ":create unlinks the target" do
-      real_file?(path).should be_false
+      expect(real_file?(path)).to be_falsey
       resource.force_unlink(true)
       resource.run_action(:create)
-      real_file?(path).should be_true
-      binread(path).should == expected_content
-      resource.should be_updated_by_last_action
+      expect(real_file?(path)).to be_truthy
+      expect(binread(path)).to eq(expected_content)
+      expect(resource).to be_updated_by_last_action
     end
   end
 
   describe "when force_unlink is set to false" do
     it ":create raises an error" do
-      lambda {resource.run_action(:create) }.should raise_error(Chef::Exceptions::FileTypeMismatch)
+      expect {resource.run_action(:create) }.to raise_error(Chef::Exceptions::FileTypeMismatch)
     end
   end
 
   describe "when force_unlink is not set (default)" do
     it ":create raises an error" do
-      lambda {resource.run_action(:create) }.should raise_error(Chef::Exceptions::FileTypeMismatch)
+      expect {resource.run_action(:create) }.to raise_error(Chef::Exceptions::FileTypeMismatch)
     end
   end
 end
@@ -441,7 +441,7 @@ shared_examples_for "a configured file resource" do
 
         after(:each) do
           # symlink should never be followed
-          binread(symlink_target).should == "This is so wrong!!!"
+          expect(binread(symlink_target)).to eq("This is so wrong!!!")
         end
 
         it_behaves_like "file resource not pointing to a real file"
@@ -477,7 +477,7 @@ shared_examples_for "a configured file resource" do
         end
 
         it "raises an InvalidSymlink error" do
-          lambda { resource.run_action(:create) }.should raise_error(Chef::Exceptions::InvalidSymlink)
+          expect { resource.run_action(:create) }.to raise_error(Chef::Exceptions::InvalidSymlink)
         end
 
         it "issues a warning/assumption in whyrun mode" do
@@ -505,7 +505,7 @@ shared_examples_for "a configured file resource" do
           FileUtils.rm_rf(link_path)
         end
         it "raises an InvalidSymlink error" do
-          lambda { resource.run_action(:create) }.should raise_error(Chef::Exceptions::InvalidSymlink)
+          expect { resource.run_action(:create) }.to raise_error(Chef::Exceptions::InvalidSymlink)
         end
 
         it "issues a warning/assumption in whyrun mode" do
@@ -536,7 +536,7 @@ shared_examples_for "a configured file resource" do
         end
 
         it "raises an InvalidSymlink error" do
-          lambda { resource.run_action(:create) }.should raise_error(Chef::Exceptions::FileTypeMismatch)
+          expect { resource.run_action(:create) }.to raise_error(Chef::Exceptions::FileTypeMismatch)
         end
 
         it "issues a warning/assumption in whyrun mode" do
@@ -564,7 +564,7 @@ shared_examples_for "a configured file resource" do
         after(:each) do
           # shared examples should not change our test setup of a file resource
           # pointing at a symlink:
-          resource.path.should == link_path
+          expect(resource.path).to eq(link_path)
           FileUtils.rm_rf(link_path)
         end
 
@@ -581,7 +581,7 @@ shared_examples_for "a configured file resource" do
 
           it "does not replace the symlink with a real file" do
             resource.run_action(:create)
-            File.should be_symlink(link_path)
+            expect(File).to be_symlink(link_path)
           end
 
         end
@@ -593,17 +593,17 @@ shared_examples_for "a configured file resource" do
           end
 
           it "updates the source file content" do
-            pending
+            skip
           end
 
           it "marks the resource as updated" do
             resource.run_action(:create)
-            resource.should be_updated_by_last_action
+            expect(resource).to be_updated_by_last_action
           end
 
           it "does not replace the symlink with a real file" do
             resource.run_action(:create)
-            File.should be_symlink(link_path)
+            expect(File).to be_symlink(link_path)
           end
         end
 
@@ -646,15 +646,15 @@ shared_examples_for "a configured file resource" do
         after(:each) do
           # shared examples should not change our test setup of a file resource
           # pointing at a symlink:
-          resource.path.should == link_to_link_path
+          expect(resource.path).to eq(link_to_link_path)
           FileUtils.rm_rf(link_to_file_path)
           FileUtils.rm_rf(link_to_link_path)
         end
 
         it "does not replace the symlink with a real file" do
           resource.run_action(:create)
-          File.should be_symlink(link_to_link_path)
-          File.should be_symlink(link_to_file_path)
+          expect(File).to be_symlink(link_to_link_path)
+          expect(File).to be_symlink(link_to_file_path)
         end
 
       end
@@ -686,9 +686,9 @@ shared_examples_for "a configured file resource" do
       it ":create updates the target" do
         resource.force_unlink(true)
         resource.run_action(:create)
-        real_file?(path).should be_true
-        binread(path).should == expected_content
-        resource.should be_updated_by_last_action
+        expect(real_file?(path)).to be_truthy
+        expect(binread(path)).to eq(expected_content)
+        expect(resource).to be_updated_by_last_action
       end
     end
 
@@ -696,9 +696,9 @@ shared_examples_for "a configured file resource" do
       it ":create updates the target" do
         resource.force_unlink(true)
         resource.run_action(:create)
-        real_file?(path).should be_true
-        binread(path).should == expected_content
-        resource.should be_updated_by_last_action
+        expect(real_file?(path)).to be_truthy
+        expect(binread(path)).to eq(expected_content)
+        expect(resource).to be_updated_by_last_action
       end
     end
 
@@ -706,9 +706,9 @@ shared_examples_for "a configured file resource" do
       it ":create updates the target" do
         resource.force_unlink(true)
         resource.run_action(:create)
-        real_file?(path).should be_true
-        binread(path).should == expected_content
-        resource.should be_updated_by_last_action
+        expect(real_file?(path)).to be_truthy
+        expect(binread(path)).to eq(expected_content)
+        expect(resource).to be_updated_by_last_action
       end
     end
   end
@@ -800,7 +800,7 @@ shared_examples_for "a configured file resource" do
     end
 
     before(:each) do
-      path.bytesize.should <= 104
+      expect(path.bytesize).to be <= 104
       UNIXServer.new(path)
     end
 
@@ -813,7 +813,7 @@ shared_examples_for "a configured file resource" do
 
   # Regression test for http://tickets.opscode.com/browse/CHEF-4082
   context "when notification is configured" do
-    describe "when path is specified with normal seperator" do
+    describe "when path is specified with normal separator" do
       before do
         @notified_resource = Chef::Resource.new("punk", resource.run_context)
         resource.notifies(:run, @notified_resource, :immediately)
@@ -821,12 +821,12 @@ shared_examples_for "a configured file resource" do
       end
 
       it "should notify the other resources correctly" do
-        resource.should be_updated_by_last_action
-        resource.run_context.immediate_notifications(resource).length.should == 1
+        expect(resource).to be_updated_by_last_action
+        expect(resource.run_context.immediate_notifications(resource).length).to eq(1)
       end
     end
 
-    describe "when path is specified with windows seperator", :windows_only do
+    describe "when path is specified with windows separator", :windows_only do
       let(:path) {
         File.join(test_file_dir, make_tmpname(file_base)).gsub(::File::SEPARATOR, ::File::ALT_SEPARATOR)
       }
@@ -838,8 +838,8 @@ shared_examples_for "a configured file resource" do
       end
 
       it "should notify the other resources correctly" do
-        resource.should be_updated_by_last_action
-        resource.run_context.immediate_notifications(resource).length.should == 1
+        expect(resource).to be_updated_by_last_action
+        expect(resource.run_context.immediate_notifications(resource).length).to eq(1)
       end
     end
   end
@@ -847,7 +847,7 @@ shared_examples_for "a configured file resource" do
   context "when the target file does not exist" do
     before do
       # Assert starting state is expected
-      File.should_not exist(path)
+      expect(File).not_to exist(path)
     end
 
     describe "when running action :create" do
@@ -856,19 +856,19 @@ shared_examples_for "a configured file resource" do
       end
 
       it "creates the file when the :create action is run" do
-        File.should exist(path)
+        expect(File).to exist(path)
       end
 
       it "creates the file with the correct content when the :create action is run" do
-        binread(path).should == expected_content
+        expect(binread(path)).to eq(expected_content)
       end
 
       it "is marked as updated by last action" do
-        resource.should be_updated_by_last_action
+        expect(resource).to be_updated_by_last_action
       end
 
       it "should restore the security contexts on selinux", :selinux_only do
-        selinux_security_context_restored?(path).should be_true
+        expect(selinux_security_context_restored?(path)).to be_truthy
       end
     end
 
@@ -878,15 +878,15 @@ shared_examples_for "a configured file resource" do
       end
 
       it "creates the file with the correct content" do
-        binread(path).should == expected_content
+        expect(binread(path)).to eq(expected_content)
       end
 
       it "is marked as updated by last action" do
-        resource.should be_updated_by_last_action
+        expect(resource).to be_updated_by_last_action
       end
 
       it "should restore the security contexts on selinux", :selinux_only do
-        selinux_security_context_restored?(path).should be_true
+        expect(selinux_security_context_restored?(path)).to be_truthy
       end
     end
 
@@ -896,11 +896,11 @@ shared_examples_for "a configured file resource" do
       end
 
       it "deletes the file when the :delete action is run" do
-        File.should_not exist(path)
+        expect(File).not_to exist(path)
       end
 
       it "is not marked updated by last action" do
-        resource.should_not be_updated_by_last_action
+        expect(resource).not_to be_updated_by_last_action
       end
     end
   end
@@ -1001,21 +1001,21 @@ shared_examples_for "a configured file resource" do
     describe ":create action should run without any updates" do
       before do
         # Assert starting state is as expected
-        File.should exist(path)
-        sha256_checksum(path).should == @expected_checksum
+        expect(File).to exist(path)
+        expect(sha256_checksum(path)).to eq(@expected_checksum)
         resource.run_action(:create)
       end
 
       it "does not overwrite the original when the :create action is run" do
-        sha256_checksum(path).should == @expected_checksum
+        expect(sha256_checksum(path)).to eq(@expected_checksum)
       end
 
       it "does not update the mtime of the file when the :create action is run" do
-        File.stat(path).mtime.should == @expected_mtime
+        expect(File.stat(path).mtime).to eq(@expected_mtime)
       end
 
       it "is not marked as updated by last action" do
-        resource.should_not be_updated_by_last_action
+        expect(resource).not_to be_updated_by_last_action
       end
     end
   end