Skip to content
This repository was archived by the owner on Nov 30, 2024. It is now read-only.

Commit b39cedd

Browse files
committed
Merge pull request #492 from rspec/bugfix-for-jruby
Prevent JRuby build failure by sending to Kernel.require
1 parent 50a4555 commit b39cedd

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

lib/rspec/support.rb

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,12 @@ module Support
1414
def self.define_optimized_require_for_rspec(lib, &require_relative)
1515
name = "require_rspec_#{lib}"
1616

17-
if Kernel.respond_to?(:require_relative)
17+
if RUBY_PLATFORM == 'java' && !Kernel.respond_to?(:require)
18+
# JRuby 9.1.17.0 has developed a regression for require
19+
(class << self; self; end).__send__(:define_method, name) do |f|
20+
Kernel.send(:require, "rspec/#{lib}/#{f}")
21+
end
22+
elsif Kernel.respond_to?(:require_relative)
1823
(class << self; self; end).__send__(:define_method, name) do |f|
1924
require_relative.call("#{lib}/#{f}")
2025
end

script/update_rubygems_and_install_bundler

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,8 @@ else
1313
gem update --system '2.7.8'
1414
gem install bundler -v '1.17.3'
1515
fi
16+
17+
echo "Setup complete"
18+
ruby -v
19+
gem -v
20+
bundler -v

0 commit comments

Comments
 (0)