[rubygems/rubygems] Bump rake version used by tests

And make it easier to update next time.

https://github.com/rubygems/rubygems/commit/1ea4bfa5d8

10 files changed, 35 insertions, 31 deletions

diff --git a/spec/bundler/commands/lock_spec.rb b/spec/bundler/commands/lock_spec.rb
index 7ea7649caa..45582fc7ce 100644
--- a/spec/bundler/commands/lock_spec.rb
+++ b/spec/bundler/commands/lock_spec.rb
@@ -19,7 +19,7 @@ RSpec.describe "bundle lock" do
       c.checksum repo, "activesupport", "2.3.2"
       c.checksum repo, "foo", "1.0"
       c.checksum repo, "rails", "2.3.2"
-      c.checksum repo, "rake", "13.0.1"
+      c.checksum repo, "rake", rake_version
       c.checksum repo, "weakling", "0.0.3"
     end
 
@@ -42,8 +42,8 @@ RSpec.describe "bundle lock" do
             actionpack (= 2.3.2)
             activerecord (= 2.3.2)
             activeresource (= 2.3.2)
-            rake (= 13.0.1)
-          rake (13.0.1)
+            rake (= #{rake_version})
+          rake (#{rake_version})
           weakling (0.0.3)
 
       PLATFORMS
@@ -201,7 +201,7 @@ RSpec.describe "bundle lock" do
       c.checksum repo, "activesupport", "2.3.2"
       c.checksum repo, "foo", "1.0"
       c.checksum repo, "rails", "2.3.2"
-      c.checksum repo, "rake", "13.0.1"
+      c.checksum repo, "rake", rake_version
       c.checksum repo, "weakling", "0.0.3"
     end
 
@@ -224,8 +224,8 @@ RSpec.describe "bundle lock" do
             actionpack (= 2.3.2)
             activerecord (= 2.3.2)
             activeresource (= 2.3.2)
-            rake (= 13.0.1)
-          rake (13.0.1)
+            rake (= #{rake_version})
+          rake (#{rake_version})
           weakling (0.0.3)
 
       PLATFORMS
@@ -245,11 +245,11 @@ RSpec.describe "bundle lock" do
   end
 
   it "update specific gems using --update" do
-    lockfile @lockfile.gsub("2.3.2", "2.3.1").gsub("13.0.1", "10.0.1")
+    lockfile @lockfile.gsub("2.3.2", "2.3.1").gsub(rake_version, "10.0.1")
 
     bundle "lock --update rails rake"
 
-    expect(read_lockfile).to eq(remove_checksums_from_lockfile(@lockfile, "(2.3.2)", "(13.0.1)"))
+    expect(read_lockfile).to eq(remove_checksums_from_lockfile(@lockfile, "(2.3.2)", "(#{rake_version})"))
   end
 
   it "preserves unknown checksum algorithms" do
@@ -315,7 +315,7 @@ RSpec.describe "bundle lock" do
 
     bundle "lock --update rake --verbose"
     expect(out).to match(/Writing lockfile to.+lock/)
-    expect(lockfile).to include("rake (13.0.1)")
+    expect(lockfile).to include("rake (#{rake_version})")
   end
 
   it "errors when updating a missing specific gems using --update" do
@@ -1005,7 +1005,7 @@ RSpec.describe "bundle lock" do
         c.checksum repo, "activesupport", "2.3.2"
         c.checksum repo, "foo", "1.0"
         c.checksum repo, "rails", "2.3.2"
-        c.checksum repo, "rake", "13.0.1"
+        c.checksum repo, "rake", rake_version
         c.checksum repo, "weakling", "0.0.3"
       end
 
@@ -1028,8 +1028,8 @@ RSpec.describe "bundle lock" do
               actionpack (= 2.3.2)
               activerecord (= 2.3.2)
               activeresource (= 2.3.2)
-              rake (= 13.0.1)
-            rake (13.0.1)
+              rake (= #{rake_version})
+            rake (#{rake_version})
             weakling (0.0.3)
 
         PLATFORMS
@@ -1059,7 +1059,7 @@ RSpec.describe "bundle lock" do
         c.checksum repo, "activesupport", "2.3.2"
         c.no_checksum "foo", "2.0"
         c.checksum repo, "rails", "2.3.2"
-        c.checksum repo, "rake", "13.0.1"
+        c.checksum repo, "rake", rake_version
         c.checksum repo, "weakling", "0.0.3"
       end
 
@@ -1082,8 +1082,8 @@ RSpec.describe "bundle lock" do
               actionpack (= 2.3.2)
               activerecord (= 2.3.2)
               activeresource (= 2.3.2)
-              rake (= 13.0.1)
-            rake (13.0.1)
+              rake (= #{rake_version})
+            rake (#{rake_version})
             weakling (0.0.3)
 
         PLATFORMS
diff --git a/spec/bundler/commands/newgem_spec.rb b/spec/bundler/commands/newgem_spec.rb
index 08e28d0cfa..7aafc0e49b 100644
--- a/spec/bundler/commands/newgem_spec.rb
+++ b/spec/bundler/commands/newgem_spec.rb
@@ -456,7 +456,7 @@ RSpec.describe "bundle gem" do
 
     prepare_gemspec(bundled_app("newgem", "newgem.gemspec"))
 
-    gems = ["rake-13.0.1"]
+    gems = ["rake-#{rake_version}"]
     path = Bundler.feature_flag.default_install_uses_path? ? local_gem_path(base: bundled_app("newgem")) : system_gem_path
     system_gems gems, path: path
     bundle "exec rake build", dir: bundled_app("newgem")
@@ -649,7 +649,7 @@ RSpec.describe "bundle gem" do
     it "runs rake without problems" do
       bundle "gem #{gem_name}"
 
-      system_gems ["rake-13.0.1"]
+      system_gems ["rake-#{rake_version}"]
 
       rakefile = <<~RAKEFILE
         task :default do
diff --git a/spec/bundler/commands/show_spec.rb b/spec/bundler/commands/show_spec.rb
index 207ba488bd..2b6d4d2d00 100644
--- a/spec/bundler/commands/show_spec.rb
+++ b/spec/bundler/commands/show_spec.rb
@@ -57,7 +57,7 @@ RSpec.describe "bundle show", bundler: "< 3" do
     it "prints path of all gems in bundle sorted by name" do
       bundle "show --paths"
 
-      expect(out).to include(default_bundle_path("gems", "rake-13.0.1").to_s)
+      expect(out).to include(default_bundle_path("gems", "rake-#{rake_version}").to_s)
       expect(out).to include(default_bundle_path("gems", "rails-2.3.2").to_s)
 
       # Gem names are the last component of their path.
diff --git a/spec/bundler/install/gemfile/gemspec_spec.rb b/spec/bundler/install/gemfile/gemspec_spec.rb
index 91038e00cb..63778567cf 100644
--- a/spec/bundler/install/gemfile/gemspec_spec.rb
+++ b/spec/bundler/install/gemfile/gemspec_spec.rb
@@ -147,7 +147,7 @@ RSpec.describe "bundle install from an existing gemspec" do
     build_lib("foo", path: tmp.join("foo")) do |s|
       s.write("Gemfile", "source '#{file_uri_for(gem_repo1)}'\ngemspec")
       s.add_dependency "actionpack", "=2.3.2"
-      s.add_development_dependency "rake", "=13.0.1"
+      s.add_development_dependency "rake", rake_version
     end
 
     bundle "install", dir: tmp.join("foo")
diff --git a/spec/bundler/install/gemfile/path_spec.rb b/spec/bundler/install/gemfile/path_spec.rb
index 7f11b04408..a57b7ee560 100644
--- a/spec/bundler/install/gemfile/path_spec.rb
+++ b/spec/bundler/install/gemfile/path_spec.rb
@@ -771,12 +771,12 @@ RSpec.describe "bundle install with explicit source paths" do
 
       build_lib "foo", "1.0", path: lib_path("foo") do |s|
         s.add_dependency "rack"
-        s.add_dependency "rake", "13.0.1"
+        s.add_dependency "rake", rake_version
       end
 
       bundle "install"
 
-      checksums.checksum gem_repo1, "rake", "13.0.1"
+      checksums.checksum gem_repo1, "rake", rake_version
 
       expect(lockfile).to eq <<~G
         PATH
@@ -784,13 +784,13 @@ RSpec.describe "bundle install with explicit source paths" do
           specs:
             foo (1.0)
               rack
-              rake (= 13.0.1)
+              rake (= #{rake_version})
 
         GEM
           remote: #{file_uri_for(gem_repo1)}/
           specs:
             rack (0.9.1)
-            rake (13.0.1)
+            rake (#{rake_version})
 
         PLATFORMS
           #{lockfile_platforms}
diff --git a/spec/bundler/install/gems/compact_index_spec.rb b/spec/bundler/install/gems/compact_index_spec.rb
index f3b8bb708d..5004553735 100644
--- a/spec/bundler/install/gems/compact_index_spec.rb
+++ b/spec/bundler/install/gems/compact_index_spec.rb
@@ -1050,7 +1050,7 @@ RSpec.describe "compact index api" do
       source "#{source_uri}"
       gem "rails"
     G
-    deps = [Gem::Dependency.new("rake", "= 13.0.1"),
+    deps = [Gem::Dependency.new("rake", "= #{rake_version}"),
             Gem::Dependency.new("actionpack", "= 2.3.2"),
             Gem::Dependency.new("activerecord", "= 2.3.2"),
             Gem::Dependency.new("actionmailer", "= 2.3.2"),
diff --git a/spec/bundler/lock/lockfile_spec.rb b/spec/bundler/lock/lockfile_spec.rb
index 07c22db36e..8fe2f37054 100644
--- a/spec/bundler/lock/lockfile_spec.rb
+++ b/spec/bundler/lock/lockfile_spec.rb
@@ -873,7 +873,7 @@ RSpec.describe "the lockfile format" do
       c.checksum gem_repo2, "activeresource", "2.3.2"
       c.checksum gem_repo2, "activesupport", "2.3.2"
       c.checksum gem_repo2, "rails", "2.3.2"
-      c.checksum gem_repo2, "rake", "13.0.1"
+      c.checksum gem_repo2, "rake", rake_version
     end
 
     expect(lockfile).to eq <<~G
@@ -894,8 +894,8 @@ RSpec.describe "the lockfile format" do
             actionpack (= 2.3.2)
             activerecord (= 2.3.2)
             activeresource (= 2.3.2)
-            rake (= 13.0.1)
-          rake (13.0.1)
+            rake (= #{rake_version})
+          rake (#{rake_version})
 
       PLATFORMS
         #{lockfile_platforms}
diff --git a/spec/bundler/runtime/inline_spec.rb b/spec/bundler/runtime/inline_spec.rb
index 298fee8867..8ee79e3fad 100644
--- a/spec/bundler/runtime/inline_spec.rb
+++ b/spec/bundler/runtime/inline_spec.rb
@@ -421,11 +421,11 @@ RSpec.describe "bundler/inline#gemfile" do
     script <<-RUBY
       gemfile(true) do
         source "#{file_uri_for(gem_repo1)}"
-        gem "rake", "~> 13.0"
+        gem "rake", "#{rake_version}"
       end
     RUBY
 
-    expect(out).to include("Installing rake 13.0")
+    expect(out).to include("Installing rake #{rake_version}")
     expect(out).not_to include("was 11.3.0")
     expect(err).to be_empty
   end
diff --git a/spec/bundler/runtime/setup_spec.rb b/spec/bundler/runtime/setup_spec.rb
index 39897a38d6..ba53f3b1db 100644
--- a/spec/bundler/runtime/setup_spec.rb
+++ b/spec/bundler/runtime/setup_spec.rb
@@ -158,7 +158,7 @@ RSpec.describe "Bundler.setup" do
         "/gems/actionpack-2.3.2/lib",
         "/gems/actionmailer-2.3.2/lib",
         "/gems/activesupport-2.3.2/lib",
-        "/gems/rake-13.0.1/lib"
+        "/gems/rake-#{rake_version}/lib"
       )
     end
 
diff --git a/spec/bundler/support/builders.rb b/spec/bundler/support/builders.rb
index d36c5d4717..1763e091fe 100644
--- a/spec/bundler/support/builders.rb
+++ b/spec/bundler/support/builders.rb
@@ -17,6 +17,10 @@ module Spec
       Gem::Platform.new(platform)
     end
 
+    def rake_version
+      "13.1.0"
+    end
+
     def build_repo1
       rake_path = Dir["#{Path.base_system_gems}/**/rake*.gem"].first
 
@@ -49,7 +53,7 @@ module Spec
 
         build_gem "rails", "2.3.2" do |s|
           s.executables = "rails"
-          s.add_dependency "rake",           "13.0.1"
+          s.add_dependency "rake",           rake_version
           s.add_dependency "actionpack",     "2.3.2"
           s.add_dependency "activerecord",   "2.3.2"
           s.add_dependency "actionmailer",   "2.3.2"