Use the local platform rather than relying on the platform reported by the spec

Add a spec which fails because of the bug created by the original platform restrictions

1 files changed, 51 insertions, 30 deletions

diff --git a/spec/install/gemfile/gemspec_spec.rb b/spec/install/gemfile/gemspec_spec.rb
index ef658f24..58d846e5 100644
--- a/spec/install/gemfile/gemspec_spec.rb
+++ b/spec/install/gemfile/gemspec_spec.rb
@@ -169,43 +169,64 @@ describe "bundle install from an existing gemspec" do
   context "with a lockfile and some missing dependencies" do
     let(:source_uri) { "http://localgemserver.test" }
 
-    it "should install on JRuby when previously bundled for Ruby" do
-      build_lib("foo", :path => tmp.join("foo")) do |s|
-        s.add_dependency "rack", "=1.0.0"
-        s.platform = "java"
-      end
+    context "previously bundled for Ruby" do
+      let(:platform) { "ruby" }
 
-      gemfile <<-G
-        source "#{source_uri}"
-        gemspec :path => "../foo"
-      G
+      before do
+        build_lib("foo", :path => tmp.join("foo")) do |s|
+          s.add_dependency "rack", "=1.0.0"
+          s.platform = "java" if platform == "java"
+        end
+
+        gemfile <<-G
+          source "#{source_uri}"
+          gemspec :path => "../foo"
+        G
 
-      lockfile <<-L
-        PATH
-          remote: ../foo
-          specs:
-            foo (1.0)
-              rack (= 1.0.0)
+        lockfile <<-L
+          PATH
+            remote: ../foo
+            specs:
+              foo (1.0)
+                rack (= 1.0.0)
 
-        GEM
-          remote: #{source_uri}
-          specs:
-            rack (1.0.0)
+          GEM
+            remote: #{source_uri}
+            specs:
+              rack (1.0.0)
 
-        PLATFORMS
-          #{generic(Gem::Platform.local)}
+          PLATFORMS
+            #{generic(Gem::Platform.local)}
 
-        DEPENDENCIES
-          foo!
+          DEPENDENCIES
+            foo!
 
-        BUNDLED WITH
-           #{Bundler::VERSION}
-      L
+          BUNDLED WITH
+             #{Bundler::VERSION}
+        L
+      end
+
+      context "using JRuby" do
+        let(:platform) { "java" }
+
+        it "should install" do
+          simulate_ruby_engine "jruby" do
+            simulate_platform "java" do
+              results = bundle "install", :artifice => "endpoint"
+              expect(results).to include("Installing rack 1.0.0")
+              should_be_installed "rack 1.0.0"
+            end
+          end
+        end
+      end
 
-      simulate_ruby_engine "jruby" do
-        simulate_platform "java" do
-          bundle "install", :artifice => "endpoint"
-          should_be_installed "rack 1.0.0"
+      context "using Windows" do
+        it "should install" do
+          simulate_windows do
+            results = bundle "install", :artifice => "endpoint"
+            expect(results).to include("Installing rack 1.0.0")
+            should_be_installed "rack 1.0.0"
+          end
         end
       end
     end