Skip to content

Commit 3a57032

Browse files
hsbtdeivid-rodriguez
authored andcommitted
Merge pull request #7388 from rubygems/support-ruby-head
Support Ruby 3.4 (cherry picked from commit 65b670b)
1 parent 94c7870 commit 3a57032

File tree

5 files changed

+5
-3
lines changed

5 files changed

+5
-3
lines changed

bundler/spec/support/artifice/endpoint_500.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
require_relative "../path"
44

5-
$LOAD_PATH.unshift(*Dir[Spec::Path.base_system_gem_path.join("gems/{mustermann,rack,tilt,sinatra,ruby2_keywords}-*/lib")].map(&:to_s))
5+
$LOAD_PATH.unshift(*Dir[Spec::Path.base_system_gem_path.join("gems/{mustermann,rack,tilt,sinatra,ruby2_keywords,base64}-*/lib")].map(&:to_s))
66

77
require "sinatra/base"
88

bundler/spec/support/artifice/helpers/endpoint.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
require_relative "../../path"
44

5-
$LOAD_PATH.unshift(*Dir[Spec::Path.base_system_gem_path.join("gems/{mustermann,rack,tilt,sinatra,ruby2_keywords}-*/lib")].map(&:to_s))
5+
$LOAD_PATH.unshift(*Dir[Spec::Path.base_system_gem_path.join("gems/{mustermann,rack,tilt,sinatra,ruby2_keywords,base64}-*/lib")].map(&:to_s))
66

77
require "sinatra/base"
88

bundler/spec/support/artifice/windows.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
require_relative "../path"
44

5-
$LOAD_PATH.unshift(*Dir[Spec::Path.base_system_gem_path.join("gems/{mustermann,rack,tilt,sinatra,ruby2_keywords}-*/lib")].map(&:to_s))
5+
$LOAD_PATH.unshift(*Dir[Spec::Path.base_system_gem_path.join("gems/{mustermann,rack,tilt,sinatra,ruby2_keywords,base64}-*/lib")].map(&:to_s))
66

77
require "sinatra/base"
88

tool/bundler/test_gems.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
source "https://rubygems.org"
44

55
gem "rack", "~> 2.0"
6+
gem "base64"
67
gem "webrick", "1.7.0"
78
gem "rack-test", "~> 1.1"
89
gem "compact_index", "~> 0.15.0"

tool/bundler/test_gems.rb.lock

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ PLATFORMS
3737
x86_64-linux
3838

3939
DEPENDENCIES
40+
base64
4041
builder (~> 3.2)
4142
compact_index (~> 0.15.0)
4243
rack (~> 2.0)

0 commit comments

Comments
 (0)