summaryrefslogtreecommitdiff
path: root/spec/install
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2018-08-01 00:26:20 -0700
committerSamuel Giddins <segiddins@segiddins.me>2018-08-06 23:08:02 -0700
commit32222b5e892fc548c59890bd45919fee1959603f (patch)
treeb529ef1ccca6f0e3dfb3f2747ce326415991a22e /spec/install
parent017cc4db7fead17ffb3470d958fc344dae8fad82 (diff)
downloadbundler-32222b5e892fc548c59890bd45919fee1959603f.tar.gz
Make version conflict messages better
Diffstat (limited to 'spec/install')
-rw-r--r--spec/install/gems/resolving_spec.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/spec/install/gems/resolving_spec.rb b/spec/install/gems/resolving_spec.rb
index e58f32836c..844653d494 100644
--- a/spec/install/gems/resolving_spec.rb
+++ b/spec/install/gems/resolving_spec.rb
@@ -142,15 +142,14 @@ RSpec.describe "bundle install with install-time dependencies" do
expect(out).to_not include("Gem::InstallError: require_ruby requires Ruby version > 9000")
nice_error = strip_whitespace(<<-E).strip
- Bundler could not find compatible versions for gem "ruby\0":
+ Bundler found conflicting requirements for the ruby\0 version:
In Gemfile:
ruby\0 (#{error_message_requirement})
require_ruby was resolved to 1.0, which depends on
ruby\0 (> 9000)
- Could not find gem 'ruby\0 (> 9000)', which is required by gem 'require_ruby', in any of the relevant sources:
- the local ruby installation
+ ruby\0 (> 9000), which is required by gem 'require_ruby', is not available in the local ruby installation
E
expect(last_command.bundler_err).to end_with(nice_error)
end