diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2019-11-13 07:57:02 +0900 |
|---|---|---|
| committer | SHIBATA Hiroshi <hsbt@ruby-lang.org> | 2019-11-13 10:19:51 +0900 |
| commit | bb9ecd026a6cadd5d0f85ac061649216806ed935 (patch) | |
| tree | 237975b9702a837fd0a8d24575f1edadb4d773d0 /spec/bundler/runtime | |
| parent | 00d56bdf66a3aeaadbc84196aacbd8d4e698cf79 (diff) | |
Merge Bundler 2.1.0.pre3 released version
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/2674
Diffstat (limited to 'spec/bundler/runtime')
| -rw-r--r-- | spec/bundler/runtime/inline_spec.rb | 2 | ||||
| -rw-r--r-- | spec/bundler/runtime/setup_spec.rb | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/spec/bundler/runtime/inline_spec.rb b/spec/bundler/runtime/inline_spec.rb index e5569fec94..06be2ef83d 100644 --- a/spec/bundler/runtime/inline_spec.rb +++ b/spec/bundler/runtime/inline_spec.rb @@ -115,7 +115,7 @@ RSpec.describe "bundler/inline#gemfile" do it "has an option for quiet installation" do script <<-RUBY, :artifice => "endpoint" - require 'bundler' + require '#{lib_dir}/bundler/inline' gemfile(true, :quiet => true) do source "https://notaserver.com" diff --git a/spec/bundler/runtime/setup_spec.rb b/spec/bundler/runtime/setup_spec.rb index 72ad06a43a..4a754945b7 100644 --- a/spec/bundler/runtime/setup_spec.rb +++ b/spec/bundler/runtime/setup_spec.rb @@ -985,9 +985,7 @@ end build_git "bar", :gemspec => false do |s| s.write "lib/bar/version.rb", %(BAR_VERSION = '1.0') s.write "bar.gemspec", <<-G - lib = File.expand_path('../lib/', __FILE__) - $:.unshift lib unless $:.include?(lib) - require 'bar/version' + require_relative 'lib/bar/version' Gem::Specification.new do |s| s.name = 'bar' |