From ab6c4f8be3dd0fb116ba2722a2fcdc53ad4ea0b7 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Thu, 15 Oct 2020 13:25:27 +0900 Subject: Merge rubygems-3.2.0.rc.2 --- test/rubygems/test_bundled_ca.rb | 7 +------ test/rubygems/test_gem_commands_build_command.rb | 2 +- test/rubygems/test_gem_commands_setup_command.rb | 22 ++++++++++------------ test/rubygems/test_gem_requirement.rb | 2 ++ test/rubygems/test_gem_stub_specification.rb | 8 ++++---- 5 files changed, 18 insertions(+), 23 deletions(-) (limited to 'test') diff --git a/test/rubygems/test_bundled_ca.rb b/test/rubygems/test_bundled_ca.rb index b30264a8d4..557298d8d5 100644 --- a/test/rubygems/test_bundled_ca.rb +++ b/test/rubygems/test_bundled_ca.rb @@ -15,15 +15,10 @@ require 'rubygems/request' # class TestBundledCA < Gem::TestCase - THIS_FILE = File.expand_path __FILE__ - def bundled_certificate_store store = OpenSSL::X509::Store.new - ssl_cert_glob = - File.expand_path '../../../lib/rubygems/ssl_certs/*/*.pem', THIS_FILE - - Dir[ssl_cert_glob].each do |ssl_cert| + Gem::Request.get_cert_files.each do |ssl_cert| store.add_file ssl_cert end diff --git a/test/rubygems/test_gem_commands_build_command.rb b/test/rubygems/test_gem_commands_build_command.rb index 01f3487ad4..24c60473f2 100644 --- a/test/rubygems/test_gem_commands_build_command.rb +++ b/test/rubygems/test_gem_commands_build_command.rb @@ -148,7 +148,7 @@ class TestGemCommandsBuildCommand < Gem::TestCase end def test_execute_rubyforge_project_warning - rubyforge_gemspec = File.join SPECIFICATIONS, "rubyforge-0.0.1.gemspec" + rubyforge_gemspec = File.expand_path File.join("specifications", "rubyforge-0.0.1.gemspec"), __dir__ @cmd.options[:args] = [rubyforge_gemspec] diff --git a/test/rubygems/test_gem_commands_setup_command.rb b/test/rubygems/test_gem_commands_setup_command.rb index 050c1ce3a6..9b6aa87861 100644 --- a/test/rubygems/test_gem_commands_setup_command.rb +++ b/test/rubygems/test_gem_commands_setup_command.rb @@ -29,9 +29,9 @@ class TestGemCommandsSetupCommand < Gem::TestCase bundler/lib/bundler/templates/.circleci/config.yml bundler/lib/bundler/templates/.travis.yml bundler/man/bundle-b.1 - bundler/man/bundle-b.1.txt + bundler/man/bundle-b.1.ronn bundler/man/gemfile.5 - bundler/man/gemfile.5.txt + bundler/man/gemfile.5.ronn ] create_dummy_files(filelist) @@ -166,12 +166,12 @@ class TestGemCommandsSetupCommand < Gem::TestCase end def test_bundler_man1_files_in - assert_equal %w[bundle-b.1 bundle-b.1.txt], + assert_equal %w[bundle-b.1 bundle-b.1.ronn], @cmd.bundler_man1_files_in('bundler/man').sort end def test_bundler_man5_files_in - assert_equal %w[gemfile.5 gemfile.5.txt], + assert_equal %w[gemfile.5 gemfile.5.ronn], @cmd.bundler_man5_files_in('bundler/man').sort end @@ -199,9 +199,9 @@ class TestGemCommandsSetupCommand < Gem::TestCase @cmd.install_man dir assert_path_exists File.join("#{dir}/man1", 'bundle-b.1') - assert_path_exists File.join("#{dir}/man1", 'bundle-b.1.txt') + assert_path_exists File.join("#{dir}/man1", 'bundle-b.1.ronn') assert_path_exists File.join("#{dir}/man5", 'gemfile.5') - assert_path_exists File.join("#{dir}/man5", 'gemfile.5.txt') + assert_path_exists File.join("#{dir}/man5", 'gemfile.5.ronn') end end @@ -307,14 +307,14 @@ class TestGemCommandsSetupCommand < Gem::TestCase ruby_1 = File.join man, 'man1', 'ruby.1' bundle_b_1 = File.join man, 'man1', 'bundle-b.1' + bundle_b_1_ronn = File.join man, 'man1', 'bundle-b.1.ronn' bundle_b_1_txt = File.join man, 'man1', 'bundle-b.1.txt' - bundle_old_b_1 = File.join man, 'man1', 'bundle-old_b.1' - bundle_old_b_1_txt = File.join man, 'man1', 'bundle-old_b.1.txt' gemfile_5 = File.join man, 'man5', 'gemfile.5' + gemfile_5_ronn = File.join man, 'man5', 'gemfile.5.ronn' gemfile_5_txt = File.join man, 'man5', 'gemfile.5.txt' - files_that_go = [bundle_old_b_1, bundle_old_b_1_txt] - files_that_stay = [ruby_1, bundle_b_1, bundle_b_1_txt, gemfile_5, gemfile_5_txt] + files_that_go = [bundle_b_1_txt, gemfile_5_txt] + files_that_stay = [ruby_1, bundle_b_1, bundle_b_1_ronn, gemfile_5, gemfile_5_ronn] create_dummy_files(files_that_go + files_that_stay) @@ -333,8 +333,6 @@ class TestGemCommandsSetupCommand < Gem::TestCase File.open 'History.txt', 'w' do |io| io.puts <<-HISTORY_TXT -# coding: UTF-8 - === #{Gem::VERSION} / 2013-03-26 * Bug fixes: diff --git a/test/rubygems/test_gem_requirement.rb b/test/rubygems/test_gem_requirement.rb index af9d807701..20127a1e15 100644 --- a/test/rubygems/test_gem_requirement.rb +++ b/test/rubygems/test_gem_requirement.rb @@ -22,6 +22,8 @@ class TestGemRequirement < Gem::TestCase refute_requirement_equal "~> 1.3", "~> 1.3.0" refute_requirement_equal "~> 1.3.0", "~> 1.3" + assert_requirement_equal ["> 2", "~> 1.3", "~> 1.3.1"], ["~> 1.3.1", "~> 1.3", "> 2"] + assert_requirement_equal ["> 2", "~> 1.3"], ["> 2.0", "~> 1.3"] assert_requirement_equal ["> 2.0", "~> 1.3"], ["> 2", "~> 1.3"] diff --git a/test/rubygems/test_gem_stub_specification.rb b/test/rubygems/test_gem_stub_specification.rb index 5a47fa520a..2ee94dcf8d 100644 --- a/test/rubygems/test_gem_stub_specification.rb +++ b/test/rubygems/test_gem_stub_specification.rb @@ -3,14 +3,14 @@ require "rubygems/test_case" require "rubygems/stub_specification" class TestStubSpecification < Gem::TestCase - FOO = File.join SPECIFICATIONS, "foo-0.0.1-x86-mswin32.gemspec" - BAR = File.join SPECIFICATIONS, "bar-0.0.2.gemspec" + FOO = File.expand_path File.join("specifications", "foo-0.0.1-x86-mswin32.gemspec"), __dir__ + BAR = File.expand_path File.join("specifications", "bar-0.0.2.gemspec"), __dir__ def setup super - @base_dir = File.dirname(SPECIFICATIONS) - @gems_dir = File.join File.dirname(SPECIFICATIONS), 'gem' + @base_dir = __dir__ + @gems_dir = File.join __dir__, 'gem' @foo = Gem::StubSpecification.gemspec_stub FOO, @base_dir, @gems_dir end -- cgit v1.2.3