diff options
| author | The Bundler Bot <bot@bundler.io> | 2017-09-07 21:49:47 +0000 |
|---|---|---|
| committer | SHIBATA Hiroshi <hsbt@ruby-lang.org> | 2017-12-11 20:42:18 +0900 |
| commit | 7b9d2b08fd176918b8b6b224db225994dc0c5611 (patch) | |
| tree | b65706381995ed6d9ed5df724590b303056449aa /spec/runtime | |
| parent | 9fad58f2228df40527c9edec06b0f7ca696264b8 (diff) | |
| download | bundler-7b9d2b08fd176918b8b6b224db225994dc0c5611.tar.gz | |
Auto merge of #6007 - hsbt:use-halper-methods-for-path, r=segiddins
Use helper methods for relative path references in the specs
Ruby core needs to change `Spec::Path.root` and gemspec, bin, spec directories structure.
1. I changed spec directory from `spec` to `spec/bundler` because ruby core has rubyspec files under the `spec/rubyspec`.
2. I changed gemspec location to `bundler.gemspec` to `lib/bundler.gemspec`.
ref. https://bugs.ruby-lang.org/issues/12733#note-15
This pull request make we can modify root, gemspec path to flexible locations. After merging this pull request, I will add directory structure of ruby core repository to only `spec/support/path.rb`
Diffstat (limited to 'spec/runtime')
| -rw-r--r-- | spec/runtime/with_clean_env_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/runtime/with_clean_env_spec.rb b/spec/runtime/with_clean_env_spec.rb index 78eebaff79..b160e5b409 100644 --- a/spec/runtime/with_clean_env_spec.rb +++ b/spec/runtime/with_clean_env_spec.rb @@ -79,7 +79,7 @@ RSpec.describe "Bundler.with_env helpers" do it "should clean up RUBYLIB" do code = "print Bundler.clean_env['RUBYLIB']" - ENV["RUBYLIB"] = File.expand_path("../../../lib", __FILE__) + File::PATH_SEPARATOR + "/foo" + ENV["RUBYLIB"] = root.join("lib").to_s + File::PATH_SEPARATOR + "/foo" result = bundle("exec '#{Gem.ruby}' -e #{code.inspect}") expect(result).to eq("/foo") end |