chef 12.0.0.alpha.2-x86-mingw32 → 12.0.0.rc.0-x86-mingw32

data/spec/unit/provider/deploy/revision_spec.rb

@@ -21,6 +21,7 @@ require 'spec_helper'
 describe Chef::Provider::Deploy::Revision do
 
   before do
+    allow(Chef::Platform).to receive(:windows?) { false }
     @temp_dir = Dir.mktmpdir
     Chef::Config[:file_cache_path] = @temp_dir
     @resource = Chef::Resource::Deploy.new("/my/deploy/dir")
@@ -31,7 +32,7 @@ describe Chef::Provider::Deploy::Revision do
     @provider = Chef::Provider::Deploy::Revision.new(@resource, @run_context)
     @provider.load_current_resource
     @runner = double("runnah")
-    Chef::Runner.stub(:new).and_return(@runner)
+    allow(Chef::Runner).to receive(:new).and_return(@runner)
     @expected_release_dir = "/my/deploy/dir/releases/8a3195bf3efa246f743c5dfa83683201880f935c"
   end
 
@@ -42,41 +43,41 @@ describe Chef::Provider::Deploy::Revision do
 
 
   it "uses the resolved revision from the SCM as the release slug" do
-    @provider.scm_provider.stub(:revision_slug).and_return("uglySlugly")
-    @provider.send(:release_slug).should == "uglySlugly"
+    allow(@provider.scm_provider).to receive(:revision_slug).and_return("uglySlugly")
+    expect(@provider.send(:release_slug)).to eq("uglySlugly")
   end
 
   it "deploys to a dir named after the revision" do
-    @provider.release_path.should == @expected_release_dir
+    expect(@provider.release_path).to eq(@expected_release_dir)
   end
 
   it "stores the release dir in the file cache in the cleanup step" do
-    FileUtils.stub(:mkdir_p)
-    FileUtils.stub(:cp_r)
+    allow(FileUtils).to receive(:mkdir_p)
+    allow(FileUtils).to receive(:cp_r)
     @provider.cleanup!
-    @provider.stub(:release_slug).and_return("73219b87e977d9c7ba1aa57e9ad1d88fa91a0ec2")
+    allow(@provider).to receive(:release_slug).and_return("73219b87e977d9c7ba1aa57e9ad1d88fa91a0ec2")
     @provider.load_current_resource
     @provider.cleanup!
     second_release = "/my/deploy/dir/releases/73219b87e977d9c7ba1aa57e9ad1d88fa91a0ec2"
 
-    @provider.all_releases.should == [@expected_release_dir,second_release]
+    expect(@provider.all_releases).to eq([@expected_release_dir,second_release])
   end
 
   it "removes a release from the file cache when it's used again in another release and append it to the end" do
-    FileUtils.stub(:mkdir_p)
-    FileUtils.stub(:cp_r)
+    allow(FileUtils).to receive(:mkdir_p)
+    allow(FileUtils).to receive(:cp_r)
     @provider.cleanup!
-    @provider.stub(:release_slug).and_return("73219b87e977d9c7ba1aa57e9ad1d88fa91a0ec2")
+    allow(@provider).to receive(:release_slug).and_return("73219b87e977d9c7ba1aa57e9ad1d88fa91a0ec2")
     @provider.load_current_resource
     @provider.cleanup!
     second_release = "/my/deploy/dir/releases/73219b87e977d9c7ba1aa57e9ad1d88fa91a0ec2"
-    @provider.all_releases.should == [@expected_release_dir,second_release]
+    expect(@provider.all_releases).to eq([@expected_release_dir,second_release])
     @provider.cleanup!
 
-    @provider.stub(:release_slug).and_return("8a3195bf3efa246f743c5dfa83683201880f935c")
+    allow(@provider).to receive(:release_slug).and_return("8a3195bf3efa246f743c5dfa83683201880f935c")
     @provider.load_current_resource
     @provider.cleanup!
-    @provider.all_releases.should == [second_release, @expected_release_dir]
+    expect(@provider.all_releases).to eq([second_release, @expected_release_dir])
   end
 
   it "removes a release from the file cache when it's deleted by :cleanup!" do
@@ -86,25 +87,25 @@ describe Chef::Provider::Deploy::Revision do
     release_paths.each do |release_path|
       @provider.send(:release_created, release_path)
     end
-    @provider.all_releases.should == release_paths
+    expect(@provider.all_releases).to eq(release_paths)
 
-    FileUtils.stub(:rm_rf)
+    allow(FileUtils).to receive(:rm_rf)
     @provider.cleanup!
 
     expected_release_paths = (%w{second third fourth fifth} << @resource.revision).map do |release_name|
        "/my/deploy/dir/releases/#{release_name}"
     end
 
-    @provider.all_releases.should == expected_release_paths
+    expect(@provider.all_releases).to eq(expected_release_paths)
   end
 
   it "regenerates the file cache if it's not available" do
     oldest = "/my/deploy/dir/releases/oldest"
     latest = "/my/deploy/dir/releases/latest"
-    Dir.should_receive(:glob).with("/my/deploy/dir/releases/*").and_return([latest, oldest])
-    ::File.should_receive(:ctime).with(oldest).and_return(Time.now - 10)
-    ::File.should_receive(:ctime).with(latest).and_return(Time.now - 1)
-    @provider.all_releases.should == [oldest, latest]
+    expect(Dir).to receive(:glob).with("/my/deploy/dir/releases/*").and_return([latest, oldest])
+    expect(::File).to receive(:ctime).with(oldest).and_return(Time.now - 10)
+    expect(::File).to receive(:ctime).with(latest).and_return(Time.now - 1)
+    expect(@provider.all_releases).to eq([oldest, latest])
   end
 
 end

data/spec/unit/provider/deploy/timestamped_spec.rb

@@ -22,7 +22,7 @@ describe Chef::Provider::Deploy::Timestamped do
 
   before do
     @release_time = Time.utc( 2004, 8, 15, 16, 23, 42)
-    Time.stub(:now).and_return(@release_time)
+    allow(Time).to receive(:now).and_return(@release_time)
     @expected_release_dir = "/my/deploy/dir/releases/20040815162342"
     @resource = Chef::Resource::Deploy.new("/my/deploy/dir")
     @node = Chef::Node.new
@@ -30,11 +30,11 @@ describe Chef::Provider::Deploy::Timestamped do
     @run_context = Chef::RunContext.new(@node, {}, @events)
     @timestamped_deploy = Chef::Provider::Deploy::Timestamped.new(@resource, @run_context)
     @runner = double("runnah")
-    Chef::Runner.stub(:new).and_return(@runner)
+    allow(Chef::Runner).to receive(:new).and_return(@runner)
   end
 
   it "gives a timestamp for release_slug" do
-    @timestamped_deploy.send(:release_slug).should == "20040815162342"
+    expect(@timestamped_deploy.send(:release_slug)).to eq("20040815162342")
   end
 
 end

data/spec/unit/provider/deploy_spec.rb

@@ -21,204 +21,205 @@ require 'spec_helper'
 describe Chef::Provider::Deploy do
 
   before do
+    allow(Chef::Platform).to receive(:windows?) { false }
     @release_time = Time.utc( 2004, 8, 15, 16, 23, 42)
-    Time.stub(:now).and_return(@release_time)
+    allow(Time).to receive(:now).and_return(@release_time)
     @expected_release_dir = "/my/deploy/dir/releases/20040815162342"
     @resource = Chef::Resource::Deploy.new("/my/deploy/dir")
     @node = Chef::Node.new
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)
     @provider = Chef::Provider::Deploy.new(@resource, @run_context)
-    @provider.stub(:release_slug)
-    @provider.stub(:release_path).and_return(@expected_release_dir)
+    allow(@provider).to receive(:release_slug)
+    allow(@provider).to receive(:release_path).and_return(@expected_release_dir)
   end
 
   it "loads scm resource" do
-    @provider.scm_provider.should_receive(:load_current_resource)
+    expect(@provider.scm_provider).to receive(:load_current_resource)
     @provider.load_current_resource
   end
 
   it "supports :deploy and :rollback actions" do
-    @provider.should respond_to(:action_deploy)
-    @provider.should respond_to(:action_rollback)
+    expect(@provider).to respond_to(:action_deploy)
+    expect(@provider).to respond_to(:action_rollback)
   end
 
   context "when the deploy resource has a timeout attribute" do
     let(:ten_seconds) { 10 }
     before { @resource.timeout(ten_seconds) }
     it "relays the timeout to the scm resource" do
-      @provider.scm_provider.new_resource.timeout.should == ten_seconds
+      expect(@provider.scm_provider.new_resource.timeout).to eq(ten_seconds)
     end
   end
 
   context "when the deploy resource has no timeout attribute" do
     it "should not set a timeout on the scm resource" do
-      @provider.scm_provider.new_resource.timeout.should be_nil
+      expect(@provider.scm_provider.new_resource.timeout).to be_nil
     end
   end
 
   context "when the deploy_to dir does not exist yet" do
     before do
-      FileUtils.should_receive(:mkdir_p).with(@resource.deploy_to).ordered
-      FileUtils.should_receive(:mkdir_p).with(@resource.shared_path).ordered
-      ::File.stub(:directory?).and_return(false)
-      @provider.stub(:symlink)
-      @provider.stub(:migrate)
-      @provider.stub(:copy_cached_repo)
+      expect(FileUtils).to receive(:mkdir_p).with(@resource.deploy_to).ordered
+      expect(FileUtils).to receive(:mkdir_p).with(@resource.shared_path).ordered
+      allow(::File).to receive(:directory?).and_return(false)
+      allow(@provider).to receive(:symlink)
+      allow(@provider).to receive(:migrate)
+      allow(@provider).to receive(:copy_cached_repo)
     end
 
     it "creates deploy_to dir" do
-      ::Dir.should_receive(:chdir).with(@expected_release_dir).exactly(4).times
-      @provider.should_receive(:enforce_ownership).twice
-      @provider.stub(:update_cached_repo)
+      expect(::Dir).to receive(:chdir).with(@expected_release_dir).exactly(4).times
+      expect(@provider).to receive(:enforce_ownership).twice
+      allow(@provider).to receive(:update_cached_repo)
       @provider.deploy
     end
 
   end
 
   it "does not create deploy_to dir if it exists" do
-    ::File.stub(:directory?).and_return(true)
-    ::Dir.should_receive(:chdir).with(@expected_release_dir).exactly(4).times
-    FileUtils.should_not_receive(:mkdir_p).with(@resource.deploy_to)
-    FileUtils.should_not_receive(:mkdir_p).with(@resource.shared_path)
-    @provider.should_receive(:enforce_ownership).twice
-    @provider.stub(:copy_cached_repo)
-    @provider.stub(:update_cached_repo)
-    @provider.stub(:symlink)
-    @provider.stub(:migrate)
+    allow(::File).to receive(:directory?).and_return(true)
+    expect(::Dir).to receive(:chdir).with(@expected_release_dir).exactly(4).times
+    expect(FileUtils).not_to receive(:mkdir_p).with(@resource.deploy_to)
+    expect(FileUtils).not_to receive(:mkdir_p).with(@resource.shared_path)
+    expect(@provider).to receive(:enforce_ownership).twice
+    allow(@provider).to receive(:copy_cached_repo)
+    allow(@provider).to receive(:update_cached_repo)
+    allow(@provider).to receive(:symlink)
+    allow(@provider).to receive(:migrate)
     @provider.deploy
   end
 
   it "ensures the deploy_to dir ownership after the verfication that it exists" do
-    ::Dir.should_receive(:chdir).with(@expected_release_dir).exactly(4).times
-    @provider.should_receive(:verify_directories_exist).ordered
-    @provider.should_receive(:enforce_ownership).ordered
-    @provider.stub(:copy_cached_repo)
-    @provider.stub(:update_cached_repo)
-    @provider.stub(:install_gems)
-    @provider.should_receive(:enforce_ownership).ordered
-    @provider.stub(:enforce_ownership)
-    @provider.stub(:symlink)
-    @provider.stub(:migrate)
+    expect(::Dir).to receive(:chdir).with(@expected_release_dir).exactly(4).times
+    expect(@provider).to receive(:verify_directories_exist).ordered
+    expect(@provider).to receive(:enforce_ownership).ordered
+    allow(@provider).to receive(:copy_cached_repo)
+    allow(@provider).to receive(:update_cached_repo)
+    allow(@provider).to receive(:install_gems)
+    expect(@provider).to receive(:enforce_ownership).ordered
+    allow(@provider).to receive(:enforce_ownership)
+    allow(@provider).to receive(:symlink)
+    allow(@provider).to receive(:migrate)
     @provider.deploy
   end
 
   it "updates and copies the repo, then does a migrate, symlink, restart, restart, cleanup on deploy" do
-    FileUtils.stub(:mkdir_p).with("/my/deploy/dir")
-    FileUtils.stub(:mkdir_p).with("/my/deploy/dir/shared")
-    @provider.should_receive(:enforce_ownership).twice
-    @provider.should_receive(:update_cached_repo)
-    @provider.should_receive(:copy_cached_repo)
-    @provider.should_receive(:install_gems)
-    @provider.should_receive(:callback).with(:before_migrate, nil)
-    @provider.should_receive(:migrate)
-    @provider.should_receive(:callback).with(:before_symlink, nil)
-    @provider.should_receive(:symlink)
-    @provider.should_receive(:callback).with(:before_restart, nil)
-    @provider.should_receive(:restart)
-    @provider.should_receive(:callback).with(:after_restart, nil)
-    @provider.should_receive(:cleanup!)
+    allow(FileUtils).to receive(:mkdir_p).with("/my/deploy/dir")
+    allow(FileUtils).to receive(:mkdir_p).with("/my/deploy/dir/shared")
+    expect(@provider).to receive(:enforce_ownership).twice
+    expect(@provider).to receive(:update_cached_repo)
+    expect(@provider).to receive(:copy_cached_repo)
+    expect(@provider).to receive(:install_gems)
+    expect(@provider).to receive(:callback).with(:before_migrate, nil)
+    expect(@provider).to receive(:migrate)
+    expect(@provider).to receive(:callback).with(:before_symlink, nil)
+    expect(@provider).to receive(:symlink)
+    expect(@provider).to receive(:callback).with(:before_restart, nil)
+    expect(@provider).to receive(:restart)
+    expect(@provider).to receive(:callback).with(:after_restart, nil)
+    expect(@provider).to receive(:cleanup!)
     @provider.deploy
   end
 
   it "should not deploy if there is already a deploy at release_path, and it is the current release" do
-    @provider.stub(:all_releases).and_return([@expected_release_dir])
-    @provider.stub(:current_release?).with(@expected_release_dir).and_return(true)
-    @provider.should_not_receive(:deploy)
+    allow(@provider).to receive(:all_releases).and_return([@expected_release_dir])
+    allow(@provider).to receive(:current_release?).with(@expected_release_dir).and_return(true)
+    expect(@provider).not_to receive(:deploy)
     @provider.run_action(:deploy)
   end
 
   it "should call action_rollback if there is already a deploy of this revision at release_path, and it is not the current release" do
-    @provider.stub(:all_releases).and_return([@expected_release_dir, "102021"])
-    @provider.stub(:current_release?).with(@expected_release_dir).and_return(false)
-    @provider.should_receive(:rollback_to).with(@expected_release_dir)
-    @provider.should_receive(:current_release?)
+    allow(@provider).to receive(:all_releases).and_return([@expected_release_dir, "102021"])
+    allow(@provider).to receive(:current_release?).with(@expected_release_dir).and_return(false)
+    expect(@provider).to receive(:rollback_to).with(@expected_release_dir)
+    expect(@provider).to receive(:current_release?)
     @provider.run_action(:deploy)
   end
 
   it "calls deploy when deploying a new release" do
-    @provider.stub(:all_releases).and_return([])
-    @provider.should_receive(:deploy)
+    allow(@provider).to receive(:all_releases).and_return([])
+    expect(@provider).to receive(:deploy)
     @provider.run_action(:deploy)
   end
 
   it "runs action svn_force_export when new_resource.svn_force_export is true" do
     @resource.svn_force_export true
-    @provider.scm_provider.should_receive(:run_action).with(:force_export)
+    expect(@provider.scm_provider).to receive(:run_action).with(:force_export)
     @provider.update_cached_repo
   end
 
   it "Removes the old release before deploying when force deploying over it" do
-    @provider.stub(:all_releases).and_return([@expected_release_dir])
-    FileUtils.should_receive(:rm_rf).with(@expected_release_dir)
-    @provider.should_receive(:deploy)
+    allow(@provider).to receive(:all_releases).and_return([@expected_release_dir])
+    expect(FileUtils).to receive(:rm_rf).with(@expected_release_dir)
+    expect(@provider).to receive(:deploy)
     @provider.run_action(:force_deploy)
   end
 
   it "deploys as normal when force deploying and there's no prior release at the same path" do
-    @provider.stub(:all_releases).and_return([])
-    @provider.should_receive(:deploy)
+    allow(@provider).to receive(:all_releases).and_return([])
+    expect(@provider).to receive(:deploy)
     @provider.run_action(:force_deploy)
   end
 
   it "dont care by default if error happens on deploy" do
-    @provider.stub(:all_releases).and_return(['previous_release'])
-    @provider.stub(:deploy).and_return{ raise "Unexpected error" }
-    @provider.stub(:previous_release_path).and_return('previous_release')
-    @provider.should_not_receive(:rollback)
-    lambda {
+    allow(@provider).to receive(:all_releases).and_return(['previous_release'])
+    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 {
       @provider.run_action(:deploy)
-    }.should raise_exception(RuntimeError, "Unexpected error")
+    }.to raise_exception(RuntimeError, "Unexpected error")
   end
 
   it "rollbacks to previous release if error happens on deploy" do
     @resource.rollback_on_error true
-    @provider.stub(:all_releases).and_return(['previous_release'])
-    @provider.stub(:deploy).and_return{ raise "Unexpected error" }
-    @provider.stub(:previous_release_path).and_return('previous_release')
-    @provider.should_receive(:rollback)
-    lambda {
+    allow(@provider).to receive(:all_releases).and_return(['previous_release'])
+    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 {
       @provider.run_action(:deploy)
-    }.should raise_exception(RuntimeError, "Unexpected error")
+    }.to raise_exception(RuntimeError, "Unexpected error")
   end
 
   describe "on systems without broken Dir.glob results" do
     it "sets the release path to the penultimate release when one is not specified, symlinks, and rm's the last release on rollback" do
-      @provider.stub(:release_path).and_return("/my/deploy/dir/releases/3")
+      allow(@provider).to receive(:release_path).and_return("/my/deploy/dir/releases/3")
       all_releases = ["/my/deploy/dir/releases/1", "/my/deploy/dir/releases/2", "/my/deploy/dir/releases/3", "/my/deploy/dir/releases/4", "/my/deploy/dir/releases/5"]
-      Dir.stub(:glob).with("/my/deploy/dir/releases/*").and_return(all_releases)
-      @provider.should_receive(:symlink)
-      FileUtils.should_receive(:rm_rf).with("/my/deploy/dir/releases/4")
-      FileUtils.should_receive(:rm_rf).with("/my/deploy/dir/releases/5")
+      allow(Dir).to receive(:glob).with("/my/deploy/dir/releases/*").and_return(all_releases)
+      expect(@provider).to receive(:symlink)
+      expect(FileUtils).to receive(:rm_rf).with("/my/deploy/dir/releases/4")
+      expect(FileUtils).to receive(:rm_rf).with("/my/deploy/dir/releases/5")
       @provider.run_action(:rollback)
-      @provider.release_path.should eql("/my/deploy/dir/releases/3")
-      @provider.shared_path.should eql("/my/deploy/dir/shared")
+      expect(@provider.release_path).to eql("/my/deploy/dir/releases/3")
+      expect(@provider.shared_path).to eql("/my/deploy/dir/shared")
     end
 
     it "sets the release path to the specified release, symlinks, and rm's any newer releases on rollback" do
-      @provider.unstub(:release_path)
+      allow(@provider).to receive(:release_path).and_call_original
       all_releases = ["/my/deploy/dir/releases/20040815162342", "/my/deploy/dir/releases/20040700000000",
                       "/my/deploy/dir/releases/20040600000000", "/my/deploy/dir/releases/20040500000000"].sort!
-      Dir.stub(:glob).with("/my/deploy/dir/releases/*").and_return(all_releases)
-      @provider.should_receive(:symlink)
-      FileUtils.should_receive(:rm_rf).with("/my/deploy/dir/releases/20040815162342")
+      allow(Dir).to receive(:glob).with("/my/deploy/dir/releases/*").and_return(all_releases)
+      expect(@provider).to receive(:symlink)
+      expect(FileUtils).to receive(:rm_rf).with("/my/deploy/dir/releases/20040815162342")
       @provider.run_action(:rollback)
-      @provider.release_path.should eql("/my/deploy/dir/releases/20040700000000")
-      @provider.shared_path.should eql("/my/deploy/dir/shared")
+      expect(@provider.release_path).to eql("/my/deploy/dir/releases/20040700000000")
+      expect(@provider.shared_path).to eql("/my/deploy/dir/shared")
     end
 
     it "sets the release path to the penultimate release, symlinks, and rm's the last release on rollback" do
-      @provider.unstub(:release_path)
+      allow(@provider).to receive(:release_path).and_call_original
       all_releases = [ "/my/deploy/dir/releases/20040815162342",
                        "/my/deploy/dir/releases/20040700000000",
                        "/my/deploy/dir/releases/20040600000000",
                        "/my/deploy/dir/releases/20040500000000"]
-      Dir.stub(:glob).with("/my/deploy/dir/releases/*").and_return(all_releases)
-      @provider.should_receive(:symlink)
-      FileUtils.should_receive(:rm_rf).with("/my/deploy/dir/releases/20040815162342")
+      allow(Dir).to receive(:glob).with("/my/deploy/dir/releases/*").and_return(all_releases)
+      expect(@provider).to receive(:symlink)
+      expect(FileUtils).to receive(:rm_rf).with("/my/deploy/dir/releases/20040815162342")
       @provider.run_action(:rollback)
-      @provider.release_path.should eql("/my/deploy/dir/releases/20040700000000")
-      @provider.shared_path.should eql("/my/deploy/dir/shared")
+      expect(@provider.release_path).to eql("/my/deploy/dir/releases/20040700000000")
+      expect(@provider.shared_path).to eql("/my/deploy/dir/shared")
     end
 
     describe "if there are no releases to fallback to" do
@@ -226,143 +227,143 @@ describe Chef::Provider::Deploy do
       it "an exception is raised when there is only 1 release" do
         #@provider.unstub(:release_path) -- unstub the release path on top to feed our own release path
         all_releases = [ "/my/deploy/dir/releases/20040815162342"]
-        Dir.stub(:glob).with("/my/deploy/dir/releases/*").and_return(all_releases)
+        allow(Dir).to receive(:glob).with("/my/deploy/dir/releases/*").and_return(all_releases)
         #@provider.should_receive(:symlink)
         #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
-        lambda {
+        expect {
           @provider.run_action(:rollback)
-        }.should raise_exception(RuntimeError, "There is no release to rollback to!")
+        }.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 = []
-        Dir.stub(:glob).with("/my/deploy/dir/releases/*").and_return(all_releases)
-        lambda {
+        allow(Dir).to receive(:glob).with("/my/deploy/dir/releases/*").and_return(all_releases)
+        expect {
           @provider.run_action(:rollback)
-        }.should raise_exception(RuntimeError, "There is no release to rollback to!")
+        }.to raise_exception(RuntimeError, "There is no release to rollback to!")
       end
     end
   end
 
   describe "CHEF-628: on systems with broken Dir.glob results" do
     it "sets the release path to the penultimate release, symlinks, and rm's the last release on rollback" do
-      @provider.unstub(:release_path)
+      allow(@provider).to receive(:release_path).and_call_original
       all_releases = [ "/my/deploy/dir/releases/20040500000000",
                        "/my/deploy/dir/releases/20040600000000",
                        "/my/deploy/dir/releases/20040700000000",
                        "/my/deploy/dir/releases/20040815162342" ]
-      Dir.stub(:glob).with("/my/deploy/dir/releases/*").and_return(all_releases)
-      @provider.should_receive(:symlink)
-      FileUtils.should_receive(:rm_rf).with("/my/deploy/dir/releases/20040815162342")
+      allow(Dir).to receive(:glob).with("/my/deploy/dir/releases/*").and_return(all_releases)
+      expect(@provider).to receive(:symlink)
+      expect(FileUtils).to receive(:rm_rf).with("/my/deploy/dir/releases/20040815162342")
       @provider.run_action(:rollback)
-      @provider.release_path.should eql("/my/deploy/dir/releases/20040700000000")
-      @provider.shared_path.should eql("/my/deploy/dir/shared")
+      expect(@provider.release_path).to eql("/my/deploy/dir/releases/20040700000000")
+      expect(@provider.shared_path).to eql("/my/deploy/dir/shared")
     end
   end
 
   it "raises a runtime error when there's no release to rollback to" do
     all_releases = []
-    Dir.stub(:glob).with("/my/deploy/dir/releases/*").and_return(all_releases)
-    lambda {@provider.run_action(:rollback)}.should raise_error(RuntimeError)
+    allow(Dir).to receive(:glob).with("/my/deploy/dir/releases/*").and_return(all_releases)
+    expect {@provider.run_action(:rollback)}.to raise_error(RuntimeError)
   end
 
   it "runs the new resource collection in the runner during a callback" do
     @runner = double("Runner")
-    Chef::Runner.stub(:new).and_return(@runner)
-    @runner.should_receive(:converge)
+    allow(Chef::Runner).to receive(:new).and_return(@runner)
+    expect(@runner).to receive(:converge)
     callback_code = Proc.new { :noop }
     @provider.callback(:whatevs, callback_code)
   end
 
   it "loads callback files from the release/ dir if the file exists" do
     foo_callback = @expected_release_dir + "/deploy/foo.rb"
-    ::File.should_receive(:exist?).with(foo_callback).once.and_return(true)
-    ::Dir.should_receive(:chdir).with(@expected_release_dir).and_yield
-    @provider.should_receive(:from_file).with(foo_callback)
+    expect(::File).to receive(:exist?).with(foo_callback).once.and_return(true)
+    expect(::Dir).to receive(:chdir).with(@expected_release_dir).and_yield
+    expect(@provider).to receive(:from_file).with(foo_callback)
     @provider.callback(:foo, "deploy/foo.rb")
   end
 
   it "raises a runtime error if a callback file is explicitly specified but does not exist" do
     baz_callback =   "/deploy/baz.rb"
-    ::File.should_receive(:exist?).with("#{@expected_release_dir}/#{baz_callback}").and_return(false)
+    expect(::File).to receive(:exist?).with("#{@expected_release_dir}/#{baz_callback}").and_return(false)
     @resource.before_migrate  baz_callback
     @provider.define_resource_requirements
     @provider.action = :deploy
-    lambda {@provider.process_resource_requirements}.should raise_error(RuntimeError)
+    expect {@provider.process_resource_requirements}.to raise_error(RuntimeError)
   end
 
   it "runs a default callback if the callback code is nil" do
     bar_callback = @expected_release_dir + "/deploy/bar.rb"
-    ::File.should_receive(:exist?).with(bar_callback).and_return(true)
-    ::Dir.should_receive(:chdir).with(@expected_release_dir).and_yield
-    @provider.should_receive(:from_file).with(bar_callback)
+    expect(::File).to receive(:exist?).with(bar_callback).and_return(true)
+    expect(::Dir).to receive(:chdir).with(@expected_release_dir).and_yield
+    expect(@provider).to receive(:from_file).with(bar_callback)
     @provider.callback(:bar, nil)
   end
 
   it "skips an eval callback if the file doesn't exist" do
     barbaz_callback = @expected_release_dir + "/deploy/barbaz.rb"
-    ::File.should_receive(:exist?).with(barbaz_callback).and_return(false)
-    ::Dir.should_receive(:chdir).with(@expected_release_dir).and_yield
-    @provider.should_not_receive(:from_file)
+    expect(::File).to receive(:exist?).with(barbaz_callback).and_return(false)
+    expect(::Dir).to receive(:chdir).with(@expected_release_dir).and_yield
+    expect(@provider).not_to receive(:from_file)
     @provider.callback(:barbaz, nil)
   end
 
   # CHEF-3449 #converge_by is called in #recipe_eval and must happen in sequence
   # with the other calls to #converge_by to keep the train on the tracks
   it "evaluates a callback file before the corresponding step" do
-    @provider.should_receive(:verify_directories_exist)
-    @provider.should_receive(:update_cached_repo)
-    @provider.should_receive(:enforce_ownership)
-    @provider.should_receive(:copy_cached_repo)
-    @provider.should_receive(:install_gems)
-    @provider.should_receive(:enforce_ownership)
-    @provider.should_receive(:converge_by).ordered # before_migrate
-    @provider.should_receive(:migrate).ordered
-    @provider.should_receive(:converge_by).ordered # before_symlink
-    @provider.should_receive(:symlink).ordered
-    @provider.should_receive(:converge_by).ordered # before_restart
-    @provider.should_receive(:restart).ordered
-    @provider.should_receive(:converge_by).ordered # after_restart
-    @provider.should_receive(:cleanup!)
+    expect(@provider).to receive(:verify_directories_exist)
+    expect(@provider).to receive(:update_cached_repo)
+    expect(@provider).to receive(:enforce_ownership)
+    expect(@provider).to receive(:copy_cached_repo)
+    expect(@provider).to receive(:install_gems)
+    expect(@provider).to receive(:enforce_ownership)
+    expect(@provider).to receive(:converge_by).ordered # before_migrate
+    expect(@provider).to receive(:migrate).ordered
+    expect(@provider).to receive(:converge_by).ordered # before_symlink
+    expect(@provider).to receive(:symlink).ordered
+    expect(@provider).to receive(:converge_by).ordered # before_restart
+    expect(@provider).to receive(:restart).ordered
+    expect(@provider).to receive(:converge_by).ordered # after_restart
+    expect(@provider).to receive(:cleanup!)
     @provider.deploy
   end
 
   it "gets a SCM provider as specified by its resource" do
-    @provider.scm_provider.should be_an_instance_of(Chef::Provider::Git)
-    @provider.scm_provider.new_resource.destination.should eql("/my/deploy/dir/shared/cached-copy")
+    expect(@provider.scm_provider).to be_an_instance_of(Chef::Provider::Git)
+    expect(@provider.scm_provider.new_resource.destination).to eql("/my/deploy/dir/shared/cached-copy")
   end
 
   it "syncs the cached copy of the repo" do
-    @provider.scm_provider.should_receive(:run_action).with(:sync)
+    expect(@provider.scm_provider).to receive(:run_action).with(:sync)
     @provider.update_cached_repo
   end
 
   it "makes a copy of the cached repo in releases dir" do
-    FileUtils.should_receive(:mkdir_p).with("/my/deploy/dir/releases")
-    FileUtils.should_receive(:cp_r).with("/my/deploy/dir/shared/cached-copy/.", @expected_release_dir, :preserve => true)
+    expect(FileUtils).to receive(:mkdir_p).with("/my/deploy/dir/releases")
+    expect(FileUtils).to receive(:cp_r).with("/my/deploy/dir/shared/cached-copy/.", @expected_release_dir, :preserve => true)
     @provider.copy_cached_repo
   end
 
   it "calls the internal callback :release_created when cleaning up the releases" do
-    FileUtils.stub(:mkdir_p)
-    FileUtils.stub(:cp_r)
-    @provider.should_receive(:release_created)
+    allow(FileUtils).to receive(:mkdir_p)
+    allow(FileUtils).to receive(:cp_r)
+    expect(@provider).to receive(:release_created)
     @provider.cleanup!
   end
 
   it "chowns the whole release dir to user and group specified in the resource" do
     @resource.user "foo"
     @resource.group "bar"
-    FileUtils.should_receive(:chown_R).with("foo", "bar", "/my/deploy/dir")
+    expect(FileUtils).to receive(:chown_R).with("foo", "bar", "/my/deploy/dir")
     @provider.enforce_ownership
   end
 
   it "skips the migration when resource.migrate => false but runs symlinks before migration" do
     @resource.migrate false
-    @provider.should_not_receive :run_command
-    @provider.should_receive :run_symlinks_before_migrate
+    expect(@provider).not_to receive :run_command
+    expect(@provider).to receive :run_symlinks_before_migrate
     @provider.migrate
   end
 
@@ -372,12 +373,12 @@ describe Chef::Provider::Deploy do
     @resource.user "deployNinja"
     @resource.group "deployNinjas"
     @resource.environment "RAILS_ENV" => "production"
-    FileUtils.should_receive(:ln_sf).with("/my/deploy/dir/shared/config/database.yml", @expected_release_dir + "/config/database.yml")
-    @provider.should_receive(:enforce_ownership)
+    expect(FileUtils).to receive(:ln_sf).with("/my/deploy/dir/shared/config/database.yml", @expected_release_dir + "/config/database.yml")
+    expect(@provider).to receive(:enforce_ownership)
 
-    STDOUT.stub(:tty?).and_return(true)
-    Chef::Log.stub(:info?).and_return(true)
-    @provider.should_receive(:run_command).with(:command => "migration_foo", :cwd => @expected_release_dir,
+    allow(STDOUT).to receive(:tty?).and_return(true)
+    allow(Chef::Log).to receive(:info?).and_return(true)
+    expect(@provider).to receive(:run_command).with(:command => "migration_foo", :cwd => @expected_release_dir,
                                                 :user => "deployNinja", :group => "deployNinjas",
                                                 :log_level => :info, :live_stream => STDOUT,
                                                 :log_tag => "deploy[/my/deploy/dir]",
@@ -386,31 +387,31 @@ describe Chef::Provider::Deploy do
   end
 
   it "purges the current release's /log /tmp/pids/ and /public/system directories" do
-    FileUtils.should_receive(:rm_rf).with(@expected_release_dir + "/log")
-    FileUtils.should_receive(:rm_rf).with(@expected_release_dir + "/tmp/pids")
-    FileUtils.should_receive(:rm_rf).with(@expected_release_dir + "/public/system")
+    expect(FileUtils).to receive(:rm_rf).with(@expected_release_dir + "/log")
+    expect(FileUtils).to receive(:rm_rf).with(@expected_release_dir + "/tmp/pids")
+    expect(FileUtils).to receive(:rm_rf).with(@expected_release_dir + "/public/system")
     @provider.purge_tempfiles_from_current_release
   end
 
   it "symlinks temporary files and logs from the shared dir into the current release" do
-    FileUtils.stub(:mkdir_p).with(@resource.shared_path + "/system")
-    FileUtils.stub(:mkdir_p).with(@resource.shared_path + "/pids")
-    FileUtils.stub(:mkdir_p).with(@resource.shared_path + "/log")
-    FileUtils.should_receive(:mkdir_p).with(@expected_release_dir + "/tmp")
-    FileUtils.should_receive(:mkdir_p).with(@expected_release_dir + "/public")
-    FileUtils.should_receive(:mkdir_p).with(@expected_release_dir + "/config")
-    FileUtils.should_receive(:ln_sf).with("/my/deploy/dir/shared/system", @expected_release_dir + "/public/system")
-    FileUtils.should_receive(:ln_sf).with("/my/deploy/dir/shared/pids", @expected_release_dir + "/tmp/pids")
-    FileUtils.should_receive(:ln_sf).with("/my/deploy/dir/shared/log", @expected_release_dir + "/log")
-    FileUtils.should_receive(:ln_sf).with("/my/deploy/dir/shared/config/database.yml", @expected_release_dir + "/config/database.yml")
-    @provider.should_receive(:enforce_ownership)
+    allow(FileUtils).to receive(:mkdir_p).with(@resource.shared_path + "/system")
+    allow(FileUtils).to receive(:mkdir_p).with(@resource.shared_path + "/pids")
+    allow(FileUtils).to receive(:mkdir_p).with(@resource.shared_path + "/log")
+    expect(FileUtils).to receive(:mkdir_p).with(@expected_release_dir + "/tmp")
+    expect(FileUtils).to receive(:mkdir_p).with(@expected_release_dir + "/public")
+    expect(FileUtils).to receive(:mkdir_p).with(@expected_release_dir + "/config")
+    expect(FileUtils).to receive(:ln_sf).with("/my/deploy/dir/shared/system", @expected_release_dir + "/public/system")
+    expect(FileUtils).to receive(:ln_sf).with("/my/deploy/dir/shared/pids", @expected_release_dir + "/tmp/pids")
+    expect(FileUtils).to receive(:ln_sf).with("/my/deploy/dir/shared/log", @expected_release_dir + "/log")
+    expect(FileUtils).to receive(:ln_sf).with("/my/deploy/dir/shared/config/database.yml", @expected_release_dir + "/config/database.yml")
+    expect(@provider).to receive(:enforce_ownership)
     @provider.link_tempfiles_to_current_release
   end
 
   it "symlinks the current release dir into production" do
-    FileUtils.should_receive(:rm_f).with("/my/deploy/dir/current")
-    FileUtils.should_receive(:ln_sf).with(@expected_release_dir, "/my/deploy/dir/current")
-    @provider.should_receive(:enforce_ownership)
+    expect(FileUtils).to receive(:rm_f).with("/my/deploy/dir/current")
+    expect(FileUtils).to receive(:ln_sf).with(@expected_release_dir, "/my/deploy/dir/current")
+    expect(@provider).to receive(:enforce_ownership)
     @provider.link_current_release_to_production
   end
 
@@ -424,41 +425,41 @@ describe Chef::Provider::Deploy do
     end
 
     it "purges the purge_before_symlink directories" do
-      FileUtils.should_receive(:rm_rf).with(@expected_release_dir + "/foo")
-      FileUtils.should_receive(:rm_rf).with(@expected_release_dir + "/bar")
+      expect(FileUtils).to receive(:rm_rf).with(@expected_release_dir + "/foo")
+      expect(FileUtils).to receive(:rm_rf).with(@expected_release_dir + "/bar")
       @provider.purge_tempfiles_from_current_release
     end
 
     it "symlinks files from the shared directory to the current release directory" do
-      FileUtils.should_receive(:mkdir_p).with(@expected_release_dir + "/baz")
-      FileUtils.should_receive(:mkdir_p).with(@expected_release_dir + "/qux")
-      FileUtils.stub(:mkdir_p).with(@resource.shared_path + "/foo/bar")
-      FileUtils.stub(:mkdir_p).with(@resource.shared_path + "/baz")
-      FileUtils.should_receive(:ln_sf).with("/my/deploy/dir/shared/foo/bar", @expected_release_dir + "/foo/bar")
-      FileUtils.should_receive(:ln_sf).with("/my/deploy/dir/shared/baz", @expected_release_dir + "/qux/baz")
-      FileUtils.should_receive(:ln_sf).with("/my/deploy/dir/shared/radiohead/in_rainbows.yml", @expected_release_dir + "/awesome")
-      @provider.should_receive(:enforce_ownership)
+      expect(FileUtils).to receive(:mkdir_p).with(@expected_release_dir + "/baz")
+      expect(FileUtils).to receive(:mkdir_p).with(@expected_release_dir + "/qux")
+      allow(FileUtils).to receive(:mkdir_p).with(@resource.shared_path + "/foo/bar")
+      allow(FileUtils).to receive(:mkdir_p).with(@resource.shared_path + "/baz")
+      expect(FileUtils).to receive(:ln_sf).with("/my/deploy/dir/shared/foo/bar", @expected_release_dir + "/foo/bar")
+      expect(FileUtils).to receive(:ln_sf).with("/my/deploy/dir/shared/baz", @expected_release_dir + "/qux/baz")
+      expect(FileUtils).to receive(:ln_sf).with("/my/deploy/dir/shared/radiohead/in_rainbows.yml", @expected_release_dir + "/awesome")
+      expect(@provider).to receive(:enforce_ownership)
       @provider.link_tempfiles_to_current_release
     end
 
   end
 
   it "does nothing for restart if restart_command is empty" do
-    @provider.should_not_receive(:run_command)
+    expect(@provider).not_to receive(:run_command)
     @provider.restart
   end
 
   it "runs the restart command in the current application dir when the resource has a restart_command" do
     @resource.restart_command "restartcmd"
-    @provider.should_receive(:run_command).with(:command => "restartcmd", :cwd => "/my/deploy/dir/current", :log_tag => "deploy[/my/deploy/dir]", :log_level => :debug)
+    expect(@provider).to receive(:run_command).with(:command => "restartcmd", :cwd => "/my/deploy/dir/current", :log_tag => "deploy[/my/deploy/dir]", :log_level => :debug)
     @provider.restart
   end
 
   it "lists all available releases" do
     all_releases = ["/my/deploy/dir/20040815162342", "/my/deploy/dir/20040700000000",
                     "/my/deploy/dir/20040600000000", "/my/deploy/dir/20040500000000"].sort!
-    Dir.should_receive(:glob).with("/my/deploy/dir/releases/*").and_return(all_releases)
-    @provider.all_releases.should eql(all_releases)
+    expect(Dir).to receive(:glob).with("/my/deploy/dir/releases/*").and_return(all_releases)
+    expect(@provider.all_releases).to eql(all_releases)
   end
 
   it "removes all but the 5 newest releases" do
@@ -466,10 +467,10 @@ describe Chef::Provider::Deploy do
                     "/my/deploy/dir/20040600000000", "/my/deploy/dir/20040500000000",
                     "/my/deploy/dir/20040400000000", "/my/deploy/dir/20040300000000",
                     "/my/deploy/dir/20040200000000", "/my/deploy/dir/20040100000000"].sort!
-    @provider.stub(:all_releases).and_return(all_releases)
-    FileUtils.should_receive(:rm_rf).with("/my/deploy/dir/20040100000000")
-    FileUtils.should_receive(:rm_rf).with("/my/deploy/dir/20040200000000")
-    FileUtils.should_receive(:rm_rf).with("/my/deploy/dir/20040300000000")
+    allow(@provider).to receive(:all_releases).and_return(all_releases)
+    expect(FileUtils).to receive(:rm_rf).with("/my/deploy/dir/20040100000000")
+    expect(FileUtils).to receive(:rm_rf).with("/my/deploy/dir/20040200000000")
+    expect(FileUtils).to receive(:rm_rf).with("/my/deploy/dir/20040300000000")
     @provider.cleanup!
   end
 
@@ -479,8 +480,8 @@ describe Chef::Provider::Deploy do
                     "/my/deploy/dir/20040600000000", "/my/deploy/dir/20040500000000",
                     "/my/deploy/dir/20040400000000", "/my/deploy/dir/20040300000000",
                     "/my/deploy/dir/20040200000000", "/my/deploy/dir/20040100000000"].sort!
-    @provider.stub(:all_releases).and_return(all_releases)
-    FileUtils.should_receive(:rm_rf).with("/my/deploy/dir/20040100000000")
+    allow(@provider).to receive(:all_releases).and_return(all_releases)
+    expect(FileUtils).to receive(:rm_rf).with("/my/deploy/dir/20040100000000")
     @provider.cleanup!
   end
 
@@ -488,27 +489,27 @@ describe Chef::Provider::Deploy do
     all_releases = ["/my/deploy/dir/20040815162342", "/my/deploy/dir/20040700000000",
                     "/my/deploy/dir/20040600000000", "/my/deploy/dir/20040500000000",
                     "/my/deploy/dir/20040400000000", "/my/deploy/dir/20040300000000"].sort!
-    @provider.stub(:all_releases).and_return(all_releases)
-    FileUtils.stub(:rm_rf)
-    @provider.should_receive(:release_deleted).with("/my/deploy/dir/20040300000000")
+    allow(@provider).to receive(:all_releases).and_return(all_releases)
+    allow(FileUtils).to receive(:rm_rf)
+    expect(@provider).to receive(:release_deleted).with("/my/deploy/dir/20040300000000")
     @provider.cleanup!
   end
 
   it "puts resource.to_hash in @configuration for backwards compat with capistano-esque deploy hooks" do
-    @provider.instance_variable_get(:@configuration).should == @resource.to_hash
+    expect(@provider.instance_variable_get(:@configuration)).to eq(@resource.to_hash)
   end
 
   it "sets @configuration[:environment] to the value of RAILS_ENV for backwards compat reasons" do
     resource = Chef::Resource::Deploy.new("/my/deploy/dir")
     resource.environment "production"
     provider = Chef::Provider::Deploy.new(resource, @run_context)
-    provider.instance_variable_get(:@configuration)[:environment].should eql("production")
+    expect(provider.instance_variable_get(:@configuration)[:environment]).to eql("production")
   end
 
   it "shouldn't give a no method error on migrate if the environment is nil" do
-    @provider.stub(:enforce_ownership)
-    @provider.stub(:run_symlinks_before_migrate)
-    @provider.stub(:run_command)
+    allow(@provider).to receive(:enforce_ownership)
+    allow(@provider).to receive(:run_symlinks_before_migrate)
+    allow(@provider).to receive(:run_command)
     @provider.migrate
 
   end
@@ -520,13 +521,13 @@ describe Chef::Provider::Deploy do
       recipe_code = Proc.new {snitch = 42}
       #@provider.should_receive(:instance_eval).with(&recipe_code)
       @provider.callback(:whateverz, recipe_code)
-      snitch.should == 42
+      expect(snitch).to eq(42)
     end
 
     it "loads a recipe file from the specified path and from_file evals it" do
-      ::File.should_receive(:exist?).with(@expected_release_dir + "/chefz/foobar_callback.rb").once.and_return(true)
-      ::Dir.should_receive(:chdir).with(@expected_release_dir).and_yield
-      @provider.should_receive(:from_file).with(@expected_release_dir + "/chefz/foobar_callback.rb")
+      expect(::File).to receive(:exist?).with(@expected_release_dir + "/chefz/foobar_callback.rb").once.and_return(true)
+      expect(::Dir).to receive(:chdir).with(@expected_release_dir).and_yield
+      expect(@provider).to receive(:from_file).with(@expected_release_dir + "/chefz/foobar_callback.rb")
       @provider.callback(:whateverz, "chefz/foobar_callback.rb")
     end
 
@@ -535,40 +536,40 @@ describe Chef::Provider::Deploy do
       restart_cmd = Proc.new {snitch = 42}
       @resource.restart(&restart_cmd)
       @provider.restart
-      snitch.should == 42
+      expect(snitch).to eq(42)
     end
 
   end
 
   describe "API bridge to capistrano" do
     it "defines sudo as a forwarder to execute" do
-      @provider.should_receive(:execute).with("the moon, fool")
+      expect(@provider).to receive(:execute).with("the moon, fool")
       @provider.sudo("the moon, fool")
     end
 
     it "defines run as a forwarder to execute, setting the user, group, cwd and environment to new_resource.user" do
       mock_execution = double("Resource::Execute")
-      @provider.should_receive(:execute).with("iGoToHell4this").and_return(mock_execution)
+      expect(@provider).to receive(:execute).with("iGoToHell4this").and_return(mock_execution)
       @resource.user("notCoolMan")
       @resource.group("Ggroup")
       @resource.environment("APP_ENV" => 'staging')
       @resource.deploy_to("/my/app")
-      mock_execution.should_receive(:user).with("notCoolMan")
-      mock_execution.should_receive(:group).with("Ggroup")
-      mock_execution.should_receive(:cwd){|*args|
+      expect(mock_execution).to receive(:user).with("notCoolMan")
+      expect(mock_execution).to receive(:group).with("Ggroup")
+      expect(mock_execution).to receive(:cwd){|*args|
         if args.empty?
           nil
         else
-          args.size.should == 1
-          args.first.should == @provider.release_path
+          expect(args.size).to eq(1)
+          expect(args.first).to eq(@provider.release_path)
         end
       }.twice
-      mock_execution.should_receive(:environment){ |*args|
+      expect(mock_execution).to receive(:environment){ |*args|
         if args.empty?
           nil
         else
-          args.size.should == 1
-          args.first.should == {"APP_ENV" => "staging"}
+          expect(args.size).to eq(1)
+          expect(args.first).to eq({"APP_ENV" => "staging"})
         end
       }.twice
       @provider.run("iGoToHell4this")
@@ -577,18 +578,18 @@ describe Chef::Provider::Deploy do
 
     it "defines run as a forwarder to execute, setting cwd and environment but not override" do
       mock_execution = double("Resource::Execute")
-      @provider.should_receive(:execute).with("iGoToHell4this").and_return(mock_execution)
+      expect(@provider).to receive(:execute).with("iGoToHell4this").and_return(mock_execution)
       @resource.user("notCoolMan")
-      mock_execution.should_receive(:user).with("notCoolMan")
-      mock_execution.should_receive(:cwd).with(no_args()).and_return("/some/value")
-      mock_execution.should_receive(:environment).with(no_args()).and_return({})
+      expect(mock_execution).to receive(:user).with("notCoolMan")
+      expect(mock_execution).to receive(:cwd).with(no_args()).and_return("/some/value")
+      expect(mock_execution).to receive(:environment).with(no_args()).and_return({})
       @provider.run("iGoToHell4this")
     end
 
 
     it "converts sudo and run to exec resources in hooks" do
       runner = double("tehRunner")
-      Chef::Runner.stub(:new).and_return(runner)
+      allow(Chef::Runner).to receive(:new).and_return(runner)
 
       snitch = nil
       @resource.user("tehCat")
@@ -600,40 +601,40 @@ describe Chef::Provider::Deploy do
         snitch = temp_collection.lookup("execute[tehMice]")
       end
 
-      runner.should_receive(:converge)
+      expect(runner).to receive(:converge)
       #
       @provider.callback(:phony, callback_code)
-      snitch.should be_an_instance_of(Chef::Resource::Execute)
-      snitch.user.should == "tehCat"
+      expect(snitch).to be_an_instance_of(Chef::Resource::Execute)
+      expect(snitch.user).to eq("tehCat")
     end
   end
 
   describe "installing gems from a gems.yml" do
 
     before do
-      ::File.stub(:exist?).with("#{@expected_release_dir}/gems.yml").and_return(true)
+      allow(::File).to receive(:exist?).with("#{@expected_release_dir}/gems.yml").and_return(true)
       @gem_list = [{:name=>"eventmachine", :version=>"0.12.9"}]
     end
 
     it "reads a gems.yml file, creating gem providers for each with action :upgrade" do
-      IO.should_receive(:read).with("#{@expected_release_dir}/gems.yml").and_return("cookie")
-      YAML.should_receive(:load).with("cookie").and_return(@gem_list)
+      expect(IO).to receive(:read).with("#{@expected_release_dir}/gems.yml").and_return("cookie")
+      expect(YAML).to receive(:load).with("cookie").and_return(@gem_list)
 
       gems = @provider.send(:gem_packages)
 
-      gems.map { |g| g.action }.should == [[:install]]
-      gems.map { |g| g.name }.should == %w{eventmachine}
-      gems.map { |g| g.version }.should == %w{0.12.9}
+      expect(gems.map { |g| g.action }).to eq([[:install]])
+      expect(gems.map { |g| g.name }).to eq(%w{eventmachine})
+      expect(gems.map { |g| g.version }).to eq(%w{0.12.9})
     end
 
     it "takes a list of gem providers converges them" do
-      IO.stub(:read)
-      YAML.stub(:load).and_return(@gem_list)
+      allow(IO).to receive(:read)
+      allow(YAML).to receive(:load).and_return(@gem_list)
       expected_gem_resources = @provider.send(:gem_packages).map { |r| [r.name, r.version] }
       gem_runner = @provider.send(:gem_resource_collection_runner)
       # no one has heard of defining == to be meaningful so I have use this monstrosity
       actual = gem_runner.run_context.resource_collection.all_resources.map { |r| [r.name, r.version] }
-      actual.should == expected_gem_resources
+      expect(actual).to eq(expected_gem_resources)
     end
 
   end