diff options
| author | Carlhuda <carlhuda@engineyard.com> | 2010-06-16 17:14:06 -0700 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-06-29 14:44:50 -0700 |
| commit | ee100997d6e788a57523147a1b0d8af9ab73ee37 (patch) | |
| tree | 7c710f11d43eea90579936f40be7336833a19aff /spec | |
| parent | f1d7e4fe3c2cb392405ac20fece81a0d74a1971c (diff) | |
| download | bundler-ee100997d6e788a57523147a1b0d8af9ab73ee37.tar.gz | |
Refactor resolver error messages, less code and more consistency
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/install/gems/flex_spec.rb | 5 | ||||
| -rw-r--r-- | spec/other/check_spec.rb | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/spec/install/gems/flex_spec.rb b/spec/install/gems/flex_spec.rb index 75404f5749..07d60f19c0 100644 --- a/spec/install/gems/flex_spec.rb +++ b/spec/install/gems/flex_spec.rb @@ -199,10 +199,11 @@ describe "bundle flex_install" do rack (0.9.1) In Gemfile: - rack-obama (= 2.0) + rack-obama (= 2.0) depends on rack (= 1.2) - Running `bundle update` will try to resolve the conflict between your Gemfile and snapshot. + Running `bundle update` will rebuild your snapshot from scratch, using only + the gems in your Gemfile, which may resolve the conflict. E bundle :install diff --git a/spec/other/check_spec.rb b/spec/other/check_spec.rb index 5b6dd5160a..056af50ad6 100644 --- a/spec/other/check_spec.rb +++ b/spec/other/check_spec.rb @@ -30,9 +30,8 @@ describe "bundle check" do G bundle :check - puts out - out.should include(%{Could not find the gem 'not_here'}) - out.should include(%{required by gem 'missing_dep'}) + out.should include(%{Could not find gem 'not_here'}) + out.should include(%{required by 'missing_dep'}) end it "provides debug information when there is a resolving problem" do |