diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2021-08-02 12:05:18 +0900 |
|---|---|---|
| committer | nagachika <nagachika@ruby-lang.org> | 2021-08-19 15:46:40 +0900 |
| commit | f1039afa4179f9d3a42f0d89b499e3c955b495d9 (patch) | |
| tree | 6fb8b5fdbaaca16de553f40645fed69c13720908 /test | |
| parent | 4469c4e4beadbe568c5958798afa3316bf292a12 (diff) | |
Merge RubyGems 3.2.23 and Bundler 2.2.23
Diffstat (limited to 'test')
| -rw-r--r-- | test/rubygems/test_gem_commands_setup_command.rb | 2 | ||||
| -rw-r--r-- | test/rubygems/test_gem_installer.rb | 2 | ||||
| -rw-r--r-- | test/rubygems/test_gem_package.rb | 9 | ||||
| -rw-r--r-- | test/rubygems/test_gem_server.rb | 8 |
4 files changed, 14 insertions, 7 deletions
diff --git a/test/rubygems/test_gem_commands_setup_command.rb b/test/rubygems/test_gem_commands_setup_command.rb index bd6c4f125f..93646550c1 100644 --- a/test/rubygems/test_gem_commands_setup_command.rb +++ b/test/rubygems/test_gem_commands_setup_command.rb @@ -48,7 +48,7 @@ class TestGemCommandsSetupCommand < Gem::TestCase io.puts gemspec.to_ruby end - open(File.join(Gem.default_specifications_dir, "bundler-1.15.4.gemspec"), 'w') do |io| + File.open(File.join(Gem.default_specifications_dir, "bundler-1.15.4.gemspec"), 'w') do |io| gemspec.version = "1.15.4" io.puts gemspec.to_ruby end diff --git a/test/rubygems/test_gem_installer.rb b/test/rubygems/test_gem_installer.rb index 4b795d60cf..0a73425f93 100644 --- a/test/rubygems/test_gem_installer.rb +++ b/test/rubygems/test_gem_installer.rb @@ -730,7 +730,7 @@ gem 'other', version installer.generate_bin default_shebang = Gem.ruby - shebang_line = open("#{@gemhome}/bin/executable") {|f| f.readlines.first } + shebang_line = File.open("#{@gemhome}/bin/executable") {|f| f.readlines.first } assert_match(/\A#!/, shebang_line) assert_match(/#{default_shebang}/, shebang_line) end diff --git a/test/rubygems/test_gem_package.rb b/test/rubygems/test_gem_package.rb index 9bf03b6801..4cb8b9f981 100644 --- a/test/rubygems/test_gem_package.rb +++ b/test/rubygems/test_gem_package.rb @@ -937,7 +937,7 @@ class TestGemPackage < Gem::Package::TarTestCase build = Gem::Package.new @gem build.spec = @spec build.setup_signer - open @gem, 'wb' do |gem_io| + File.open @gem, 'wb' do |gem_io| Gem::Package::TarWriter.new gem_io do |gem| build.add_metadata gem build.add_contents gem @@ -1145,6 +1145,13 @@ class TestGemPackage < Gem::Package::TarTestCase end end + def test_contents_from_io + io = StringIO.new Gem.read_binary @gem + package = Gem::Package.new io + + assert_equal %w[lib/code.rb], package.contents + end + def util_tar tar_io = StringIO.new diff --git a/test/rubygems/test_gem_server.rb b/test/rubygems/test_gem_server.rb index 7a69429a98..aeb7fa2ab9 100644 --- a/test/rubygems/test_gem_server.rb +++ b/test/rubygems/test_gem_server.rb @@ -365,7 +365,7 @@ class TestGemServer < Gem::TestCase specs_dir = File.join dir, 'specifications' FileUtils.mkdir_p specs_dir - open File.join(specs_dir, spec.spec_name), 'w' do |io| + File.open File.join(specs_dir, spec.spec_name), 'w' do |io| io.write spec.to_ruby end @@ -420,7 +420,7 @@ class TestGemServer < Gem::TestCase specs_dir = File.join dir, 'specifications' FileUtils.mkdir_p specs_dir - open File.join(specs_dir, spec.spec_name), 'w' do |io| + File.open File.join(specs_dir, spec.spec_name), 'w' do |io| io.write spec.to_ruby end @@ -475,7 +475,7 @@ class TestGemServer < Gem::TestCase specs_dir = File.join dir, 'specifications' FileUtils.mkdir_p specs_dir - open File.join(specs_dir, spec.spec_name), 'w' do |io| + File.open File.join(specs_dir, spec.spec_name), 'w' do |io| io.write spec.to_ruby end @@ -502,7 +502,7 @@ class TestGemServer < Gem::TestCase specs_dir = File.join dir, 'specifications' FileUtils.mkdir_p specs_dir - open File.join(specs_dir, spec.spec_name), 'w' do |io| + File.open File.join(specs_dir, spec.spec_name), 'w' do |io| io.write spec.to_ruby end |