diff options
author | Samuel Giddins <segiddins@segiddins.me> | 2017-07-25 18:10:26 -0500 |
---|---|---|
committer | Samuel Giddins <segiddins@segiddins.me> | 2017-08-01 10:07:20 -0500 |
commit | cf65fd8532c28e45263f9c96a5ee2b4086a440dd (patch) | |
tree | d3ee452fd9eb2642827fa0ba40467243f4190c6e /spec/resolver | |
parent | 8f71257ef092b389465f3a56f5a344d62fb234b7 (diff) | |
download | bundler-cf65fd8532c28e45263f9c96a5ee2b4086a440dd.tar.gz |
Update conservative update specs for being able to revert to the locked resolution
Diffstat (limited to 'spec/resolver')
-rw-r--r-- | spec/resolver/basic_spec.rb | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/spec/resolver/basic_spec.rb b/spec/resolver/basic_spec.rb index c118c103f2..23ff0a8b5d 100644 --- a/spec/resolver/basic_spec.rb +++ b/spec/resolver/basic_spec.rb @@ -242,10 +242,8 @@ Bundler could not find compatible versions for gem "a": end it "cannot revert to a previous version in strict mode level patch" do - # the strict option removes the version required to match, so a version conflict results - expect do - should_conservative_resolve_and_include [:patch, :strict], [], %w[foo-1.4.3 bar-2.1.1] - end.to raise_error Bundler::VersionConflict, a_string_including("Could not find gem 'bar (~> 2.1.0)'") + # fall back to the locked resolution since strict means we can't regress either version + should_conservative_resolve_and_include [:patch, :strict], [], %w[foo-1.4.3 bar-2.2.3] end it "could revert to a previous version level minor" do @@ -253,10 +251,8 @@ Bundler could not find compatible versions for gem "a": end it "cannot revert to a previous version in strict mode level minor" do - # the strict option removes the version required to match, so a version conflict results - expect do - should_conservative_resolve_and_include [:minor, :strict], [], %w[foo-1.4.3 bar-2.1.1] - end.to raise_error Bundler::VersionConflict, a_string_including("Could not find gem 'bar (~> 2.0.0)'") + # fall back to the locked resolution since strict means we can't regress either version + should_conservative_resolve_and_include [:minor, :strict], [], %w[foo-1.4.3 bar-2.2.3] end end end |