From e8c3872555fc85640505974e6b1c39d315572689 Mon Sep 17 00:00:00 2001
From: Benoit Daloze <eregontp@gmail.com>
Date: Sat, 29 Aug 2020 12:17:07 +0200
Subject: Simplify Tempfile.open calls with a block as they now unlink the file
 automatically

---
 test/rubygems/test_gem_request_set.rb | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

(limited to 'test/rubygems/test_gem_request_set.rb')

diff --git a/test/rubygems/test_gem_request_set.rb b/test/rubygems/test_gem_request_set.rb
index 54ae7720c0..7a21424cf1 100644
--- a/test/rubygems/test_gem_request_set.rb
+++ b/test/rubygems/test_gem_request_set.rb
@@ -261,16 +261,14 @@ ruby "0"
   def test_load_gemdeps
     rs = Gem::RequestSet.new
 
-    tf = Tempfile.open 'gem.deps.rb' do |io|
+    Tempfile.open 'gem.deps.rb' do |io|
       io.puts 'gem "a"'
       io.flush
 
       gem_deps = rs.load_gemdeps io.path
 
       assert_kind_of Gem::RequestSet::GemDependencyAPI, gem_deps
-      io
     end
-    tf.close!
 
     assert_equal [dep('a')], rs.dependencies
 
@@ -281,7 +279,7 @@ ruby "0"
   def test_load_gemdeps_installing
     rs = Gem::RequestSet.new
 
-    tf = Tempfile.open 'gem.deps.rb' do |io|
+    Tempfile.open 'gem.deps.rb' do |io|
       io.puts 'ruby "0"'
       io.puts 'gem "a"'
       io.flush
@@ -289,9 +287,7 @@ ruby "0"
       gem_deps = rs.load_gemdeps io.path, [], true
 
       assert_kind_of Gem::RequestSet::GemDependencyAPI, gem_deps
-      io
     end
-    tf.close!
 
     assert_equal [dep('a')], rs.dependencies
   end
@@ -299,14 +295,12 @@ ruby "0"
   def test_load_gemdeps_without_groups
     rs = Gem::RequestSet.new
 
-    tf = Tempfile.open 'gem.deps.rb' do |io|
+    Tempfile.open 'gem.deps.rb' do |io|
       io.puts 'gem "a", :group => :test'
       io.flush
 
       rs.load_gemdeps io.path, [:test]
-      io
     end
-    tf.close!
 
     assert_empty rs.dependencies
   end
@@ -394,7 +388,7 @@ ruby "0"
 
     rs = Gem::RequestSet.new
 
-    tf = Tempfile.open 'gem.deps.rb' do |io|
+    Tempfile.open 'gem.deps.rb' do |io|
       io.puts <<-GEMS_DEPS_RB
         gem "#{name}", :git => "#{repository}"
       GEMS_DEPS_RB
@@ -402,9 +396,7 @@ ruby "0"
       io.flush
 
       rs.load_gemdeps io.path
-      io
     end
-    tf.close!
 
     res = rs.resolve
     assert_equal 1, res.size
@@ -457,7 +449,7 @@ ruby "0"
 
     rs = Gem::RequestSet.new
 
-    tf = Tempfile.open 'gem.deps.rb' do |io|
+    Tempfile.open 'gem.deps.rb' do |io|
       io.puts <<-GEMS_DEPS_RB
         gem "#{a_name}", :path => "#{a_directory}"
         gem "#{b_name}", :path => "#{b_directory}"
@@ -466,9 +458,7 @@ ruby "0"
       io.flush
 
       rs.load_gemdeps io.path
-      io
     end
-    tf.close!
 
     res = rs.resolve
     assert_equal 2, res.size
-- 
cgit v1.2.3