diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/rubygems/test_gem.rb | 16 | ||||
-rw-r--r-- | test/rubygems/test_gem_dependency_resolver_dependency_conflict.rb | 4 | ||||
-rw-r--r-- | test/rubygems/test_gem_remote_fetcher.rb | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb index a4e5313c5d..6cce66ce58 100644 --- a/test/rubygems/test_gem.rb +++ b/test/rubygems/test_gem.rb @@ -1112,29 +1112,29 @@ class TestGem < Gem::TestCase assert_equal '["a-1", "b-1", "c-1"]', out.strip end - + def test_register_default_spec Gem.clear_default_specs - + old_style = Gem::Specification.new do |spec| spec.files = ["foo.rb", "bar.rb"] end - + Gem.register_default_spec old_style - + assert_equal old_style, Gem.find_unresolved_default_spec("foo.rb") assert_equal old_style, Gem.find_unresolved_default_spec("bar.rb") assert_equal nil, Gem.find_unresolved_default_spec("baz.rb") - + Gem.clear_default_specs - + new_style = Gem::Specification.new do |spec| spec.files = ["lib/foo.rb", "ext/bar.rb", "bin/exec", "README"] spec.require_paths = ["lib", "ext"] end - + Gem.register_default_spec new_style - + assert_equal new_style, Gem.find_unresolved_default_spec("foo.rb") assert_equal new_style, Gem.find_unresolved_default_spec("bar.rb") assert_equal nil, Gem.find_unresolved_default_spec("exec") diff --git a/test/rubygems/test_gem_dependency_resolver_dependency_conflict.rb b/test/rubygems/test_gem_dependency_resolver_dependency_conflict.rb index 56a34d3001..5043865e5c 100644 --- a/test/rubygems/test_gem_dependency_resolver_dependency_conflict.rb +++ b/test/rubygems/test_gem_dependency_resolver_dependency_conflict.rb @@ -6,7 +6,7 @@ class TestGemDependencyResolverDependencyConflict < Gem::TestCase def test_explanation root = dependency_request dep('net-ssh', '>= 2.0.13'), 'rye', '0.9.8' - child = + child = dependency_request dep('net-ssh', '>= 2.6.5'), 'net-ssh', '2.2.2', root conflict = @@ -23,7 +23,7 @@ class TestGemDependencyResolverDependencyConflict < Gem::TestCase def test_request_path root = dependency_request dep('net-ssh', '>= 2.0.13'), 'rye', '0.9.8' - child = + child = dependency_request dep('net-ssh', '>= 2.6.5'), 'net-ssh', '2.2.2', root conflict = diff --git a/test/rubygems/test_gem_remote_fetcher.rb b/test/rubygems/test_gem_remote_fetcher.rb index 7ffb638436..572148f125 100644 --- a/test/rubygems/test_gem_remote_fetcher.rb +++ b/test/rubygems/test_gem_remote_fetcher.rb @@ -600,7 +600,7 @@ gems: skip 'openssl is missing' unless defined?(OpenSSL::SSL) ssl_server = self.class.start_ssl_server({ - :SSLVerifyClient => + :SSLVerifyClient => OpenSSL::SSL::VERIFY_PEER|OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT}) temp_ca_cert = File.join(DIR, 'ca_cert.pem') @@ -617,7 +617,7 @@ gems: skip 'openssl is missing' unless defined?(OpenSSL::SSL) ssl_server = self.class.start_ssl_server({ - :SSLVerifyClient => + :SSLVerifyClient => OpenSSL::SSL::VERIFY_PEER|OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT}) temp_ca_cert = File.join(DIR, 'ca_cert.pem') |