diff options
author | Claire McQuin <claire@getchef.com> | 2014-10-29 15:14:22 -0700 |
---|---|---|
committer | Claire McQuin <claire@getchef.com> | 2014-10-29 15:59:04 -0700 |
commit | 5fed7a65a2f024d964ecf2de1bcf2911cf8a600c (patch) | |
tree | 14cc6968e4fe4fd2485c0211088b25c645a80a4b /spec/functional/resource/deploy_revision_spec.rb | |
parent | b92c309b0f1aa0837f76ab89d6c81c36076ceca9 (diff) | |
download | chef-5fed7a65a2f024d964ecf2de1bcf2911cf8a600c.tar.gz |
Update to RSpec 3.
Diffstat (limited to 'spec/functional/resource/deploy_revision_spec.rb')
-rw-r--r-- | spec/functional/resource/deploy_revision_spec.rb | 196 |
1 files changed, 98 insertions, 98 deletions
diff --git a/spec/functional/resource/deploy_revision_spec.rb b/spec/functional/resource/deploy_revision_spec.rb index eae422ac1d..7bc3da9a05 100644 --- a/spec/functional/resource/deploy_revision_spec.rb +++ b/spec/functional/resource/deploy_revision_spec.rb @@ -173,12 +173,12 @@ describe Chef::Resource::DeployRevision, :unix_only => true do it "deploys the app to the target revision (#{target_rev_spec})" do target_rev = send(target_rev_spec) - File.should exist(rel_path("current")) + expect(File).to exist(rel_path("current")) - actual_current_rev.should == target_rev + expect(actual_current_rev).to eq(target_rev) # Is the app code actually there? - File.should exist(rel_path("current/app/app.rb")) + expect(File).to exist(rel_path("current/app/app.rb")) end end @@ -193,12 +193,12 @@ describe Chef::Resource::DeployRevision, :unix_only => true do the_app_is_deployed_at_revision(:latest_rev) it "restarts the application" do - File.should exist(rel_path("current/restart.txt")) - actual_operations_order.should == %w[deploy_to_latest_rev] + expect(File).to exist(rel_path("current/restart.txt")) + expect(actual_operations_order).to eq(%w[deploy_to_latest_rev]) end it "is marked as updated" do - deploy_to_latest_rev.should be_updated_by_last_action + expect(deploy_to_latest_rev).to be_updated_by_last_action end end @@ -215,15 +215,15 @@ describe Chef::Resource::DeployRevision, :unix_only => true do the_app_is_deployed_at_revision(:latest_rev) it "restarts the application after rolling back" do - actual_operations_order.should == %w[deploy_to_latest_rev deploy_to_previous_rev deploy_to_latest_rev_again] + expect(actual_operations_order).to eq(%w[deploy_to_latest_rev deploy_to_previous_rev deploy_to_latest_rev_again]) end it "is marked updated" do - deploy_to_latest_rev_again.should be_updated_by_last_action + expect(deploy_to_latest_rev_again).to be_updated_by_last_action end it "deploys the right code" do - IO.read(rel_path("current/app/app.rb")).should include("this is the fourth version of the app") + expect(IO.read(rel_path("current/app/app.rb"))).to include("this is the fourth version of the app") end end @@ -233,27 +233,27 @@ describe Chef::Resource::DeployRevision, :unix_only => true do end it "creates the required directory tree" do - File.should be_directory(rel_path("releases")) - File.should be_directory(rel_path("shared")) - File.should be_directory(rel_path("releases/#{latest_rev}")) + expect(File).to be_directory(rel_path("releases")) + expect(File).to be_directory(rel_path("shared")) + expect(File).to be_directory(rel_path("releases/#{latest_rev}")) - File.should be_directory(rel_path("current/tmp")) - File.should be_directory(rel_path("current/config")) - File.should be_directory(rel_path("current/public")) + expect(File).to be_directory(rel_path("current/tmp")) + expect(File).to be_directory(rel_path("current/config")) + expect(File).to be_directory(rel_path("current/public")) - File.should be_symlink(rel_path("current")) - File.readlink(rel_path("current")).should == rel_path("releases/#{latest_rev}") + expect(File).to be_symlink(rel_path("current")) + expect(File.readlink(rel_path("current"))).to eq(rel_path("releases/#{latest_rev}")) end the_app_is_deployed_at_revision(:latest_rev) it "restarts the application" do - File.should exist(rel_path("current/restart.txt")) - actual_operations_order.should == %w[deploy_to_latest_rev] + expect(File).to exist(rel_path("current/restart.txt")) + expect(actual_operations_order).to eq(%w[deploy_to_latest_rev]) end it "is marked as updated" do - deploy_to_latest_rev.should be_updated_by_last_action + expect(deploy_to_latest_rev).to be_updated_by_last_action end end @@ -266,11 +266,11 @@ describe Chef::Resource::DeployRevision, :unix_only => true do the_app_is_deployed_at_revision(:latest_rev) it "does not restart the app" do - actual_operations_order.should == %w[deploy_to_latest_rev] + expect(actual_operations_order).to eq(%w[deploy_to_latest_rev]) end it "is not marked updated" do - deploy_to_latest_rev.should_not be_updated_by_last_action + expect(deploy_to_latest_rev).not_to be_updated_by_last_action end end @@ -284,11 +284,11 @@ describe Chef::Resource::DeployRevision, :unix_only => true do the_app_is_deployed_at_revision(:latest_rev) it "restarts the app" do - actual_operations_order.should == %w[deploy_to_latest_rev deploy_to_latest_rev_again] + expect(actual_operations_order).to eq(%w[deploy_to_latest_rev deploy_to_latest_rev_again]) end it "is marked updated" do - deploy_to_latest_rev.should be_updated_by_last_action + expect(deploy_to_latest_rev).to be_updated_by_last_action end end @@ -302,15 +302,15 @@ describe Chef::Resource::DeployRevision, :unix_only => true do the_app_is_deployed_at_revision(:latest_rev) it "restarts the application after the new deploy" do - actual_operations_order.should == %w[deploy_to_previous_rev deploy_to_latest_rev] + expect(actual_operations_order).to eq(%w[deploy_to_previous_rev deploy_to_latest_rev]) end it "is marked updated" do - deploy_to_previous_rev.should be_updated_by_last_action + expect(deploy_to_previous_rev).to be_updated_by_last_action end it "leaves the old copy of the app around for rollback" do - File.should exist(File.join(deploy_directory, "releases", previous_rev)) + expect(File).to exist(File.join(deploy_directory, "releases", previous_rev)) end end @@ -325,15 +325,15 @@ describe Chef::Resource::DeployRevision, :unix_only => true do the_app_is_deployed_at_revision(:latest_rev) it "restarts the application after rolling back" do - actual_operations_order.should == %w[deploy_to_latest_rev deploy_to_previous_rev deploy_to_latest_rev_again] + expect(actual_operations_order).to eq(%w[deploy_to_latest_rev deploy_to_previous_rev deploy_to_latest_rev_again]) end it "is marked updated" do - deploy_to_latest_rev_again.should be_updated_by_last_action + expect(deploy_to_latest_rev_again).to be_updated_by_last_action end it "deploys the right code" do - IO.read(rel_path("current/app/app.rb")).should include("this is the fourth version of the app") + expect(IO.read(rel_path("current/app/app.rb"))).to include("this is the fourth version of the app") end end @@ -350,31 +350,31 @@ describe Chef::Resource::DeployRevision, :unix_only => true do the_app_is_deployed_at_revision(:previous_rev) it "restarts the application after rolling back" do - actual_operations_order.should == %w[deploy_to_previous_rev deploy_to_latest_rev deploy_to_latest_rev_again] + expect(actual_operations_order).to eq(%w[deploy_to_previous_rev deploy_to_latest_rev deploy_to_latest_rev_again]) end it "is marked updated" do - deploy_to_latest_rev_again.should be_updated_by_last_action + expect(deploy_to_latest_rev_again).to be_updated_by_last_action end it "deploys the right code" do - IO.read(rel_path("current/app/app.rb")).should include("this is the third version of the app") + expect(IO.read(rel_path("current/app/app.rb"))).to include("this is the third version of the app") end it "all_releases after first deploy should have one entry" do - @previous_rev_all_releases.length.should == 1 + expect(@previous_rev_all_releases.length).to eq(1) end it "all_releases after second deploy should have two entries" do - @latest_rev_all_releases.length.should == 2 + expect(@latest_rev_all_releases.length).to eq(2) end it "all_releases after rollback should have one entry" do - @previous_rev_again_all_releases.length.should == 1 + expect(@previous_rev_again_all_releases.length).to eq(1) end it "all_releases after rollback should be the same as after the first deploy" do - @previous_rev_again_all_releases.should == @previous_rev_all_releases + expect(@previous_rev_again_all_releases).to eq(@previous_rev_all_releases) end end @@ -393,31 +393,31 @@ describe Chef::Resource::DeployRevision, :unix_only => true do the_app_is_deployed_at_revision(:previous_rev) it "restarts the application after rolling back" do - actual_operations_order.should == %w[deploy_to_previous_rev deploy_to_latest_rev deploy_to_previous_rev_again] + expect(actual_operations_order).to eq(%w[deploy_to_previous_rev deploy_to_latest_rev deploy_to_previous_rev_again]) end it "is marked updated" do - deploy_to_previous_rev_again.should be_updated_by_last_action + expect(deploy_to_previous_rev_again).to be_updated_by_last_action end it "deploys the right code" do - IO.read(rel_path("current/app/app.rb")).should include("this is the third version of the app") + expect(IO.read(rel_path("current/app/app.rb"))).to include("this is the third version of the app") end it "all_releases after first deploy should have one entry" do - @previous_rev_all_releases.length.should == 1 + expect(@previous_rev_all_releases.length).to eq(1) end it "all_releases after second deploy should have two entries" do - @latest_rev_all_releases.length.should == 2 + expect(@latest_rev_all_releases.length).to eq(2) end it "all_releases after rollback should have one entry" do - @previous_rev_again_all_releases.length.should == 1 + expect(@previous_rev_again_all_releases.length).to eq(1) end it "all_releases after rollback should be the same as after the first deploy" do - @previous_rev_again_all_releases.should == @previous_rev_all_releases + expect(@previous_rev_again_all_releases).to eq(@previous_rev_all_releases) end end @@ -438,23 +438,23 @@ describe Chef::Resource::DeployRevision, :unix_only => true do the_app_is_deployed_at_revision(:second_rev) it "restarts the application after rolling back" do - actual_operations_order.should == %w[deploy_to_second_rev deploy_to_previous_rev deploy_to_previous_rev_again deploy_to_latest_rev deploy_to_latest_rev_again] + expect(actual_operations_order).to eq(%w[deploy_to_second_rev deploy_to_previous_rev deploy_to_previous_rev_again deploy_to_latest_rev deploy_to_latest_rev_again]) end it "is marked updated" do - deploy_to_latest_rev_again.should be_updated_by_last_action + expect(deploy_to_latest_rev_again).to be_updated_by_last_action end it "deploys the right code" do - IO.read(rel_path("current/app/app.rb")).should include("this is the second version of the app") + expect(IO.read(rel_path("current/app/app.rb"))).to include("this is the second version of the app") end it "all_releases after rollback should have one entry" do - @fifth_deploy_all_releases.length.should == 1 + expect(@fifth_deploy_all_releases.length).to eq(1) end it "all_releases after rollback should be the same as after the first deploy" do - @fifth_deploy_all_releases.should == @first_deploy_all_releases + expect(@fifth_deploy_all_releases).to eq(@first_deploy_all_releases) end end @@ -475,23 +475,23 @@ describe Chef::Resource::DeployRevision, :unix_only => true do the_app_is_deployed_at_revision(:second_rev) it "restarts the application after rolling back" do - actual_operations_order.should == %w[deploy_to_second_rev deploy_to_previous_rev deploy_to_second_rev_again deploy_to_latest_rev deploy_to_second_rev_again_again] + expect(actual_operations_order).to eq(%w[deploy_to_second_rev deploy_to_previous_rev deploy_to_second_rev_again deploy_to_latest_rev deploy_to_second_rev_again_again]) end it "is marked updated" do - deploy_to_second_rev_again_again.should be_updated_by_last_action + expect(deploy_to_second_rev_again_again).to be_updated_by_last_action end it "deploys the right code" do - IO.read(rel_path("current/app/app.rb")).should include("this is the second version of the app") + expect(IO.read(rel_path("current/app/app.rb"))).to include("this is the second version of the app") end it "all_releases after rollback should have one entry" do - @fifth_deploy_all_releases.length.should == 1 + expect(@fifth_deploy_all_releases.length).to eq(1) end it "all_releases after rollback should be the same as after the first deploy" do - @fifth_deploy_all_releases.should == @first_deploy_all_releases + expect(@fifth_deploy_all_releases).to eq(@first_deploy_all_releases) end end @@ -510,21 +510,21 @@ describe Chef::Resource::DeployRevision, :unix_only => true do end before do - File.should_not exist(deploy_directory) + expect(File).not_to exist(deploy_directory) deploy_to_latest_rev.run_action(:deploy) end it "creates the required directory tree" do - File.should be_directory(rel_path("releases")) - File.should be_directory(rel_path("shared")) - File.should be_directory(rel_path("releases/#{latest_rev}")) + expect(File).to be_directory(rel_path("releases")) + expect(File).to be_directory(rel_path("shared")) + expect(File).to be_directory(rel_path("releases/#{latest_rev}")) - File.should be_directory(rel_path("current/tmp")) - File.should be_directory(rel_path("current/config")) - File.should be_directory(rel_path("current/public")) + expect(File).to be_directory(rel_path("current/tmp")) + expect(File).to be_directory(rel_path("current/config")) + expect(File).to be_directory(rel_path("current/public")) - File.should be_symlink(rel_path("current")) - File.readlink(rel_path("current")).should == rel_path("releases/#{latest_rev}") + expect(File).to be_symlink(rel_path("current")) + expect(File.readlink(rel_path("current"))).to eq(rel_path("releases/#{latest_rev}")) end the_app_is_deployed_at_revision(:latest_rev) @@ -599,18 +599,18 @@ describe Chef::Resource::DeployRevision, :unix_only => true do the_app_is_deployed_at_revision(:latest_rev) it "is marked updated" do - deploy_to_latest_with_inline_recipes.should be_updated_by_last_action + expect(deploy_to_latest_with_inline_recipes).to be_updated_by_last_action end it "calls the callbacks in order" do - callback_order.should == [:before_migrate, :before_symlink, :before_restart, :after_restart] + expect(callback_order).to eq([:before_migrate, :before_symlink, :before_restart, :after_restart]) end it "runs chef resources in the callbacks" do - File.should exist(rel_path("current/before_migrate.txt")) - File.should exist(rel_path("current/before_symlink.txt")) - File.should exist(rel_path("current/tmp/before_restart.txt")) - File.should exist(rel_path("current/tmp/after_restart.txt")) + expect(File).to exist(rel_path("current/before_migrate.txt")) + expect(File).to exist(rel_path("current/before_symlink.txt")) + expect(File).to exist(rel_path("current/tmp/before_restart.txt")) + expect(File).to exist(rel_path("current/tmp/after_restart.txt")) end end @@ -629,10 +629,10 @@ describe Chef::Resource::DeployRevision, :unix_only => true do the_app_is_deployed_at_revision(:rev_with_in_repo_callbacks) it "runs chef resources in the callbacks" do - File.should exist(rel_path("current/before_migrate.txt")) - File.should exist(rel_path("current/before_symlink.txt")) - File.should exist(rel_path("current/tmp/before_restart.txt")) - File.should exist(rel_path("current/tmp/after_restart.txt")) + expect(File).to exist(rel_path("current/before_migrate.txt")) + expect(File).to exist(rel_path("current/before_symlink.txt")) + expect(File).to exist(rel_path("current/tmp/before_restart.txt")) + expect(File).to exist(rel_path("current/tmp/after_restart.txt")) end end @@ -690,7 +690,7 @@ describe Chef::Resource::DeployRevision, :unix_only => true do end it "runs migrations in between the before_migrate and before_symlink steps" do - actual_operations_order.should == %w[before_migrate migration before_symlink before_restart after_restart] + expect(actual_operations_order).to eq(%w[before_migrate migration before_symlink before_restart after_restart]) end end @@ -703,7 +703,7 @@ describe Chef::Resource::DeployRevision, :unix_only => true do end it "should not raise an exception calling File.utime on symlinks" do - lambda { deploy_with_in_repo_symlinks.run_action(:deploy) }.should_not raise_error + expect { deploy_with_in_repo_symlinks.run_action(:deploy) }.not_to raise_error end end @@ -712,16 +712,16 @@ describe Chef::Resource::DeployRevision, :unix_only => true do shared_examples_for "a redeployed application" do it "should redeploy the application" do - File.should be_directory(rel_path("releases")) - File.should be_directory(rel_path("shared")) - File.should be_directory(rel_path("releases/#{latest_rev}")) + expect(File).to be_directory(rel_path("releases")) + expect(File).to be_directory(rel_path("shared")) + expect(File).to be_directory(rel_path("releases/#{latest_rev}")) - File.should be_directory(rel_path("current/tmp")) - File.should be_directory(rel_path("current/config")) - File.should be_directory(rel_path("current/public")) + expect(File).to be_directory(rel_path("current/tmp")) + expect(File).to be_directory(rel_path("current/config")) + expect(File).to be_directory(rel_path("current/public")) - File.should be_symlink(rel_path("current")) - File.readlink(rel_path("current")).should == rel_path("releases/#{latest_rev}") + expect(File).to be_symlink(rel_path("current")) + expect(File.readlink(rel_path("current"))).to eq(rel_path("releases/#{latest_rev}")) end end @@ -758,23 +758,23 @@ describe Chef::Resource::DeployRevision, :unix_only => true do shared_examples_for "a recovered deployment" do it "should redeploy the application" do - File.should be_directory(rel_path("releases")) - File.should be_directory(rel_path("shared")) - File.should be_directory(rel_path("releases/#{latest_rev}")) + expect(File).to be_directory(rel_path("releases")) + expect(File).to be_directory(rel_path("shared")) + expect(File).to be_directory(rel_path("releases/#{latest_rev}")) - File.should be_directory(rel_path("current/tmp")) - File.should be_directory(rel_path("current/config")) - File.should be_directory(rel_path("current/public")) + expect(File).to be_directory(rel_path("current/tmp")) + expect(File).to be_directory(rel_path("current/config")) + expect(File).to be_directory(rel_path("current/public")) - File.should be_symlink(rel_path("current")) - File.readlink(rel_path("current")).should == rel_path("releases/#{latest_rev}") + expect(File).to be_symlink(rel_path("current")) + expect(File.readlink(rel_path("current"))).to eq(rel_path("releases/#{latest_rev}")) # if callbacks ran, we know the app was deployed and not merely rolled # back to a (busted) prior deployment. - callback_order.should == [:before_migrate, + expect(callback_order).to eq([:before_migrate, :before_symlink, :before_restart, - :after_restart ] + :after_restart ]) end end @@ -794,7 +794,7 @@ describe Chef::Resource::DeployRevision, :unix_only => true do context "in the `#{callback}' callback" do before do - lambda { deploy_that_fails.run_action(:deploy) }.should raise_error(Exception, %r{I am a failed deploy}) + expect { deploy_that_fails.run_action(:deploy) }.to raise_error(Exception, %r{I am a failed deploy}) deploy_to_latest_with_callback_tracking.run_action(:deploy) end @@ -820,7 +820,7 @@ describe Chef::Resource::DeployRevision, :unix_only => true do end before do - lambda { deploy_that_fails.run_action(:deploy) }.should raise_error(Chef::Exceptions::Exec) + expect { deploy_that_fails.run_action(:deploy) }.to raise_error(Chef::Exceptions::Exec) deploy_to_latest_with_callback_tracking.run_action(:deploy) end @@ -852,7 +852,7 @@ describe Chef::Resource::DeployRevision, :unix_only => true do end before do - lambda { deploy_that_fails.run_action(:deploy) }.should raise_error(RuntimeError, /network error/) + expect { deploy_that_fails.run_action(:deploy) }.to raise_error(RuntimeError, /network error/) deploy_to_latest_with_callback_tracking.run_action(:deploy) end @@ -868,12 +868,12 @@ describe Chef::Resource::DeployRevision, :unix_only => true do end before do - lambda { deploy_that_fails.run_action(:deploy) }.should raise_error(Exception, %r{I am a failed deploy}) + expect { deploy_that_fails.run_action(:deploy) }.to raise_error(Exception, %r{I am a failed deploy}) deploy_to_latest_rev.run_action(:deploy) end it "removes the unsuccessful deploy after a later successful deploy" do - ::File.should_not exist(File.join(deploy_directory, "releases", previous_rev)) + expect(::File).not_to exist(File.join(deploy_directory, "releases", previous_rev)) end end |