diff options
author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2021-11-11 10:41:39 +0900 |
---|---|---|
committer | nagachika <nagachika@ruby-lang.org> | 2021-11-22 10:51:35 +0900 |
commit | 24f911f474e11560af5fbd0f637f4c0ded23f604 (patch) | |
tree | 2f4d2fbdf6bc195012cbced0dac7d1463934cc67 /test | |
parent | 31a71048521224774bdb8b5982ab73eb35dad66d (diff) |
Merge RubyGems 3.2.28 and Bundler 2.2.28
Diffstat (limited to 'test')
-rw-r--r-- | test/rubygems/test_gem_platform.rb | 1 | ||||
-rw-r--r-- | test/rubygems/test_gem_request.rb | 12 | ||||
-rw-r--r-- | test/rubygems/test_gem_specification.rb | 14 | ||||
-rw-r--r-- | test/rubygems/test_gem_uri.rb | 7 |
4 files changed, 28 insertions, 6 deletions
diff --git a/test/rubygems/test_gem_platform.rb b/test/rubygems/test_gem_platform.rb index aae0250801..8029035db1 100644 --- a/test/rubygems/test_gem_platform.rb +++ b/test/rubygems/test_gem_platform.rb @@ -122,6 +122,7 @@ class TestGemPlatform < Gem::TestCase 'i586-linux-gnu' => ['x86', 'linux', nil], 'i386-linux-gnu' => ['x86', 'linux', nil], 'i386-mingw32' => ['x86', 'mingw32', nil], + 'x64-mingw-ucrt' => ['x64', 'mingw', 'ucrt'], 'i386-mswin32' => ['x86', 'mswin32', nil], 'i386-mswin32_80' => ['x86', 'mswin32', '80'], 'i386-mswin32-80' => ['x86', 'mswin32', '80'], diff --git a/test/rubygems/test_gem_request.rb b/test/rubygems/test_gem_request.rb index 0c370c8a04..66477be7bc 100644 --- a/test/rubygems/test_gem_request.rb +++ b/test/rubygems/test_gem_request.rb @@ -185,7 +185,7 @@ class TestGemRequest < Gem::TestCase end def test_fetch - uri = URI.parse "#{@gem_repo}/specs.#{Gem.marshal_version}" + uri = Gem::Uri.new(URI.parse "#{@gem_repo}/specs.#{Gem.marshal_version}") response = util_stub_net_http(:body => :junk, :code => 200) do @request = make_request(uri, Net::HTTP::Get, nil, nil) @@ -198,7 +198,7 @@ class TestGemRequest < Gem::TestCase def test_fetch_basic_auth Gem.configuration.verbose = :really - uri = URI.parse "https://user:pass@example.rubygems/specs.#{Gem.marshal_version}" + uri = Gem::Uri.new(URI.parse "https://user:pass@example.rubygems/specs.#{Gem.marshal_version}") conn = util_stub_net_http(:body => :junk, :code => 200) do |c| use_ui @ui do @request = make_request(uri, Net::HTTP::Get, nil, nil) @@ -214,7 +214,7 @@ class TestGemRequest < Gem::TestCase def test_fetch_basic_auth_encoded Gem.configuration.verbose = :really - uri = URI.parse "https://user:%7BDEScede%7Dpass@example.rubygems/specs.#{Gem.marshal_version}" + uri = Gem::Uri.new(URI.parse "https://user:%7BDEScede%7Dpass@example.rubygems/specs.#{Gem.marshal_version}") conn = util_stub_net_http(:body => :junk, :code => 200) do |c| use_ui @ui do @@ -231,7 +231,7 @@ class TestGemRequest < Gem::TestCase def test_fetch_basic_oauth_encoded Gem.configuration.verbose = :really - uri = URI.parse "https://%7BDEScede%7Dpass:x-oauth-basic@example.rubygems/specs.#{Gem.marshal_version}" + uri = Gem::Uri.new(URI.parse "https://%7BDEScede%7Dpass:x-oauth-basic@example.rubygems/specs.#{Gem.marshal_version}") conn = util_stub_net_http(:body => :junk, :code => 200) do |c| use_ui @ui do @@ -247,7 +247,7 @@ class TestGemRequest < Gem::TestCase end def test_fetch_head - uri = URI.parse "#{@gem_repo}/specs.#{Gem.marshal_version}" + uri = Gem::Uri.new(URI.parse "#{@gem_repo}/specs.#{Gem.marshal_version}") response = util_stub_net_http(:body => '', :code => 200) do |conn| @request = make_request(uri, Net::HTTP::Get, nil, nil) @request.fetch @@ -258,7 +258,7 @@ class TestGemRequest < Gem::TestCase end def test_fetch_unmodified - uri = URI.parse "#{@gem_repo}/specs.#{Gem.marshal_version}" + uri = Gem::Uri.new(URI.parse "#{@gem_repo}/specs.#{Gem.marshal_version}") t = Time.utc(2013, 1, 2, 3, 4, 5) conn, response = util_stub_net_http(:body => '', :code => 304) do |c| @request = make_request(uri, Net::HTTP::Get, t, nil) diff --git a/test/rubygems/test_gem_specification.rb b/test/rubygems/test_gem_specification.rb index 88afa3faa0..782ae0380f 100644 --- a/test/rubygems/test_gem_specification.rb +++ b/test/rubygems/test_gem_specification.rb @@ -2781,6 +2781,20 @@ duplicate dependency on c (>= 1.2.3, development), (~> 1.2) use: end assert_equal %("#{f}" or "#{t}" is not a description), e.message + + # Adding #{f} anywhere after the start of the description should be fine. + @a1.description = "(some description) #{f}" + + assert_nothing_raised do + @a1.validate + end + + # Adding #{t} anywhere after the start of the description should be fine. + @a1.description = "(some description) #{t}" + + assert_nothing_raised do + @a1.validate + end end end diff --git a/test/rubygems/test_gem_uri.rb b/test/rubygems/test_gem_uri.rb index 0c70443f32..7fe572518b 100644 --- a/test/rubygems/test_gem_uri.rb +++ b/test/rubygems/test_gem_uri.rb @@ -29,4 +29,11 @@ class TestUri < Gem::TestCase def test_redacted_with_invalid_uri assert_equal "https://www.example.com:80index", Gem::Uri.new("https://www.example.com:80index").redacted.to_s end + + def test_redacted_does_not_modify_uri + url = 'https://user:password@example.com' + uri = Gem::Uri.new(url) + assert_equal 'https://user:REDACTED@example.com', uri.redacted.to_s + assert_equal url, uri.to_s + end end |