Merge RubyGems 3.0.0.beta1.

  * It drop to support < Ruby 2.2
  * Cleanup deprecated methods and classes.
  * Mark obsoleted methods to deprecate.
  * and other enhancements.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63528 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 58 insertions, 56 deletions

diff --git a/test/rubygems/test_gem_commands_owner_command.rb b/test/rubygems/test_gem_commands_owner_command.rb
index 53cac4ce87..3185074d98 100644
--- a/test/rubygems/test_gem_commands_owner_command.rb
+++ b/test/rubygems/test_gem_commands_owner_command.rb
@@ -8,8 +8,10 @@ class TestGemCommandsOwnerCommand < Gem::TestCase
     super
 
     ENV["RUBYGEMS_HOST"] = nil
-    @fetcher = Gem::FakeFetcher.new
-    Gem::RemoteFetcher.fetcher = @fetcher
+    @stub_ui = Gem::MockGemUi.new
+    @stub_fetcher = Gem::FakeFetcher.new
+    Gem::RemoteFetcher.fetcher = @stub_fetcher
+    Gem.configuration = nil
     Gem.configuration.rubygems_api_key = "ed244fbf2b1a52e012da8616c512fa47f9aa5250"
 
     @cmd = Gem::Commands::OwnerCommand.new
@@ -27,20 +29,20 @@ class TestGemCommandsOwnerCommand < Gem::TestCase
 - id: 4
 EOF
 
-    @fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners.yaml"] = [response, 200, 'OK']
+    @stub_fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners.yaml"] = [response, 200, 'OK']
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.show_owners("freewill")
     end
 
-    assert_equal Net::HTTP::Get, @fetcher.last_request.class
-    assert_equal Gem.configuration.rubygems_api_key, @fetcher.last_request["Authorization"]
+    assert_equal Net::HTTP::Get, @stub_fetcher.last_request.class
+    assert_equal Gem.configuration.rubygems_api_key, @stub_fetcher.last_request["Authorization"]
 
-    assert_match %r{Owners for gem: freewill}, @ui.output
-    assert_match %r{- user1@example.com}, @ui.output
-    assert_match %r{- user2@example.com}, @ui.output
-    assert_match %r{- user3}, @ui.output
-    assert_match %r{- 4}, @ui.output
+    assert_match %r{Owners for gem: freewill}, @stub_ui.output
+    assert_match %r{- user1@example.com}, @stub_ui.output
+    assert_match %r{- user2@example.com}, @stub_ui.output
+    assert_match %r{- user3}, @stub_ui.output
+    assert_match %r{- 4}, @stub_ui.output
   end
 
   def test_show_owners_dont_load_objects
@@ -57,7 +59,7 @@ EOF
 - id: 4
 EOF
 
-    @fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners.yaml"] = [response, 200, 'OK']
+    @stub_fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners.yaml"] = [response, 200, 'OK']
 
     assert_raises Psych::DisallowedClass do
       use_ui @ui do
@@ -73,14 +75,14 @@ EOF
     host = "http://rubygems.example"
     ENV["RUBYGEMS_HOST"] = host
 
-    @fetcher.data["#{host}/api/v1/gems/freewill/owners.yaml"] = [response, 200, 'OK']
+    @stub_fetcher.data["#{host}/api/v1/gems/freewill/owners.yaml"] = [response, 200, 'OK']
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.show_owners("freewill")
     end
 
-    assert_match %r{Owners for gem: freewill}, @ui.output
-    assert_match %r{- user1@example.com}, @ui.output
+    assert_match %r{Owners for gem: freewill}, @stub_ui.output
+    assert_match %r{- user1@example.com}, @stub_ui.output
   end
 
   def test_show_owners_setting_up_host
@@ -88,32 +90,32 @@ EOF
     host = "http://rubygems.example"
     @cmd.host = host
 
-    @fetcher.data["#{host}/api/v1/gems/freewill/owners.yaml"] = [response, 200, 'OK']
+    @stub_fetcher.data["#{host}/api/v1/gems/freewill/owners.yaml"] = [response, 200, 'OK']
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.show_owners("freewill")
     end
 
-    assert_match %r{Owners for gem: freewill}, @ui.output
-    assert_match %r{- user1@example.com}, @ui.output
+    assert_match %r{Owners for gem: freewill}, @stub_ui.output
+    assert_match %r{- user1@example.com}, @stub_ui.output
   end
 
   def test_show_owners_denied
     response = "You don't have permission to push to this gem"
-    @fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners.yaml"] = [response, 403, 'Forbidden']
+    @stub_fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners.yaml"] = [response, 403, 'Forbidden']
 
     assert_raises Gem::MockGemUi::TermError do
-      use_ui @ui do
+      use_ui @stub_ui do
         @cmd.show_owners("freewill")
       end
     end
 
-    assert_match response, @ui.output
+    assert_match response, @stub_ui.output
   end
 
   def test_show_owners_key
     response = "- email: user1@example.com\n"
-    @fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners.yaml"] = [response, 200, 'OK']
+    @stub_fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners.yaml"] = [response, 200, 'OK']
     File.open Gem.configuration.credentials_path, 'a' do |f|
       f.write ':other: 701229f217cdf23b1344c7b4b54ca97'
     end
@@ -122,56 +124,56 @@ EOF
     @cmd.handle_options %w(-k other)
     @cmd.show_owners('freewill')
 
-    assert_equal '701229f217cdf23b1344c7b4b54ca97', @fetcher.last_request['Authorization']
+    assert_equal '701229f217cdf23b1344c7b4b54ca97', @stub_fetcher.last_request['Authorization']
   end
 
   def test_add_owners
     response = "Owner added successfully."
-    @fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners"] = [response, 200, 'OK']
+    @stub_fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners"] = [response, 200, 'OK']
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.add_owners("freewill", ["user-new1@example.com"])
     end
 
-    assert_equal Net::HTTP::Post, @fetcher.last_request.class
-    assert_equal Gem.configuration.rubygems_api_key, @fetcher.last_request["Authorization"]
-    assert_equal "email=user-new1%40example.com", @fetcher.last_request.body
+    assert_equal Net::HTTP::Post, @stub_fetcher.last_request.class
+    assert_equal Gem.configuration.rubygems_api_key, @stub_fetcher.last_request["Authorization"]
+    assert_equal "email=user-new1%40example.com", @stub_fetcher.last_request.body
 
-    assert_match response, @ui.output
+    assert_match response, @stub_ui.output
   end
 
   def test_add_owners_denied
     response = "You don't have permission to push to this gem"
-    @fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners"] = [response, 403, 'Forbidden']
+    @stub_fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners"] = [response, 403, 'Forbidden']
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.add_owners("freewill", ["user-new1@example.com"])
     end
 
-    assert_match response, @ui.output
+    assert_match response, @stub_ui.output
   end
 
   def test_add_owner_with_host_option_through_execute
     host = "http://rubygems.example"
     add_owner_response = "Owner added successfully."
     show_owners_response = "- email: user1@example.com\n"
-    @fetcher.data["#{host}/api/v1/gems/freewill/owners"] = [add_owner_response, 200, 'OK']
-    @fetcher.data["#{host}/api/v1/gems/freewill/owners.yaml"] = [show_owners_response, 200, 'OK']
+    @stub_fetcher.data["#{host}/api/v1/gems/freewill/owners"] = [add_owner_response, 200, 'OK']
+    @stub_fetcher.data["#{host}/api/v1/gems/freewill/owners.yaml"] = [show_owners_response, 200, 'OK']
 
     @cmd.handle_options %W[--host #{host} --add user-new1@example.com freewill]
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.execute
     end
 
-    assert_match add_owner_response, @ui.output
-    assert_match %r{Owners for gem: freewill}, @ui.output
-    assert_match %r{- user1@example.com}, @ui.output
+    assert_match add_owner_response, @stub_ui.output
+    assert_match %r{Owners for gem: freewill}, @stub_ui.output
+    assert_match %r{- user1@example.com}, @stub_ui.output
   end
 
   def test_add_owners_key
     response = "Owner added successfully."
-    @fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners"] = [response, 200, 'OK']
+    @stub_fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners"] = [response, 200, 'OK']
     File.open Gem.configuration.credentials_path, 'a' do |f|
       f.write ':other: 701229f217cdf23b1344c7b4b54ca97'
     end
@@ -180,38 +182,38 @@ EOF
     @cmd.handle_options %w(-k other)
     @cmd.add_owners('freewill', ['user-new1@example.com'])
 
-    assert_equal '701229f217cdf23b1344c7b4b54ca97', @fetcher.last_request['Authorization']
+    assert_equal '701229f217cdf23b1344c7b4b54ca97', @stub_fetcher.last_request['Authorization']
   end
 
   def test_remove_owners
     response = "Owner removed successfully."
-    @fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners"] = [response, 200, 'OK']
+    @stub_fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners"] = [response, 200, 'OK']
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.remove_owners("freewill", ["user-remove1@example.com"])
     end
 
-    assert_equal Net::HTTP::Delete, @fetcher.last_request.class
-    assert_equal Gem.configuration.rubygems_api_key, @fetcher.last_request["Authorization"]
-    assert_equal "email=user-remove1%40example.com", @fetcher.last_request.body
+    assert_equal Net::HTTP::Delete, @stub_fetcher.last_request.class
+    assert_equal Gem.configuration.rubygems_api_key, @stub_fetcher.last_request["Authorization"]
+    assert_equal "email=user-remove1%40example.com", @stub_fetcher.last_request.body
 
-    assert_match response, @ui.output
+    assert_match response, @stub_ui.output
   end
 
   def test_remove_owners_denied
     response = "You don't have permission to push to this gem"
-    @fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners"] = [response, 403, 'Forbidden']
+    @stub_fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners"] = [response, 403, 'Forbidden']
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.remove_owners("freewill", ["user-remove1@example.com"])
     end
 
-    assert_match response, @ui.output
+    assert_match response, @stub_ui.output
   end
 
   def test_remove_owners_key
     response = "Owner removed successfully."
-    @fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners"] = [response, 200, 'OK']
+    @stub_fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners"] = [response, 200, 'OK']
     File.open Gem.configuration.credentials_path, 'a' do |f|
       f.write ':other: 701229f217cdf23b1344c7b4b54ca97'
     end
@@ -220,18 +222,18 @@ EOF
     @cmd.handle_options %w(-k other)
     @cmd.remove_owners('freewill', ['user-remove1@example.com'])
 
-    assert_equal '701229f217cdf23b1344c7b4b54ca97', @fetcher.last_request['Authorization']
+    assert_equal '701229f217cdf23b1344c7b4b54ca97', @stub_fetcher.last_request['Authorization']
   end
 
   def test_remove_owners_missing
     response = 'Owner could not be found.'
-    @fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners"] = [response, 404, 'Not Found']
+    @stub_fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners"] = [response, 404, 'Not Found']
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.remove_owners("freewill", ["missing@example"])
     end
 
-    assert_equal "Removing missing@example: #{response}\n", @ui.output
+    assert_equal "Removing missing@example: #{response}\n", @stub_ui.output
   end
 
 end