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/other | |
| parent | 00d56bdf66a3aeaadbc84196aacbd8d4e698cf79 (diff) | |
| download | ruby-bb9ecd026a6cadd5d0f85ac061649216806ed935.tar.gz | |
Merge Bundler 2.1.0.pre3 released version
Diffstat (limited to 'spec/bundler/other')
| -rw-r--r-- | spec/bundler/other/major_deprecation_spec.rb | 4 | ||||
| -rw-r--r-- | spec/bundler/other/platform_spec.rb | 4 |
2 files changed, 1 insertions, 7 deletions
diff --git a/spec/bundler/other/major_deprecation_spec.rb b/spec/bundler/other/major_deprecation_spec.rb index 57b68fdb97..f743bccb92 100644 --- a/spec/bundler/other/major_deprecation_spec.rb +++ b/spec/bundler/other/major_deprecation_spec.rb @@ -356,9 +356,7 @@ RSpec.describe "major deprecations" do G ruby <<-RUBY - require 'rubygems' - require 'bundler' - require 'bundler/vendored_thor' + require '#{lib_dir}/bundler' Bundler.setup Bundler.setup diff --git a/spec/bundler/other/platform_spec.rb b/spec/bundler/other/platform_spec.rb index 4feec14d76..8b02505ad8 100644 --- a/spec/bundler/other/platform_spec.rb +++ b/spec/bundler/other/platform_spec.rb @@ -1086,7 +1086,6 @@ G FileUtils.rm(bundled_app("Gemfile.lock")) ruby <<-R - require 'rubygems' require 'bundler/setup' R @@ -1106,7 +1105,6 @@ G FileUtils.rm(bundled_app("Gemfile.lock")) ruby <<-R - require 'rubygems' require 'bundler/setup' R @@ -1127,7 +1125,6 @@ G FileUtils.rm(bundled_app("Gemfile.lock")) ruby <<-R - require 'rubygems' require 'bundler/setup' R @@ -1148,7 +1145,6 @@ G FileUtils.rm(bundled_app("Gemfile.lock")) ruby <<-R - require 'rubygems' require 'bundler/setup' R |