Merge prepare version of Bundler 2.2.0

1 files changed, 25 insertions, 4 deletions

diff --git a/spec/bundler/update/gems/fund_spec.rb b/spec/bundler/update/gems/fund_spec.rb
index 6d7075b424..0dfe63d36d 100644
--- a/spec/bundler/update/gems/fund_spec.rb
+++ b/spec/bundler/update/gems/fund_spec.rb
@@ -2,9 +2,30 @@
 
 RSpec.describe "bundle update" do
   before do
+    build_repo2 do
+      build_gem "has_funding_and_other_metadata" do |s|
+        s.metadata = {
+          "bug_tracker_uri"   => "https://example.com/user/bestgemever/issues",
+          "changelog_uri"     => "https://example.com/user/bestgemever/CHANGELOG.md",
+          "documentation_uri" => "https://www.example.info/gems/bestgemever/0.0.1",
+          "homepage_uri"      => "https://bestgemever.example.io",
+          "mailing_list_uri"  => "https://groups.example.com/bestgemever",
+          "funding_uri"       => "https://example.com/has_funding_and_other_metadata/funding",
+          "source_code_uri"   => "https://example.com/user/bestgemever",
+          "wiki_uri"          => "https://example.com/user/bestgemever/wiki",
+        }
+      end
+
+      build_gem "has_funding", "1.2.3" do |s|
+        s.metadata = {
+          "funding_uri"       => "https://example.com/has_funding/funding",
+        }
+      end
+    end
+
     gemfile <<-G
-      source "#{file_uri_for(gem_repo1)}"
-      gem 'has_metadata'
+      source "#{file_uri_for(gem_repo2)}"
+      gem 'has_funding_and_other_metadata'
       gem 'has_funding', '< 2.0'
     G
 
@@ -14,8 +35,8 @@ RSpec.describe "bundle update" do
   context "when listed gems are updated" do
     before do
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem 'has_metadata'
+        source "#{file_uri_for(gem_repo2)}"
+        gem 'has_funding_and_other_metadata'
         gem 'has_funding'
       G