diff options
| author | SHIBATA Hiroshi <hsbt@ruby-lang.org> | 2018-10-16 10:55:32 +0900 |
|---|---|---|
| committer | SHIBATA Hiroshi <hsbt@ruby-lang.org> | 2018-10-16 10:59:02 +0900 |
| commit | 70d6eba05b7e788adf601e8eadeeb247c488ad0e (patch) | |
| tree | cec7beca427ff075111cb23e64eecf79b89988d7 | |
| parent | 27e88538960817a64a510f840c810654f1a7fa3e (diff) | |
| download | bundler-70d6eba05b7e788adf601e8eadeeb247c488ad0e.tar.gz | |
Use helper method instead of hard-code path.
| -rw-r--r-- | spec/runtime/gem_tasks_spec.rb | 4 | ||||
| -rw-r--r-- | spec/support/rubygems_ext.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/runtime/gem_tasks_spec.rb b/spec/runtime/gem_tasks_spec.rb index 5fc87a6d46..1cf808f35b 100644 --- a/spec/runtime/gem_tasks_spec.rb +++ b/spec/runtime/gem_tasks_spec.rb @@ -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 "ruby -S rake -T" + sys_exec "#{rake} -T" end expect(err).to eq("") @@ -37,7 +37,7 @@ RSpec.describe "require 'bundler/gem_tasks'" do it "adds 'pkg' to rake/clean's CLOBBER" do with_gem_path_as(Spec::Path.base_system_gems.to_s) do - sys_exec! %('#{Gem.ruby}' -S rake -e 'load "Rakefile"; puts CLOBBER.inspect') + sys_exec! %(#{rake} -e 'load "Rakefile"; puts CLOBBER.inspect') end expect(last_command.stdout).to eq '["pkg"]' end diff --git a/spec/support/rubygems_ext.rb b/spec/support/rubygems_ext.rb index 806933fe2f..c18f7650fc 100644 --- a/spec/support/rubygems_ext.rb +++ b/spec/support/rubygems_ext.rb @@ -33,7 +33,7 @@ module Spec ENV["BUNDLE_PATH"] = nil ENV["GEM_HOME"] = ENV["GEM_PATH"] = Path.base_system_gems.to_s - ENV["PATH"] = ["#{Path.root}/exe", "#{Path.system_gem_path}/bin", ENV["PATH"]].join(File::PATH_SEPARATOR) + ENV["PATH"] = [Path.bindir, "#{Path.system_gem_path}/bin", ENV["PATH"]].join(File::PATH_SEPARATOR) manifest = DEPS.to_a.sort_by(&:first).map {|k, v| "#{k} => #{v}\n" } manifest_path = "#{Path.base_system_gems}/manifest.txt" |