summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2021-12-04 12:57:00 +0100
committergit <svn-admin@ruby-lang.org>2022-09-29 03:41:50 +0900
commitc7232a2a0a8f754ac566480363cc551d88993792 (patch)
treea2207285a850a34afe5ee31d5f511160e66eb2f2
parentb9c426eaea71628f6d9f57985f16997a2540fa94 (diff)
[rubygems/rubygems] Require bundler consistently
The `$LOAD_PATH` should be properly setup so that the local version is used. https://github.com/rubygems/rubygems/commit/03c0ab4082
-rw-r--r--test/rubygems/helper.rb7
1 files changed, 1 insertions, 6 deletions
diff --git a/test/rubygems/helper.rb b/test/rubygems/helper.rb
index 8c959bae9c..5eae310222 100644
--- a/test/rubygems/helper.rb
+++ b/test/rubygems/helper.rb
@@ -16,12 +16,7 @@ begin
rescue Gem::LoadError
end
-if File.exist?(bundler_gemspec)
- require_relative "../../bundler/lib/bundler"
-else
- require "bundler"
-end
-
+require "bundler"
require "test/unit"
ENV["JARS_SKIP"] = "true" if Gem.java_platform? # avoid unnecessary and noisy `jar-dependencies` post install hook