summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Rodriguez <deivid.rodriguez@riseup.net>2021-10-18 11:31:09 +0200
committergit <svn-admin@ruby-lang.org>2024-06-06 18:44:41 +0000
commit4720b7d257606525def271bfbdbc18fd1bba556a (patch)
treeb18e86aa31706b424956ad62ec3cbd13d44f6252
parentf0d5df733ba90df69048c697623bf8e88de048f0 (diff)
[rubygems/rubygems] The `system_gem_path` helper method already joins internally
https://github.com/rubygems/rubygems/commit/10f2ce1afb
-rw-r--r--spec/bundler/support/helpers.rb2
-rw-r--r--spec/bundler/support/rubygems_ext.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/bundler/support/helpers.rb b/spec/bundler/support/helpers.rb
index 049148fab0..936a411487 100644
--- a/spec/bundler/support/helpers.rb
+++ b/spec/bundler/support/helpers.rb
@@ -124,7 +124,7 @@ module Spec
end
def bundler(cmd, options = {})
- options[:bundle_bin] = system_gem_path.join("bin/bundler")
+ options[:bundle_bin] = system_gem_path("bin/bundler")
bundle(cmd, options)
end
diff --git a/spec/bundler/support/rubygems_ext.rb b/spec/bundler/support/rubygems_ext.rb
index 973044ab94..7748234abc 100644
--- a/spec/bundler/support/rubygems_ext.rb
+++ b/spec/bundler/support/rubygems_ext.rb
@@ -70,7 +70,7 @@ module Spec
ENV["BUNDLE_PATH"] = nil
ENV["GEM_HOME"] = ENV["GEM_PATH"] = Path.base_system_gem_path.to_s
- ENV["PATH"] = [Path.system_gem_path.join("bin"), ENV["PATH"]].join(File::PATH_SEPARATOR)
+ ENV["PATH"] = [Path.system_gem_path("bin"), ENV["PATH"]].join(File::PATH_SEPARATOR)
ENV["PATH"] = [Path.bindir, ENV["PATH"]].join(File::PATH_SEPARATOR) if Path.ruby_core?
end