Sync Bundler PR #3624

3 files changed, 14 insertions, 11 deletions

diff --git a/spec/bundler/install/gemfile/gemspec_spec.rb b/spec/bundler/install/gemfile/gemspec_spec.rb
index b42587c65f..1c1924cc2a 100644
--- a/spec/bundler/install/gemfile/gemspec_spec.rb
+++ b/spec/bundler/install/gemfile/gemspec_spec.rb
@@ -172,7 +172,7 @@ RSpec.describe "bundle install from an existing gemspec" do
       s.add_dependency "platform_specific"
     end
 
-    system_gems "platform_specific-1.0-java", :path => default_bundle_path, :keep_path => true
+    system_gems "platform_specific-1.0-java", :path => default_bundle_path
 
     install_gemfile! <<-G
       gemspec :path => '#{tmp.join("foo")}'
@@ -420,6 +420,8 @@ RSpec.describe "bundle install from an existing gemspec" do
           end
         end
 
+        bundle "config specific_platform false"
+
         %w[ruby jruby].each do |platform|
           simulate_platform(platform) do
             install_gemfile <<-G
diff --git a/spec/bundler/install/gemfile/git_spec.rb b/spec/bundler/install/gemfile/git_spec.rb
index fd5cde4fb1..6cfab1b89c 100644
--- a/spec/bundler/install/gemfile/git_spec.rb
+++ b/spec/bundler/install/gemfile/git_spec.rb
@@ -1139,7 +1139,7 @@ RSpec.describe "bundle install with git sources" do
       expect(out).to include(Pathname.glob(default_bundle_path("bundler/gems/extensions/**/foo-1.0-*")).first.to_s)
     end
 
-    it "does not use old extension after ref changes", :ruby_repo do
+    it "does not use old extension after ref changes" do
       git_reader = build_git "foo", :no_default => true do |s|
         s.extensions = ["ext/extconf.rb"]
         s.write "ext/extconf.rb", <<-RUBY
diff --git a/spec/bundler/install/gemfile/groups_spec.rb b/spec/bundler/install/gemfile/groups_spec.rb
index 63be1a4e43..4ae4eb1862 100644
--- a/spec/bundler/install/gemfile/groups_spec.rb
+++ b/spec/bundler/install/gemfile/groups_spec.rb
@@ -352,16 +352,17 @@ RSpec.describe "bundle install with groups" do
   describe "when locked and installed with --without" do
     before(:each) do
       build_repo2
-      system_gems "rack-0.9.1" do
-        install_gemfile <<-G, forgotten_command_line_options(:without => "rack")
-          source "#{file_uri_for(gem_repo2)}"
-          gem "rack"
 
-          group :rack do
-            gem "rack_middleware"
-          end
-        G
-      end
+      system_gems "rack-0.9.1"
+
+      install_gemfile <<-G, forgotten_command_line_options(:without => "rack")
+        source "#{file_uri_for(gem_repo2)}"
+        gem "rack"
+
+        group :rack do
+          gem "rack_middleware"
+        end
+      G
     end
 
     it "uses the correct versions even if --without was used on the original" do