diff options
author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-01-22 06:28:04 +0000 |
---|---|---|
committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-01-22 06:28:04 +0000 |
commit | 3dc6efbe9ca582d6930f25754a16043dedecfa6f (patch) | |
tree | 35980c7383e9e12d092e0eff78f5f16eca2fa1fc /test/rubygems | |
parent | 59a6215af65b3bfade13836681cbacc3294e6e78 (diff) | |
download | ruby-3dc6efbe9ca582d6930f25754a16043dedecfa6f.tar.gz |
Merge rubygems master targeted RubyGems 3.1.0.
https://github.com/rubygems/rubygems/commit/1172320540c8c33c59fc1db5191b021c3b2db487
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66904 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/rubygems')
-rw-r--r-- | test/rubygems/test_gem.rb | 5 | ||||
-rw-r--r-- | test/rubygems/test_gem_commands_build_command.rb | 1 | ||||
-rw-r--r-- | test/rubygems/test_gem_commands_push_command.rb | 15 | ||||
-rw-r--r-- | test/rubygems/test_gem_commands_setup_command.rb | 2 | ||||
-rw-r--r-- | test/rubygems/test_gem_ext_cmake_builder.rb | 2 | ||||
-rw-r--r-- | test/rubygems/test_gem_request.rb | 11 | ||||
-rw-r--r-- | test/rubygems/test_gem_request_set_gem_dependency_api.rb | 51 | ||||
-rw-r--r-- | test/rubygems/test_gem_specification.rb | 4 |
8 files changed, 59 insertions, 32 deletions
diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb index e740a5ab94..c913f30e27 100644 --- a/test/rubygems/test_gem.rb +++ b/test/rubygems/test_gem.rb @@ -156,7 +156,7 @@ class TestGem < Gem::TestCase end def assert_self_install_permissions - mask = /mingw|mswin/ =~ RUBY_PLATFORM ? 0700 : 0777 + mask = win_platform? ? 0700 : 0777 options = { :dir_mode => 0500, :prog_mode => 0510, @@ -198,6 +198,9 @@ class TestGem < Gem::TestCase 'gems/foo-1/bin/foo.cmd' => prog_mode, 'gems/foo-1/data/foo.txt' => data_mode, } + # below is for intermittent errors on Appveyor & Travis 2019-01, + # see https://github.com/rubygems/rubygems/pull/2568 + sleep 0.2 result = {} Dir.chdir @gemhome do expected.each_key do |n| diff --git a/test/rubygems/test_gem_commands_build_command.rb b/test/rubygems/test_gem_commands_build_command.rb index ac82a408c7..02d1b98e8f 100644 --- a/test/rubygems/test_gem_commands_build_command.rb +++ b/test/rubygems/test_gem_commands_build_command.rb @@ -207,6 +207,7 @@ class TestGemCommandsBuildCommand < Gem::TestCase gs.write @gem.to_ruby end + @cmd.options[:build_path] = gemspec_dir @cmd.options[:args] = [gemspec_file] use_ui @ui do diff --git a/test/rubygems/test_gem_commands_push_command.rb b/test/rubygems/test_gem_commands_push_command.rb index 9d2185dcd9..592295d684 100644 --- a/test/rubygems/test_gem_commands_push_command.rb +++ b/test/rubygems/test_gem_commands_push_command.rb @@ -199,6 +199,21 @@ class TestGemCommandsPushCommand < Gem::TestCase send_battery end + def test_sending_gem_with_env_var_api_key + @host = "http://privategemserver.example" + + @spec, @path = util_gem "freebird", "1.0.1" do |spec| + spec.metadata['allowed_push_host'] = @host + end + + @api_key = "PRIVKEY" + ENV["GEM_HOST_API_KEY"] = "PRIVKEY" + + @response = "Successfully registered gem: freebird (1.0.1)" + @fetcher.data["#{@host}/api/v1/gems"] = [@response, 200, 'OK'] + send_battery + end + def test_sending_gem_to_allowed_push_host_with_basic_credentials @sanitized_host = "http://privategemserver.example" @host = "http://user:password@privategemserver.example" diff --git a/test/rubygems/test_gem_commands_setup_command.rb b/test/rubygems/test_gem_commands_setup_command.rb index f1598f3fc2..4f34112099 100644 --- a/test/rubygems/test_gem_commands_setup_command.rb +++ b/test/rubygems/test_gem_commands_setup_command.rb @@ -10,7 +10,7 @@ class TestGemCommandsSetupCommand < Gem::TestCase if File.exist?(bundler_gemspec) BUNDLER_VERS = File.read(bundler_gemspec).match(/VERSION = "(#{Gem::Version::VERSION_PATTERN})"/)[1] else - BUNDLER_VERS = "1.16.2".freeze + BUNDLER_VERS = "2.0.1".freeze end def setup diff --git a/test/rubygems/test_gem_ext_cmake_builder.rb b/test/rubygems/test_gem_ext_cmake_builder.rb index 6e62908090..757266cae2 100644 --- a/test/rubygems/test_gem_ext_cmake_builder.rb +++ b/test/rubygems/test_gem_ext_cmake_builder.rb @@ -25,7 +25,7 @@ class TestGemExtCmakeBuilder < Gem::TestCase File.open File.join(@ext, 'CMakeLists.txt'), 'w' do |cmakelists| cmakelists.write <<-eo_cmake cmake_minimum_required(VERSION 2.6) -project(self_build LANGUAGES NONE) +project(self_build NONE) install (FILES test.txt DESTINATION bin) eo_cmake end diff --git a/test/rubygems/test_gem_request.rb b/test/rubygems/test_gem_request.rb index 8b475fae42..0577eb6f99 100644 --- a/test/rubygems/test_gem_request.rb +++ b/test/rubygems/test_gem_request.rb @@ -79,6 +79,17 @@ class TestGemRequest < Gem::TestCase assert_equal URI(@proxy_uri), proxy end + def test_proxy_ENV + ENV['http_proxy'] = "http://proxy" + ENV['https_proxy'] = "" + + request = make_request URI('https://example'), nil, nil, nil + + proxy = request.proxy_uri + + assert_nil proxy + end + def test_configure_connection_for_https connection = Net::HTTP.new 'localhost', 443 diff --git a/test/rubygems/test_gem_request_set_gem_dependency_api.rb b/test/rubygems/test_gem_request_set_gem_dependency_api.rb index 320fdcb604..0e597f2b11 100644 --- a/test/rubygems/test_gem_request_set_gem_dependency_api.rb +++ b/test/rubygems/test_gem_request_set_gem_dependency_api.rb @@ -652,20 +652,23 @@ end end def test_platform_mswin - util_set_arch 'i686-darwin8.10.1' do - @gda.platform :mswin do - @gda.gem 'a' + if win_platform? + util_set_arch 'x86-mswin32-60' do + @gda.platform :mswin do + @gda.gem 'a' + end + + assert_equal [dep('a')], @set.dependencies + refute_empty @set.dependencies end + else + util_set_arch 'i686-darwin8.10.1' do + @gda.platform :mswin do + @gda.gem 'a' + end - assert_empty @set.dependencies - end - - util_set_arch 'x86-mswin32-60' do - @gda.platform :mswin do - @gda.gem 'a' + assert_empty @set.dependencies end - - refute_empty @set.dependencies end end @@ -708,26 +711,20 @@ end end def test_platforms - util_set_arch 'i686-darwin8.10.1' do - @gda.platforms :ruby do - @gda.gem 'a' - end + unless win_platform? + util_set_arch 'i686-darwin8.10.1' do + @gda.platforms :ruby do + @gda.gem 'a' + end - assert_equal [dep('a')], @set.dependencies + assert_equal [dep('a')], @set.dependencies - @gda.platforms :mswin do - @gda.gem 'b' - end + @gda.platforms :mswin do + @gda.gem 'b' + end - assert_equal [dep('a')], @set.dependencies - end - - util_set_arch 'x86-mswin32-60' do - @gda.platforms :mswin do - @gda.gem 'c' + assert_equal [dep('a')], @set.dependencies end - - assert_equal [dep('a'), dep('c')], @set.dependencies end end diff --git a/test/rubygems/test_gem_specification.rb b/test/rubygems/test_gem_specification.rb index d2ecbf4434..797e34cd92 100644 --- a/test/rubygems/test_gem_specification.rb +++ b/test/rubygems/test_gem_specification.rb @@ -2936,7 +2936,7 @@ duplicate dependency on c (>= 1.2.3, development), (~> 1.2) use: end expected = <<-EXPECTED -WARN: Unresolved or ambigious specs during Gem::Specification.reset: +WARN: Unresolved or ambiguous specs during Gem::Specification.reset: x (= 1) WARN: Clearing out unresolved specs. Try 'gem cleanup <gem>' Please report a bug if this causes problems. @@ -2964,7 +2964,7 @@ Please report a bug if this causes problems. end expected = <<-EXPECTED -WARN: Unresolved or ambigious specs during Gem::Specification.reset: +WARN: Unresolved or ambiguous specs during Gem::Specification.reset: x (= 1) Available/installed versions of this gem: - 1 |