diff options
author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2021-03-08 12:17:52 +0900 |
---|---|---|
committer | NARUSE, Yui <nurse@users.noreply.github.com> | 2021-03-11 17:24:52 +0900 |
commit | 7efc7afcae6720e1af7ab49986d789b6f9d6fe0a (patch) | |
tree | cfc13bbb77911924b689147c74947ec0850eded1 /test/rubygems | |
parent | 06cd5711e0afc6302052e847863a7fdcc42fe692 (diff) |
Merge RubyGems-3.2.13 and Bundler-2.2.13
Diffstat (limited to 'test/rubygems')
-rw-r--r-- | test/rubygems/test_gem.rb | 10 | ||||
-rw-r--r-- | test/rubygems/test_gem_platform.rb | 29 |
2 files changed, 31 insertions, 8 deletions
diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb index 1c6d790b25..8b028d3495 100644 --- a/test/rubygems/test_gem.rb +++ b/test/rubygems/test_gem.rb @@ -1958,15 +1958,9 @@ class TestGem < Gem::TestCase io.write 'gem "a"' end - platform = Bundler::GemHelpers.generic_local_platform - if platform == Gem::Platform::RUBY - platform = '' - else - platform = " #{platform}" - end - expected = <<-EXPECTED -Could not find gem 'a#{platform}' in any of the gem sources listed in your Gemfile. +Could not find gem 'a' in locally installed gems. +The source does not contain any versions of 'a' You may need to `gem install -g` to install missing gems EXPECTED diff --git a/test/rubygems/test_gem_platform.rb b/test/rubygems/test_gem_platform.rb index 84754402ad..ad7285c082 100644 --- a/test/rubygems/test_gem_platform.rb +++ b/test/rubygems/test_gem_platform.rb @@ -134,7 +134,9 @@ class TestGemPlatform < Gem::TestCase 'i386-solaris2.8' => ['x86', 'solaris', '2.8'], 'mswin32' => ['x86', 'mswin32', nil], 'x86_64-linux' => ['x86_64', 'linux', nil], + 'x86_64-linux-gnu' => ['x86_64', 'linux', nil], 'x86_64-linux-musl' => ['x86_64', 'linux', 'musl'], + 'x86_64-linux-uclibc' => ['x86_64', 'linux', 'uclibc'], 'x86_64-openbsd3.9' => ['x86_64', 'openbsd', '3.9'], 'x86_64-openbsd4.0' => ['x86_64', 'openbsd', '4.0'], 'x86_64-openbsd' => ['x86_64', 'openbsd', nil], @@ -143,6 +145,7 @@ class TestGemPlatform < Gem::TestCase test_cases.each do |arch, expected| platform = Gem::Platform.new arch assert_equal expected, platform.to_a, arch.inspect + assert_equal expected, Gem::Platform.new(platform.to_s).to_a, arch.inspect end end @@ -261,6 +264,32 @@ class TestGemPlatform < Gem::TestCase assert((with_x86_arch === with_nil_arch), 'x86 =~ nil') end + def test_nil_version_is_treated_as_any_version + x86_darwin_8 = Gem::Platform.new 'i686-darwin8.0' + x86_darwin_nil = Gem::Platform.new 'i686-darwin' + + assert((x86_darwin_8 === x86_darwin_nil), '8.0 =~ nil') + assert((x86_darwin_nil === x86_darwin_8), 'nil =~ 8.0') + end + + def test_nil_version_is_stricter_for_linux_os + x86_linux = Gem::Platform.new 'i686-linux' + x86_linux_gnu = Gem::Platform.new 'i686-linux-gnu' + x86_linux_musl = Gem::Platform.new 'i686-linux-musl' + x86_linux_uclibc = Gem::Platform.new 'i686-linux-uclibc' + + assert((x86_linux === x86_linux_gnu), 'linux =~ linux-gnu') + assert((x86_linux_gnu === x86_linux), 'linux-gnu =~ linux') + assert(!(x86_linux_gnu === x86_linux_musl), 'linux-gnu =~ linux-musl') + assert(!(x86_linux_musl === x86_linux_gnu), 'linux-musl =~ linux-gnu') + assert(!(x86_linux_uclibc === x86_linux_musl), 'linux-uclibc =~ linux-musl') + assert(!(x86_linux_musl === x86_linux_uclibc), 'linux-musl =~ linux-uclibc') + assert(!(x86_linux === x86_linux_musl), 'linux =~ linux-musl') + assert(!(x86_linux_musl === x86_linux), 'linux-musl =~ linux') + assert(!(x86_linux === x86_linux_uclibc), 'linux =~ linux-uclibc') + assert(!(x86_linux_uclibc === x86_linux), 'linux-uclibc =~ linux') + end + def test_equals3_cpu_arm arm = Gem::Platform.new 'arm-linux' armv5 = Gem::Platform.new 'armv5-linux' |