admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Fix tests.

Browse Source
This commit is contained in:
Markus Reiter 2016-11-29 11:04:45 +01:00
parent e0b93f1537
commit 0a6cecbaf8
6 changed files with 57 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/cask/spec/cask/artifact/binary_spec.rb
View File

@ -26,9 +26,11 @@ describe Hbc::Artifact::Binary do
it "avoids clobbering an existing binary by linking over it" do
FileUtils.touch expected_path
shutup do
Hbc::Artifact::Binary.new(cask).install_phase
end
expect {
shutup do
Hbc::Artifact::Binary.new(cask).install_phase
end
}.to raise_error(Hbc::CaskError)
expect(expected_path).not_to be :symlink?
end

6
Library/Homebrew/cask/test/cask/artifact/alt_target_test.rb
View File

@ -69,9 +69,9 @@ describe Hbc::Artifact::App do
it "avoids clobbering an existing app by moving over it" do
target_path.mkpath
install_phase.must_output <<-EOS.undent
==> It seems there is already an App at '#{target_path}'; not moving.
EOS
err = install_phase.must_raise(Hbc::CaskError)
err.message.must_equal("It seems there is already an App at '#{target_path}'.")
source_path.must_be :directory?
target_path.must_be :directory?

39
Library/Homebrew/cask/test/cask/artifact/app_test.rb
View File

@ -71,9 +71,9 @@ describe Hbc::Artifact::App do
end
it "avoids clobbering an existing app" do
install_phase.must_output <<-EOS.undent
==> It seems there is already an App at '#{target_path}'; not moving.
EOS
err = install_phase.must_raise(Hbc::CaskError)
err.message.must_equal("It seems there is already an App at '#{target_path}'.")
source_path.must_be :directory?
target_path.must_be :directory?
@ -92,12 +92,17 @@ describe Hbc::Artifact::App do
describe "target is both writable and user-owned" do
it "overwrites the existing app" do
install_phase.must_output <<-EOS.undent
==> It seems there is already an App at '#{target_path}'; overwriting.
stdout = <<-EOS.undent
==> Removing App: '#{target_path}'
==> Moving App 'Caffeine.app' to '#{target_path}'
EOS
stderr = <<-EOS.undent
Warning: It seems there is already an App at '#{target_path}'; overwriting.
EOS
install_phase.must_output(stdout, stderr)
source_path.wont_be :exist?
target_path.must_be :directory?
@ -131,12 +136,17 @@ describe Hbc::Artifact::App do
command.expect_and_pass_through(chmod_cmd)
command.expect_and_pass_through(chmod_n_cmd)
install_phase.must_output <<-EOS.undent
==> It seems there is already an App at '#{target_path}'; overwriting.
stdout = <<-EOS.undent
==> Removing App: '#{target_path}'
==> Moving App 'Caffeine.app' to '#{target_path}'
EOS
stderr = <<-EOS.undent
Warning: It seems there is already an App at '#{target_path}'; overwriting.
EOS
install_phase.must_output(stdout, stderr)
source_path.wont_be :exist?
target_path.must_be :directory?
@ -161,9 +171,9 @@ describe Hbc::Artifact::App do
end
it "leaves the target alone" do
install_phase.must_output <<-EOS.undent
==> It seems there is already an App at '#{target_path}'; not moving.
EOS
err = install_phase.must_raise(Hbc::CaskError)
err.message.must_equal("It seems there is already an App at '#{target_path}'.")
File.symlink?(target_path).must_equal true
end
@ -172,12 +182,17 @@ describe Hbc::Artifact::App do
let(:force) { true }
it "overwrites the existing app" do
install_phase.must_output <<-EOS.undent
==> It seems there is already an App at '#{target_path}'; overwriting.
stdout = <<-EOS.undent
==> Removing App: '#{target_path}'
==> Moving App 'Caffeine.app' to '#{target_path}'
EOS
stderr = <<-EOS.undent
Warning: It seems there is already an App at '#{target_path}'; overwriting.
EOS
install_phase.must_output(stdout, stderr)
source_path.wont_be :exist?
target_path.must_be :directory?

6
Library/Homebrew/cask/test/cask/artifact/generic_artifact_test.rb
View File

@ -34,8 +34,10 @@ describe Hbc::Artifact::Artifact do
it "avoids clobbering an existing artifact" do
target_path.mkpath
shutup do
install_phase.call
assert_raises Hbc::CaskError do
shutup do
install_phase.call
end
end
source_path.must_be :directory?

6
Library/Homebrew/cask/test/cask/artifact/suite_test.rb
View File

@ -33,8 +33,10 @@ describe Hbc::Artifact::Suite do
it "avoids clobbering an existing suite by moving over it" do
target_path.mkpath
shutup do
install_phase.call
assert_raises Hbc::CaskError do
shutup do
install_phase.call
end
end
source_path.must_be :directory?

22
Library/Homebrew/cask/test/cask/artifact/two_apps_correct_test.rb
View File

@ -64,10 +64,13 @@ describe Hbc::Artifact::App do
it "when the first app of two already exists" do
target_path_mini.mkpath
install_phase.must_output <<-EOS.undent
==> It seems there is already an App at '#{target_path_mini}'; not moving.
==> Moving App 'Caffeine Pro.app' to '#{target_path_pro}'
EOS
err = assert_raises Hbc::CaskError do
install_phase.must_output <<-EOS.undent
==> Moving App 'Caffeine Pro.app' to '#{target_path_pro}'
EOS
end
err.message.must_equal("It seems there is already an App at '#{target_path_mini}'.")
source_path_mini.must_be :directory?
target_path_mini.must_be :directory?
@ -77,10 +80,13 @@ describe Hbc::Artifact::App do
it "when the second app of two already exists" do
target_path_pro.mkpath
install_phase.must_output <<-EOS.undent
==> Moving App 'Caffeine Mini.app' to '#{target_path_mini}'
==> It seems there is already an App at '#{target_path_pro}'; not moving.
EOS
err = assert_raises Hbc::CaskError do
install_phase.must_output <<-EOS.undent
==> Moving App 'Caffeine Mini.app' to '#{target_path_mini}'
EOS
end
err.message.must_equal("It seems there is already an App at '#{target_path_pro}'.")
source_path_pro.must_be :directory?
target_path_pro.must_be :directory?