summaryrefslogtreecommitdiff
path: root/spec/other
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2017-06-21 13:33:52 -0500
committerSamuel Giddins <segiddins@segiddins.me>2017-06-23 12:43:54 -0500
commitde775593ffc43e97e3d5adec3837a1eee4c3b74b (patch)
tree2ec3cd9f8375c4c16982e80e486bb7dfa662a99d /spec/other
parent87370195728549ed989ca8b63bf6bd30b1702819 (diff)
downloadbundler-de775593ffc43e97e3d5adec3837a1eee4c3b74b.tar.gz
Get the specs passing in 1.0 mode
Diffstat (limited to 'spec/other')
-rw-r--r--spec/other/cli_dispatch_spec.rb8
-rw-r--r--spec/other/major_deprecation_spec.rb8
2 files changed, 8 insertions, 8 deletions
diff --git a/spec/other/cli_dispatch_spec.rb b/spec/other/cli_dispatch_spec.rb
index 12f5a3ea1a..05d313ef2b 100644
--- a/spec/other/cli_dispatch_spec.rb
+++ b/spec/other/cli_dispatch_spec.rb
@@ -3,14 +3,14 @@
RSpec.describe "bundle command names" do
it "work when given fully" do
bundle "install"
- expect(err).to eq("Could not locate Gemfile")
- expect(out).not_to include("Ambiguous command")
+ expect(last_command.bundler_err).to eq("Could not locate Gemfile")
+ expect(last_command.stdboth).not_to include("Ambiguous command")
end
it "work when not ambiguous" do
bundle "ins"
- expect(err).to eq("Could not locate Gemfile")
- expect(out).not_to include("Ambiguous command")
+ expect(last_command.bundler_err).to eq("Could not locate Gemfile")
+ expect(last_command.stdboth).not_to include("Ambiguous command")
end
it "print a friendly error when ambiguous" do
diff --git a/spec/other/major_deprecation_spec.rb b/spec/other/major_deprecation_spec.rb
index e2d570ca44..d79a9b6392 100644
--- a/spec/other/major_deprecation_spec.rb
+++ b/spec/other/major_deprecation_spec.rb
@@ -34,7 +34,7 @@ RSpec.describe "major deprecations", :bundler => "< 2" do
describe "bundle_ruby" do
it "prints a deprecation" do
bundle_ruby
- out.gsub! "\nruby #{RUBY_VERSION}", ""
+ warnings.gsub! "\nruby #{RUBY_VERSION}", ""
expect(warnings).to have_major_deprecation "the bundle_ruby executable has been removed in favor of `bundle platform --ruby`"
end
end
@@ -255,14 +255,14 @@ The :bitbucket git source is deprecated, and will be removed in Bundler 2.0. Add
context "bundle list" do
it "prints a deprecation warning" do
- install_gemfile <<-G
+ install_gemfile! <<-G
source "file://#{gem_repo1}"
gem "rack"
G
- bundle :list
+ bundle! :list
- out.gsub!(/gems included.*?\[DEPRECATED/im, "[DEPRECATED")
+ warnings.gsub!(/gems included.*?\[DEPRECATED/im, "[DEPRECATED")
expect(warnings).to have_major_deprecation("use `bundle show` instead of `bundle list`")
end