Merge RubyGems and Bundler master

2 files changed, 4 insertions, 12 deletions

diff --git a/spec/bundler/install/gemfile/groups_spec.rb b/spec/bundler/install/gemfile/groups_spec.rb
index c92b5dcc57..734e012e84 100644
--- a/spec/bundler/install/gemfile/groups_spec.rb
+++ b/spec/bundler/install/gemfile/groups_spec.rb
@@ -91,17 +91,8 @@ RSpec.describe "bundle install with groups" do
         expect(the_bundle).to include_gems "rack 1.0.0", :groups => [:default]
       end
 
-      it "respects global `without` configuration, and saves it locally", :bundler => "< 3" do
-        bundle "config set without emo"
-        bundle :install
-        expect(the_bundle).to include_gems "rack 1.0.0", :groups => [:default]
-        bundle "config list"
-        expect(out).to include("Set for your local app (#{bundled_app(".bundle/config")}): [:emo]")
-        expect(out).to include("Set for the current user (#{home(".bundle/config")}): [:emo]")
-      end
-
-      it "respects global `without` configuration, but does not save it locally", :bundler => "3" do
-        bundle "config set without emo"
+      it "respects global `without` configuration, but does not save it locally" do
+        bundle "config set --global without emo"
         bundle :install
         expect(the_bundle).to include_gems "rack 1.0.0", :groups => [:default]
         bundle "config list"
diff --git a/spec/bundler/install/gems/standalone_spec.rb b/spec/bundler/install/gems/standalone_spec.rb
index 0c77e883df..c7efc836a8 100644
--- a/spec/bundler/install/gems/standalone_spec.rb
+++ b/spec/bundler/install/gems/standalone_spec.rb
@@ -120,8 +120,9 @@ RSpec.shared_examples "bundle install --standalone" do
 
       realworld_system_gems "tsort --version 0.1.0"
 
-      necessary_system_gems = ["optparse --version 0.1.1", "psych --version 3.3.2", "yaml --version 0.1.1", "logger --version 1.4.3", "etc --version 1.2.0", "stringio --version 3.0.0"]
+      necessary_system_gems = ["optparse --version 0.1.1", "psych --version 3.3.2", "logger --version 1.4.3", "etc --version 1.2.0", "stringio --version 3.0.0"]
       necessary_system_gems += ["shellwords --version 0.1.0", "base64 --version 0.1.0", "resolv --version 0.2.1"] if Gem.rubygems_version < Gem::Version.new("3.3.a")
+      necessary_system_gems += ["yaml --version 0.1.1"] if Gem.rubygems_version < Gem::Version.new("3.4.a")
       realworld_system_gems(*necessary_system_gems, :path => scoped_gem_path(bundled_app("bundle")))
 
       build_gem "foo", "1.0.0", :to_system => true, :default => true do |s|