summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColby Swandale <colby@taplaboratories.com>2016-11-15 23:04:24 +1100
committerColby Swandale <colby@taplaboratories.com>2016-11-15 23:04:24 +1100
commitbba3f57db42dd0cf064dbcb55e4fb1818d82a415 (patch)
tree64f4099e4db1677cd49374c42461a67852ce5986
parentb3a1be4819f6c6201cef8a4e7c8587da47a821c8 (diff)
downloadbundler-bba3f57db42dd0cf064dbcb55e4fb1818d82a415.tar.gz
fix breaking specs
-rw-r--r--spec/install/deploy_spec.rb8
-rw-r--r--spec/install/path_spec.rb2
-rw-r--r--spec/other/major_deprecation_spec.rb2
3 files changed, 6 insertions, 6 deletions
diff --git a/spec/install/deploy_spec.rb b/spec/install/deploy_spec.rb
index c73cff5e80..02f9983cef 100644
--- a/spec/install/deploy_spec.rb
+++ b/spec/install/deploy_spec.rb
@@ -22,15 +22,15 @@ describe "install with --deployment or --frozen" do
it "disallows --deployment --system" do
bundle "install --deployment --system"
expect(out).to include("You have specified both --deployment")
- expect(out).to include("Please choose.")
+ expect(out).to include("Please choose only one option")
expect(exitstatus).to eq(15) if exitstatus
end
it "disallows --deployment --path --system" do
bundle "install --deployment --path . --system"
- expect(out).to include("You have specified both a path to install your gems to")
- expect(out).to include("You have specified both --deployment")
- expect(out).to include("Please choose.")
+ expect(out).to include("You have specified both --path")
+ expect(out).to include("as well as --system")
+ expect(out).to include("Please choose only one option")
expect(exitstatus).to eq(15) if exitstatus
end
diff --git a/spec/install/path_spec.rb b/spec/install/path_spec.rb
index 03c42f008c..0a961981b3 100644
--- a/spec/install/path_spec.rb
+++ b/spec/install/path_spec.rb
@@ -38,7 +38,7 @@ describe "bundle install" do
it "disallows --path vendor/bundle --system" do
bundle "install --path vendor/bundle --system"
- expect(out).to include("Please choose.")
+ expect(out).to include("Please choose only one option.")
expect(exitstatus).to eq(15) if exitstatus
end
diff --git a/spec/other/major_deprecation_spec.rb b/spec/other/major_deprecation_spec.rb
index 6505023d13..3fc3d06d2a 100644
--- a/spec/other/major_deprecation_spec.rb
+++ b/spec/other/major_deprecation_spec.rb
@@ -97,7 +97,7 @@ describe "major deprecations" do
G
bundle :install, :binstubs => true
- expect(warnings).to have_major_deprecation a_string_including("the --binstubs option will be removed")
+ expect(warnings).to have_major_deprecation a_string_including("The --binstubs option will be removed")
end
end
end