From a1a20cfaa2cf73ae8daaf2123d7c5b513427162e Mon Sep 17 00:00:00 2001 From: hsbt Date: Tue, 12 Dec 2017 06:15:44 +0000 Subject: Merge 1-16-stable branch of bundler. It's rc version for bundler-1.16.1. I'm going to update it version after official release from bundler team. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61134 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- spec/bundler/resolver/basic_spec.rb | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'spec/bundler/resolver') diff --git a/spec/bundler/resolver/basic_spec.rb b/spec/bundler/resolver/basic_spec.rb index d5658824ba..623d092644 100644 --- a/spec/bundler/resolver/basic_spec.rb +++ b/spec/bundler/resolver/basic_spec.rb @@ -42,6 +42,13 @@ RSpec.describe "Resolving" do should_resolve_as %w[a-1.0.0 b-2.0.0 c-1.0.0 d-1.0.0] end + it "prefers non-prerelease resolutions in sort order" do + @index = optional_prereleases_index + dep "a" + dep "b" + should_resolve_as %w[a-1.0.0 b-1.5.0] + end + it "resolves a index with root level conflict on child" do @index = a_index_with_root_conflict_on_child dep "i18n", "~> 0.4" -- cgit v1.2.3