From 28840d74c26189f4e730b906c2383e32ea6165fe Mon Sep 17 00:00:00 2001 From: Jenny Shen Date: Mon, 19 Sep 2022 09:43:17 -0400 Subject: [rubygems/rubygems] Refine error message to check the push URL instead of just the host https://github.com/rubygems/rubygems/commit/46990f3292 --- lib/rubygems/gemcutter_utilities.rb | 2 +- test/rubygems/test_gem_commands_owner_command.rb | 8 ++++---- test/rubygems/test_gem_commands_push_command.rb | 2 +- test/rubygems/test_gem_commands_signin_command.rb | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/rubygems/gemcutter_utilities.rb b/lib/rubygems/gemcutter_utilities.rb index fb7b9149ba..3477422b79 100644 --- a/lib/rubygems/gemcutter_utilities.rb +++ b/lib/rubygems/gemcutter_utilities.rb @@ -213,7 +213,7 @@ module Gem::GemcutterUtilities say clean_text(response.body) end when Net::HTTPPermanentRedirect, Net::HTTPRedirection then - message = "The request has redirected permanently to #{response['location']}. Please check your defined push host." + message = "The request has redirected permanently to #{response['location']}. Please check your defined push host URL." message = "#{error_prefix}: #{message}" if error_prefix say clean_text(message) diff --git a/test/rubygems/test_gem_commands_owner_command.rb b/test/rubygems/test_gem_commands_owner_command.rb index e415f4bd37..32bfbb7a66 100644 --- a/test/rubygems/test_gem_commands_owner_command.rb +++ b/test/rubygems/test_gem_commands_owner_command.rb @@ -137,7 +137,7 @@ EOF end end - response = "The request has redirected permanently to #{redirected_uri}. Please check your defined push host." + response = "The request has redirected permanently to #{redirected_uri}. Please check your defined push host URL." assert_match response, @stub_ui.output end @@ -198,7 +198,7 @@ EOF @cmd.add_owners("freewill", ["user-new1@example.com"]) end - response = "The request has redirected permanently to #{redirected_uri}. Please check your defined push host." + response = "The request has redirected permanently to #{redirected_uri}. Please check your defined push host URL." assert_match response, @stub_ui.output end @@ -276,7 +276,7 @@ EOF @cmd.remove_owners("freewill", ["user-remove1@example.com"]) end - response = "The request has redirected permanently to #{redirected_uri}. Please check your defined push host." + response = "The request has redirected permanently to #{redirected_uri}. Please check your defined push host URL." assert_match response, @stub_ui.output path = "/api/v1/gems/freewill/owners" @@ -293,7 +293,7 @@ EOF @cmd.add_owners("freewill", ["user-new1@example.com"]) end - response = "The request has redirected permanently to #{redirected_uri}. Please check your defined push host." + response = "The request has redirected permanently to #{redirected_uri}. Please check your defined push host URL." assert_match response, @stub_ui.output end diff --git a/test/rubygems/test_gem_commands_push_command.rb b/test/rubygems/test_gem_commands_push_command.rb index 5ce6bd161b..ef7730558d 100644 --- a/test/rubygems/test_gem_commands_push_command.rb +++ b/test/rubygems/test_gem_commands_push_command.rb @@ -342,7 +342,7 @@ class TestGemCommandsPushCommand < Gem::TestCase end end - response = "The request has redirected permanently to #{redirected_uri}. Please check your defined push host." + response = "The request has redirected permanently to #{redirected_uri}. Please check your defined push host URL." assert_match response, @ui.output end diff --git a/test/rubygems/test_gem_commands_signin_command.rb b/test/rubygems/test_gem_commands_signin_command.rb index 47b45e9be8..281e4f9eac 100644 --- a/test/rubygems/test_gem_commands_signin_command.rb +++ b/test/rubygems/test_gem_commands_signin_command.rb @@ -92,7 +92,7 @@ class TestGemCommandsSigninCommand < Gem::TestCase end end - response = "The request has redirected permanently to #{redirected_uri}. Please check your defined push host." + response = "The request has redirected permanently to #{redirected_uri}. Please check your defined push host URL." assert_match response, ui.output end -- cgit v1.2.3