Merge pull request #3460 from keiths-osc/resolver_test_master

Pull request to add tests for issue #3459

2 files changed, 86 insertions, 0 deletions

diff --git a/spec/resolver/basic_spec.rb b/spec/resolver/basic_spec.rb
index 1245898564..5b1748fbaa 100644
--- a/spec/resolver/basic_spec.rb
+++ b/spec/resolver/basic_spec.rb
@@ -62,4 +62,18 @@ describe "Resolving" do
     }.to raise_error(Bundler::CyclicDependencyError, /please remove either gem 'bar' or gem 'foo'/i)
   end
 
+  # Issue #3459
+  it "should install the latest possible version of a direct requirement with no constraints given" do
+    @index = a_complicated_index
+    dep "foo"
+    should_resolve_and_include %w(foo-3.0.5)
+  end
+
+  # Issue #3459
+  it "should install the latest possible version of a direct requirement with constraints given" do
+    @index = a_complicated_index
+    dep "foo", ">= 3.0.0"
+    should_resolve_and_include %w(foo-3.0.5)
+  end
+
 end
diff --git a/spec/support/indexes.rb b/spec/support/indexes.rb
index 5aba3e2133..5b98bf458e 100644
--- a/spec/support/indexes.rb
+++ b/spec/support/indexes.rb
@@ -29,6 +29,14 @@ module Spec
       expect(got).to eq(specs.sort)
     end
 
+    def should_resolve_and_include(specs)
+      got = resolve
+      got = got.map { |s| s.full_name }.sort
+      specs.each do |s|
+        expect(got).to include(s)
+      end
+    end
+
     def should_conflict_on(names)
       begin
         got = resolve
@@ -197,6 +205,70 @@ module Spec
       end
     end
 
+    # Issue #3459
+    def a_complicated_index
+      build_index do
+
+        gem "foo", %w{3.0.0 3.0.5} do
+          dep "qux", ["~> 3.1"]
+          dep "baz", ["< 9.0", ">= 5.0"]
+          dep "bar", ["~> 1.0"]
+          dep "grault", ["~> 3.1"]
+        end
+
+        gem "foo", "1.2.1" do
+          dep "baz", ["~> 4.2"]
+          dep "bar", ["~> 1.0"]
+          dep "qux", ["~> 3.1"]
+          dep "grault", ["~> 2.0"]
+        end
+
+        gem "bar", "1.0.5" do
+          dep "grault", ["~> 3.1"]
+          dep "baz", ["< 9", ">= 4.2"]
+        end
+
+        gem "bar", "1.0.3" do
+          dep "baz", ["< 9", ">= 4.2"]
+          dep "grault", ["~> 2.0"]
+        end
+
+        gem "baz", "8.2.10" do
+          dep "grault", ["~> 3.0"]
+          dep "garply", [">= 0.5.1", "~> 0.5"]
+        end
+
+        gem "baz", "5.0.2" do
+          dep "grault", ["~> 2.0"]
+          dep "garply", [">= 0.3.1"]
+        end
+
+        gem "baz", "4.2.0" do
+          dep "grault", ["~> 2.0"]
+          dep "garply", [">= 0.3.1"]
+        end
+
+        gem "grault", %w{2.6.3 3.1.1}
+
+        gem "garply", "0.5.1" do
+          dep "waldo", ["~> 0.1.3"]
+        end
+
+        gem "waldo", "0.1.5" do
+          dep "plugh", ["~> 0.6.0"]
+        end
+
+        gem "plugh", %w(0.6.3 0.6.11 0.7.0)
+
+        gem "qux", "3.2.21" do
+          dep "plugh", [">= 0.6.4", "~> 0.6"]
+          dep "corge", ["~> 1.0"]
+        end
+
+        gem "corge", "1.10.1"
+      end
+    end
+
     def a_unresovable_child_index
       build_index do
         gem "json", %w(1.8.0)