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

Prevent JRuby build failure by sending to Kernel.require #492

Merged
merged 2 commits into from
Jan 28, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion lib/rspec/support.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,12 @@ module Support
def self.define_optimized_require_for_rspec(lib, &require_relative)
name = "require_rspec_#{lib}"

if Kernel.respond_to?(:require_relative)
if RUBY_PLATFORM == 'java' && !Kernel.respond_to?(:require)
# JRuby 9.1.17.0 has developed a regression for require
(class << self; self; end).__send__(:define_method, name) do |f|
Kernel.send(:require, "rspec/#{lib}/#{f}")
end
elsif Kernel.respond_to?(:require_relative)
(class << self; self; end).__send__(:define_method, name) do |f|
require_relative.call("#{lib}/#{f}")
end
Expand Down
5 changes: 5 additions & 0 deletions script/update_rubygems_and_install_bundler
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,8 @@ else
gem update --system '2.7.8'
gem install bundler -v '1.17.3'
fi

echo "Setup complete"
ruby -v
gem -v
bundler -v