summaryrefslogtreecommitdiff
path: root/spec/bundler
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2019-08-03 14:06:58 +0200
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2019-08-17 17:08:49 +0900
commitef2d4158028ab253fbd4b27d3cd3ffb4df5bffb7 (patch)
treed2818a3b9382e07c9a26e089b26c06099b1c1f43 /spec/bundler
parent7664b5cb6549d09935c4bf0fe67392708a9c19c2 (diff)
[bundler/bundler] Remove duplicated method
https://github.com/bundler/bundler/commit/afdacd62ac
Diffstat (limited to 'spec/bundler')
-rw-r--r--spec/bundler/commands/exec_spec.rb2
-rw-r--r--spec/bundler/runtime/gem_tasks_spec.rb4
-rw-r--r--spec/bundler/runtime/setup_spec.rb2
-rw-r--r--spec/bundler/support/path.rb4
4 files changed, 4 insertions, 8 deletions
diff --git a/spec/bundler/commands/exec_spec.rb b/spec/bundler/commands/exec_spec.rb
index bb13b1b086..7faaad1c81 100644
--- a/spec/bundler/commands/exec_spec.rb
+++ b/spec/bundler/commands/exec_spec.rb
@@ -299,7 +299,7 @@ RSpec.describe "bundle exec" do
G
rubylib = ENV["RUBYLIB"]
- rubylib = rubylib.to_s.split(File::PATH_SEPARATOR).unshift bundler_path.to_s
+ rubylib = rubylib.to_s.split(File::PATH_SEPARATOR).unshift lib.to_s
rubylib = rubylib.uniq.join(File::PATH_SEPARATOR)
bundle "exec 'echo $RUBYLIB'"
diff --git a/spec/bundler/runtime/gem_tasks_spec.rb b/spec/bundler/runtime/gem_tasks_spec.rb
index eb9db56ead..af645c8ef1 100644
--- a/spec/bundler/runtime/gem_tasks_spec.rb
+++ b/spec/bundler/runtime/gem_tasks_spec.rb
@@ -11,7 +11,7 @@ RSpec.describe "require 'bundler/gem_tasks'" do
end
bundled_app("Rakefile").open("w") do |f|
f.write <<-RAKEFILE
- $:.unshift("#{bundler_path}")
+ $:.unshift("#{lib}")
require "bundler/gem_tasks"
RAKEFILE
end
@@ -19,7 +19,7 @@ RSpec.describe "require 'bundler/gem_tasks'" do
it "includes the relevant tasks" do
with_gem_path_as(Spec::Path.base_system_gems.to_s) do
- sys_exec "#{rake} -T", "RUBYOPT" => "-I#{bundler_path}"
+ sys_exec "#{rake} -T", "RUBYOPT" => "-I#{lib}"
end
expect(err).to eq("")
diff --git a/spec/bundler/runtime/setup_spec.rb b/spec/bundler/runtime/setup_spec.rb
index 866f4862c5..748bbcbf23 100644
--- a/spec/bundler/runtime/setup_spec.rb
+++ b/spec/bundler/runtime/setup_spec.rb
@@ -114,7 +114,7 @@ RSpec.describe "Bundler.setup" do
def clean_load_path(lp)
without_bundler_load_path = ruby!("puts $LOAD_PATH").split("\n")
lp -= without_bundler_load_path
- lp.map! {|p| p.sub(/^#{Regexp.union system_gem_path.to_s, default_bundle_path.to_s, bundler_path.to_s}/i, "") }
+ lp.map! {|p| p.sub(/^#{Regexp.union system_gem_path.to_s, default_bundle_path.to_s, lib.to_s}/i, "") }
end
it "puts loaded gems after -I and RUBYLIB", :ruby_repo do
diff --git a/spec/bundler/support/path.rb b/spec/bundler/support/path.rb
index b722ec498b..7956c77800 100644
--- a/spec/bundler/support/path.rb
+++ b/spec/bundler/support/path.rb
@@ -104,10 +104,6 @@ module Spec
tmp("libs", *args)
end
- def bundler_path
- root.join("lib")
- end
-
def global_plugin_gem(*args)
home ".bundle", "plugin", "gems", *args
end