mirror of
https://github.com/ruby/ruby.git
synced 2025-09-18 18:13:58 +02:00
Merge RubyGems-3.2.4
This commit is contained in:
parent
d4f5827a6d
commit
c721e36cec
18 changed files with 107 additions and 172 deletions
|
@ -26,12 +26,12 @@ class TestGemCommandsSetupCommand < Gem::TestCase
|
|||
bundler/exe/bundle
|
||||
bundler/lib/bundler.rb
|
||||
bundler/lib/bundler/b.rb
|
||||
bundler/bin/bundler/man/bundle-b.1
|
||||
bundler/lib/bundler/man/bundle-b.1.ronn
|
||||
bundler/lib/bundler/man/gemfile.5
|
||||
bundler/lib/bundler/man/gemfile.5.ronn
|
||||
bundler/lib/bundler/templates/.circleci/config.yml
|
||||
bundler/lib/bundler/templates/.travis.yml
|
||||
bundler/man/bundle-b.1
|
||||
bundler/man/gemfile.5
|
||||
]
|
||||
|
||||
create_dummy_files(filelist)
|
||||
|
@ -160,16 +160,6 @@ class TestGemCommandsSetupCommand < Gem::TestCase
|
|||
@cmd.files_in('lib').sort
|
||||
end
|
||||
|
||||
def test_bundler_man1_files_in
|
||||
assert_equal %w[bundle-b.1],
|
||||
@cmd.bundler_man1_files_in('bundler/man').sort
|
||||
end
|
||||
|
||||
def test_bundler_man5_files_in
|
||||
assert_equal %w[gemfile.5],
|
||||
@cmd.bundler_man5_files_in('bundler/man').sort
|
||||
end
|
||||
|
||||
def test_install_lib
|
||||
@cmd.extend FileUtils
|
||||
|
||||
|
@ -187,19 +177,6 @@ class TestGemCommandsSetupCommand < Gem::TestCase
|
|||
end
|
||||
end
|
||||
|
||||
def test_install_man
|
||||
@cmd.extend FileUtils
|
||||
|
||||
Dir.mktmpdir 'man' do |dir|
|
||||
@cmd.install_man dir
|
||||
|
||||
assert_path_exists File.join("#{dir}/man1", 'bundle-b.1')
|
||||
refute_path_exists File.join("#{dir}/man1", 'bundle-b.1.ronn')
|
||||
assert_path_exists File.join("#{dir}/man5", 'gemfile.5')
|
||||
refute_path_exists File.join("#{dir}/man5", 'gemfile.5.ronn')
|
||||
end
|
||||
end
|
||||
|
||||
def test_install_default_bundler_gem
|
||||
@cmd.extend FileUtils
|
||||
|
||||
|
@ -308,8 +285,8 @@ class TestGemCommandsSetupCommand < Gem::TestCase
|
|||
gemfile_5_ronn = File.join man, 'man5', 'gemfile.5.ronn'
|
||||
gemfile_5_txt = File.join man, 'man5', 'gemfile.5.txt'
|
||||
|
||||
files_that_go = [bundle_b_1_txt, bundle_b_1_ronn, gemfile_5_txt, gemfile_5_ronn]
|
||||
files_that_stay = [ruby_1, bundle_b_1, gemfile_5]
|
||||
files_that_go = [bundle_b_1, bundle_b_1_txt, bundle_b_1_ronn, gemfile_5, gemfile_5_txt, gemfile_5_ronn]
|
||||
files_that_stay = [ruby_1]
|
||||
|
||||
create_dummy_files(files_that_go + files_that_stay)
|
||||
|
||||
|
@ -326,22 +303,22 @@ class TestGemCommandsSetupCommand < Gem::TestCase
|
|||
|
||||
@cmd.options[:previous_version] = Gem::Version.new '2.0.2'
|
||||
|
||||
File.open 'History.txt', 'w' do |io|
|
||||
File.open 'CHANGELOG.md', 'w' do |io|
|
||||
io.puts <<-HISTORY_TXT
|
||||
=== #{Gem::VERSION} / 2013-03-26
|
||||
# #{Gem::VERSION} / 2013-03-26
|
||||
|
||||
* Bug fixes:
|
||||
## Bug fixes:
|
||||
* Fixed release note display for LANG=C when installing rubygems
|
||||
* π is tasty
|
||||
|
||||
=== 2.0.2 / 2013-03-06
|
||||
# 2.0.2 / 2013-03-06
|
||||
|
||||
* Bug fixes:
|
||||
## Bug fixes:
|
||||
* Other bugs fixed
|
||||
|
||||
=== 2.0.1 / 2013-03-05
|
||||
# 2.0.1 / 2013-03-05
|
||||
|
||||
* Bug fixes:
|
||||
## Bug fixes:
|
||||
* Yet more bugs fixed
|
||||
HISTORY_TXT
|
||||
end
|
||||
|
@ -351,9 +328,9 @@ class TestGemCommandsSetupCommand < Gem::TestCase
|
|||
end
|
||||
|
||||
expected = <<-EXPECTED
|
||||
=== #{Gem::VERSION} / 2013-03-26
|
||||
# #{Gem::VERSION} / 2013-03-26
|
||||
|
||||
* Bug fixes:
|
||||
## Bug fixes:
|
||||
* Fixed release note display for LANG=C when installing rubygems
|
||||
* π is tasty
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue