diff options
author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2020-12-23 08:45:19 +0900 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2020-12-23 10:17:41 +0900 |
commit | 339227363ce0cf967fa17efa4489d823932ddabd (patch) | |
tree | 576482ce00d03439f2dbf4714a6f309293884c2f /test/rubygems/test_gem_installer.rb | |
parent | 733ed1e18498f97250b788f169c37b170e0cf2b6 (diff) |
Merge RubyGems 3.2.3 and Bundler 2.2.3
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/3982
Diffstat (limited to 'test/rubygems/test_gem_installer.rb')
-rw-r--r-- | test/rubygems/test_gem_installer.rb | 66 |
1 files changed, 6 insertions, 60 deletions
diff --git a/test/rubygems/test_gem_installer.rb b/test/rubygems/test_gem_installer.rb index 0a9a2e38dd..4ce7e92442 100644 --- a/test/rubygems/test_gem_installer.rb +++ b/test/rubygems/test_gem_installer.rb @@ -1172,12 +1172,16 @@ gem 'other', version end def test_install_force + _, missing_dep_gem = util_gem 'missing_dep', '1' do |s| + s.add_dependency 'doesnt_exist', '1' + end + use_ui @ui do - installer = Gem::Installer.at old_ruby_required('= 1.4.6'), :force => true + installer = Gem::Installer.at missing_dep_gem, :force => true installer.install end - gem_dir = File.join(@gemhome, 'gems', 'old_ruby_required-1') + gem_dir = File.join(@gemhome, 'gems', 'missing_dep-1') assert_path_exists gem_dir end @@ -1620,54 +1624,6 @@ gem 'other', version end end - def test_pre_install_checks_ruby_version - use_ui @ui do - installer = Gem::Installer.at old_ruby_required('= 1.4.6') - e = assert_raises Gem::RuntimeRequirementNotMetError do - installer.pre_install_checks - end - rv = Gem.ruby_version - assert_equal "old_ruby_required requires Ruby version = 1.4.6. The current ruby version is #{rv}.", - e.message - end - end - - def test_pre_install_checks_ruby_version_with_prereleases - util_set_RUBY_VERSION '2.6.0', -1, '63539', 'ruby 2.6.0preview2 (2018-05-31 trunk 63539) [x86_64-linux]' - - installer = Gem::Installer.at old_ruby_required('>= 2.6.0.preview2') - assert installer.pre_install_checks - - installer = Gem::Installer.at old_ruby_required('> 2.6.0.preview2') - e = assert_raises Gem::RuntimeRequirementNotMetError do - assert installer.pre_install_checks - end - assert_equal "old_ruby_required requires Ruby version > 2.6.0.preview2. The current ruby version is 2.6.0.preview2.", - e.message - ensure - util_restore_RUBY_VERSION - end - - def test_pre_install_checks_wrong_rubygems_version - spec = util_spec 'old_rubygems_required', '1' do |s| - s.required_rubygems_version = '< 0' - end - - util_build_gem spec - - gem = File.join(@gemhome, 'cache', spec.file_name) - - use_ui @ui do - installer = Gem::Installer.at gem - e = assert_raises Gem::RuntimeRequirementNotMetError do - installer.pre_install_checks - end - rgv = Gem::VERSION - assert_equal "old_rubygems_required requires RubyGems version < 0. The current RubyGems version is #{rgv}. " + - "Try 'gem update --system' to update RubyGems itself.", e.message - end - end - def test_pre_install_checks_malicious_name spec = util_spec '../malicious', '1' def spec.full_name # so the spec is buildable @@ -2252,16 +2208,6 @@ gem 'other', version assert_kind_of(String, installer.gem) end - def old_ruby_required(requirement) - spec = util_spec 'old_ruby_required', '1' do |s| - s.required_ruby_version = requirement - end - - util_build_gem spec - - spec.cache_file - end - def util_execless @spec = util_spec 'z' util_build_gem @spec |