Always add a spec group for all platforms to candidates

2 files changed, 23 insertions, 0 deletions

diff --git a/spec/resolver/platform_spec.rb b/spec/resolver/platform_spec.rb
index 1f39e77117..5949abbecf 100644
--- a/spec/resolver/platform_spec.rb
+++ b/spec/resolver/platform_spec.rb
@@ -84,6 +84,25 @@ RSpec.describe "Resolving platform craziness" do
     should_resolve_as %w[foo-1.1.0]
   end
 
+  it "takes the latest ruby gem if the platform specific gem doesn't match the required_ruby_version with multiple platforms" do
+    @index = build_index do
+      gem "foo", "1.0.0"
+      gem "foo", "1.0.0", "x64-mingw32"
+      gem "foo", "1.1.0" do |s|
+        s.required_ruby_version = [">= 2.0"]
+      end
+      gem "foo", "1.1.0", "x64-mingw32" do |s|
+        s.required_ruby_version = [">= 2.0", "< 2.4"]
+      end
+      gem "Ruby\0", "2.5.1"
+    end
+    dep "foo"
+    dep "Ruby\0", "2.5.1"
+    platforms "x86_64-linux", "x64-mingw32"
+
+    should_resolve_as %w[foo-1.1.0]
+  end
+
   describe "with mingw32" do
     before :each do
       @index = build_index do
diff --git a/spec/support/indexes.rb b/spec/support/indexes.rb
index dc6e0bd1e9..7440523fc9 100644
--- a/spec/support/indexes.rb
+++ b/spec/support/indexes.rb
@@ -26,6 +26,10 @@ module Spec
         end
       end
       source_requirements ||= {}
+      args[0] ||= [] # base
+      args[1] ||= Bundler::GemVersionPromoter.new # gem_version_promoter
+      args[2] ||= [] # additional_base_requirements
+      args[3] ||= @platforms # platforms
       Bundler::Resolver.resolve(deps, @index, source_requirements, *args)
     end