Update bundled bundler to 1.16.0.

  * lib/bundler, spec/bundler: Merge bundler-1.16.0.
  * common.mk: rspec examples of bundler-1.16.0 needs require option.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60603 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 9 deletions

diff --git a/spec/bundler/install/binstubs_spec.rb b/spec/bundler/install/binstubs_spec.rb
index a1a9ab167d..23eb691ab8 100644
--- a/spec/bundler/install/binstubs_spec.rb
+++ b/spec/bundler/install/binstubs_spec.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
-require "spec_helper"
 
-RSpec.describe "bundle install" do
+RSpec.describe "bundle install", :bundler => "< 2" do
   describe "when system_bindir is set" do
     # On OS X, Gem.bindir defaults to /usr/bin, so system_bindir is useful if
     # you want to avoid sudo installs for system gems with OS X's default ruby
@@ -21,7 +20,7 @@ RSpec.describe "bundle install" do
     end
   end
 
-  describe "when multiple gems contain the same exe" do
+  describe "when multiple gems contain the same exe", :bundler => "< 2" do
     before do
       build_repo2 do
         build_gem "fake", "14" do |s|
@@ -36,12 +35,6 @@ RSpec.describe "bundle install" do
       G
     end
 
-    it "prints a deprecation notice" do
-      bundle "config major_deprecations true"
-      gembin("rackup")
-      expect(out).to include("Bundler is using a binstub that was created for a different gem.")
-    end
-
     it "loads the correct spec's executable" do
       gembin("rackup")
       expect(out).to eq("1.2")