summaryrefslogtreecommitdiff
path: root/spec/commands
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2019-10-30 18:23:54 +0100
committerDavid Rodríguez <deivid.rodriguez@riseup.net>2019-11-04 17:49:26 +0100
commit8587a5e8505ea36ab840afc6d47413e44522931e (patch)
tree1d322255720e477af1ca58154a1f8413199b4ccd /spec/commands
parent13ed83f6d40fa30bffa7496d85f0dcd03452f4ed (diff)
downloadbundler-8587a5e8505ea36ab840afc6d47413e44522931e.tar.gz
Rename `lib` to `lib_dir`
For consistency with `spec_dir`.
Diffstat (limited to 'spec/commands')
-rw-r--r--spec/commands/exec_spec.rb6
-rw-r--r--spec/commands/newgem_spec.rb2
2 files changed, 4 insertions, 4 deletions
diff --git a/spec/commands/exec_spec.rb b/spec/commands/exec_spec.rb
index cf76d3fb93..7ae504d360 100644
--- a/spec/commands/exec_spec.rb
+++ b/spec/commands/exec_spec.rb
@@ -89,7 +89,7 @@ RSpec.describe "bundle exec" do
else
require 'tempfile'
io = Tempfile.new("io-test-fd")
- args = %W[#{Gem.ruby} -I#{lib} #{bindir.join("bundle")} exec --keep-file-descriptors #{Gem.ruby} #{command.path} \#{io.to_i}]
+ args = %W[#{Gem.ruby} -I#{lib_dir} #{bindir.join("bundle")} exec --keep-file-descriptors #{Gem.ruby} #{command.path} \#{io.to_i}]
args << { io.to_i => io }
exec(*args)
end
@@ -279,7 +279,7 @@ RSpec.describe "bundle exec" do
G
rubyopt = ENV["RUBYOPT"]
- rubyopt = "-r#{lib}/bundler/setup #{rubyopt}"
+ rubyopt = "-r#{lib_dir}/bundler/setup #{rubyopt}"
bundle "exec 'echo $RUBYOPT'"
expect(out).to have_rubyopts(rubyopt)
@@ -294,7 +294,7 @@ RSpec.describe "bundle exec" do
G
rubylib = ENV["RUBYLIB"]
- rubylib = rubylib.to_s.split(File::PATH_SEPARATOR).unshift lib.to_s
+ rubylib = rubylib.to_s.split(File::PATH_SEPARATOR).unshift lib_dir.to_s
rubylib = rubylib.uniq.join(File::PATH_SEPARATOR)
bundle "exec 'echo $RUBYLIB'"
diff --git a/spec/commands/newgem_spec.rb b/spec/commands/newgem_spec.rb
index 52a6c11972..493d300eb1 100644
--- a/spec/commands/newgem_spec.rb
+++ b/spec/commands/newgem_spec.rb
@@ -181,7 +181,7 @@ RSpec.describe "bundle gem" do
context "when git is not available" do
# This spec cannot have `git` available in the test env
before do
- load_paths = [lib, spec_dir]
+ load_paths = [lib_dir, spec_dir]
load_path_str = "-I#{load_paths.join(File::PATH_SEPARATOR)}"
sys_exec "#{Gem.ruby} #{load_path_str} #{bindir.join("bundle")} gem #{gem_name}", "PATH" => ""