Add x86 CPU back to MINGW platform, with test for future regression

Closes #822

2 files changed, 32 insertions, 8 deletions

diff --git a/spec/resolver/platform_spec.rb b/spec/resolver/platform_spec.rb
index 13bc4d2bbc..9357f87eb3 100644
--- a/spec/resolver/platform_spec.rb
+++ b/spec/resolver/platform_spec.rb
@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe "Resolving platform craziness" do
-  describe "with semi real cases" do
+  describe "with cross-platform gems" do
     before :each do
       @index = an_awesome_index
     end
@@ -13,14 +13,14 @@ describe "Resolving platform craziness" do
       should_resolve_as %w(nokogiri-1.4.2 nokogiri-1.4.2-java weakling-0.0.3)
     end
 
-    it "doesn't pull gems when it doesn't exist for the current platform" do
+    it "doesn't pull gems that don't exist for the current platform" do
       dep "nokogiri"
       platforms "ruby"
 
       should_resolve_as %w(nokogiri-1.4.2)
     end
 
-    it "doesn't pulls gems when the version is available for all requested platforms" do
+    it "doesn't pull gems when the version is available for all requested platforms" do
       dep "nokogiri"
       platforms "mswin32"
 
@@ -28,6 +28,31 @@ describe "Resolving platform craziness" do
     end
   end
 
+  describe "with mingw32" do
+
+    before :each do
+      @index = build_index do
+        platforms "mingw32 mswin32" do |platform|
+          gem "thin", "1.2.7", platform
+        end
+      end
+    end
+
+    it "finds mswin gems" do
+      # win32 is hardcoded to get CPU x86 in rubygems
+      platforms "mswin32"
+      dep "thin"
+      should_resolve_as %w(thin-1.2.7-x86-mswin32)
+    end
+
+    it "finds mingw gems" do
+      # mingw is _not_ hardcoded to add CPU x86 in rubygems
+      platforms "x86-mingw32"
+      dep "thin"
+      should_resolve_as %w(thin-1.2.7-x86-mingw32)
+    end
+  end
+
   describe "with conflicting cases" do
     before :each do
       @index = build_index do
@@ -47,7 +72,7 @@ describe "Resolving platform craziness" do
       end
     end
 
-    it "does something" do
+    it "reports on the conflict" do
       platforms "ruby", "java"
       dep "foo"
 
diff --git a/spec/support/indexes.rb b/spec/support/indexes.rb
index be5b2072bd..f33501c8b2 100644
--- a/spec/support/indexes.rb
+++ b/spec/support/indexes.rb
@@ -26,7 +26,6 @@ module Spec
     def should_resolve_as(specs)
       got = resolve
       got = got.map { |s| s.full_name }.sort
-
       got.should == specs.sort
     end
 
@@ -88,17 +87,17 @@ module Spec
         end
 
         versions '1.0 1.2 1.2.1 1.2.2 1.3 1.3.0.1 1.3.5 1.4.0 1.4.2 1.4.2.1' do |version|
-          platforms "ruby java mswin32" do |platform|
+          platforms "ruby java mswin32 mingw32" do |platform|
             next if version == v('1.4.2.1') && platform != pl('x86-mswin32')
             next if version == v('1.4.2') && platform == pl('x86-mswin32')
             gem "nokogiri", version, platform do
-              dep "weakling", ">= 0.0.3" if platform =~ 'java'
+              dep "weakling", ">= 0.0.3" if platform =~ pl('java')
             end
           end
         end
 
         versions '0.0.1 0.0.2 0.0.3' do |version|
-          gem "weakling", version #, pl('java')
+          gem "weakling", version
         end
 
         # --- Rails related