summaryrefslogtreecommitdiff
path: root/test/rubygems
diff options
context:
space:
mode:
Diffstat (limited to 'test/rubygems')
-rw-r--r--test/rubygems/test_gem.rb7
-rw-r--r--test/rubygems/test_gem_commands_cert_command.rb6
-rw-r--r--test/rubygems/test_gem_commands_environment_command.rb3
-rw-r--r--test/rubygems/test_gem_commands_fetch_command.rb2
-rw-r--r--test/rubygems/test_gem_commands_specification_command.rb3
-rw-r--r--test/rubygems/test_gem_dependency_installer.rb24
-rw-r--r--test/rubygems/test_gem_remote_fetcher.rb2
-rw-r--r--test/rubygems/test_gem_server.rb25
-rw-r--r--test/rubygems/test_gem_source_index.rb2
-rw-r--r--test/rubygems/test_gem_version.rb2
-rw-r--r--test/rubygems/test_kernel.rb1
11 files changed, 44 insertions, 33 deletions
diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb
index 41b127ce39..e0160950f8 100644
--- a/test/rubygems/test_gem.rb
+++ b/test/rubygems/test_gem.rb
@@ -1,4 +1,3 @@
-require 'test/unit'
require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
require 'rubygems'
require 'rubygems/gem_openssl'
@@ -75,6 +74,8 @@ class TestGem < RubyGemTestCase
install_gem foo
end
+ Gem.source_index = nil
+
gem 'foo'
expected = File.join @gemhome, 'gems', foo.full_name, 'data', 'foo'
@@ -280,9 +281,7 @@ class TestGem < RubyGemTestCase
def test_self_prefix
file_name = File.expand_path __FILE__
- expected = File.dirname File.dirname(file_name)
- expected = File.dirname expected if expected =~ %r|/test| # for Ruby trunk
- assert_equal expected, Gem.prefix
+ assert_equal File.dirname(File.dirname(file_name)), Gem.prefix
end
def test_self_required_location
diff --git a/test/rubygems/test_gem_commands_cert_command.rb b/test/rubygems/test_gem_commands_cert_command.rb
index 09a401e4f7..79e3e72158 100644
--- a/test/rubygems/test_gem_commands_cert_command.rb
+++ b/test/rubygems/test_gem_commands_cert_command.rb
@@ -3,6 +3,10 @@ require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
require 'rubygems/commands/cert_command'
+unless defined? OpenSSL then
+ warn "`gem cert` tests are being skipped, module OpenSSL not found"
+end
+
class TestGemCommandsCertCommand < RubyGemTestCase
def setup
@@ -118,5 +122,5 @@ class TestGemCommandsCertCommand < RubyGemTestCase
# HACK this test sucks
end
-end
+end if defined? OpenSSL
diff --git a/test/rubygems/test_gem_commands_environment_command.rb b/test/rubygems/test_gem_commands_environment_command.rb
index 65c8cf3133..0913888a6d 100644
--- a/test/rubygems/test_gem_commands_environment_command.rb
+++ b/test/rubygems/test_gem_commands_environment_command.rb
@@ -25,7 +25,8 @@ class TestGemCommandsEnvironmentCommand < RubyGemTestCase
assert_match %r|INSTALLATION DIRECTORY: #{Regexp.escape @gemhome}|,
@ui.output
assert_match %r|RUBYGEMS PREFIX: |, @ui.output
- assert_match %r|RUBY EXECUTABLE:.*ruby|, @ui.output
+ assert_match %r|RUBY EXECUTABLE:.*#{Gem::ConfigMap[:RUBY_INSTALL_NAME]}|,
+ @ui.output
assert_match %r|RUBYGEMS PLATFORMS:|, @ui.output
assert_match %r|- #{Gem::Platform.local}|, @ui.output
assert_match %r|GEM PATHS:|, @ui.output
diff --git a/test/rubygems/test_gem_commands_fetch_command.rb b/test/rubygems/test_gem_commands_fetch_command.rb
index 3aa9119378..d8651680b0 100644
--- a/test/rubygems/test_gem_commands_fetch_command.rb
+++ b/test/rubygems/test_gem_commands_fetch_command.rb
@@ -1,5 +1,7 @@
require 'test/unit'
require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
+require 'rubygems/package'
+require 'rubygems/security'
require 'rubygems/commands/fetch_command'
class TestGemCommandsFetchCommand < RubyGemTestCase
diff --git a/test/rubygems/test_gem_commands_specification_command.rb b/test/rubygems/test_gem_commands_specification_command.rb
index 3741446536..c8f57fef58 100644
--- a/test/rubygems/test_gem_commands_specification_command.rb
+++ b/test/rubygems/test_gem_commands_specification_command.rb
@@ -85,7 +85,8 @@ class TestGemCommandsSpecificationCommand < RubyGemTestCase
@cmd.execute
end
- assert_equal "#{foo.to_yaml}\n", @ui.output
+ assert_match %r|\A--- !ruby/object:Gem::Specification|, @ui.output
+ assert_match %r|name: foo|, @ui.output
assert_equal "WARNING: Remote information is not complete\n\n", @ui.error
end
diff --git a/test/rubygems/test_gem_dependency_installer.rb b/test/rubygems/test_gem_dependency_installer.rb
index c299476eeb..d2d33fa313 100644
--- a/test/rubygems/test_gem_dependency_installer.rb
+++ b/test/rubygems/test_gem_dependency_installer.rb
@@ -288,19 +288,21 @@ class TestGemDependencyInstaller < RubyGemTestCase
assert_equal %w[a-1], inst.installed_gems.map { |s| s.full_name }
end
- def test_install_security_policy
- FileUtils.mv @a1_gem, @cache_dir
- FileUtils.mv @b1_gem, @cache_dir
- policy = Gem::Security::HighSecurity
- inst = Gem::DependencyInstaller.new 'b', nil, :security_policy => policy
-
- e = assert_raise Gem::Exception do
- inst.install
- end
+ if defined? OpenSSL then
+ def test_install_security_policy
+ FileUtils.mv @a1_gem, @cache_dir
+ FileUtils.mv @b1_gem, @cache_dir
+ policy = Gem::Security::HighSecurity
+ inst = Gem::DependencyInstaller.new 'b', nil, :security_policy => policy
+
+ e = assert_raise Gem::Exception do
+ inst.install
+ end
- assert_equal 'Unsigned gem', e.message
+ assert_equal 'Unsigned gem', e.message
- assert_equal %w[], inst.installed_gems.map { |s| s.full_name }
+ assert_equal %w[], inst.installed_gems.map { |s| s.full_name }
+ end
end
def test_install_wrappers
diff --git a/test/rubygems/test_gem_remote_fetcher.rb b/test/rubygems/test_gem_remote_fetcher.rb
index fd3843851a..5ffaed24e3 100644
--- a/test/rubygems/test_gem_remote_fetcher.rb
+++ b/test/rubygems/test_gem_remote_fetcher.rb
@@ -271,7 +271,7 @@ gems:
fetcher.fetch_path 'uri'
end
- assert_match %r|\AErrno::ECONNREFUSED: .* - connect\(2\) reading uri\z|,
+ assert_match %r|ECONNREFUSED:.*connect\(2\) reading uri\z|,
e.message
end
diff --git a/test/rubygems/test_gem_server.rb b/test/rubygems/test_gem_server.rb
index c283e661dc..463ce35180 100644
--- a/test/rubygems/test_gem_server.rb
+++ b/test/rubygems/test_gem_server.rb
@@ -53,10 +53,10 @@ class TestGemServer < RubyGemTestCase
assert_equal 200, @res.status, @res.body
assert @res['date']
assert_equal 'text/plain', @res['content-type']
- yaml = Zlib::Inflate.inflate(@res.body)
- assert_match %r|Gem::Specification|, yaml
- assert_match %r|name: a|, yaml
- assert_match %r|version: "1"|, yaml
+
+ spec = YAML.load Zlib::Inflate.inflate(@res.body)
+ assert_equal 'a', spec.name
+ assert_equal Gem::Version.new(1), spec.version
end
def test_quick_a_1_mswin32_gemspec_rz
@@ -72,10 +72,11 @@ class TestGemServer < RubyGemTestCase
assert_equal 200, @res.status, @res.body
assert @res['date']
assert_equal 'text/plain', @res['content-type']
- yaml = Zlib::Inflate.inflate(@res.body)
- assert_match %r|Gem::Specification|, yaml
- assert_match %r|name: a|, yaml
- assert_match %r|version: "1"|, yaml
+
+ spec = YAML.load Zlib::Inflate.inflate(@res.body)
+ assert_equal 'a', spec.name
+ assert_equal Gem::Version.new(1), spec.version
+ assert_equal Gem::Platform.local, spec.platform
end
def test_quick_common_substrings
@@ -91,10 +92,10 @@ class TestGemServer < RubyGemTestCase
assert_equal 200, @res.status, @res.body
assert @res['date']
assert_equal 'text/plain', @res['content-type']
- yaml = Zlib::Inflate.inflate @res.body
- assert_match %r|Gem::Specification|, yaml
- assert_match %r|name: a$|, yaml
- assert_match %r|version: "1"|, yaml
+
+ spec = YAML.load Zlib::Inflate.inflate(@res.body)
+ assert_equal 'a', spec.name
+ assert_equal Gem::Version.new(1), spec.version
end
def test_quick_z_9_gemspec_rz
diff --git a/test/rubygems/test_gem_source_index.rb b/test/rubygems/test_gem_source_index.rb
index 45f59f2430..8fc8449814 100644
--- a/test/rubygems/test_gem_source_index.rb
+++ b/test/rubygems/test_gem_source_index.rb
@@ -401,7 +401,7 @@ class TestGemSourceIndex < RubyGemTestCase
def test_update_with_missing
marshal_uri = File.join @gem_repo, "quick", "Marshal.#{@marshal_version}",
"#{@gem3.full_name}.gemspec.rz"
- dumped = Marshal.dump(@gem3)
+ dumped = Marshal.dump @gem3
@fetcher.data[marshal_uri] = util_zip(dumped)
use_ui @ui do
diff --git a/test/rubygems/test_gem_version.rb b/test/rubygems/test_gem_version.rb
index 99dd49933d..27c522c3d7 100644
--- a/test/rubygems/test_gem_version.rb
+++ b/test/rubygems/test_gem_version.rb
@@ -185,7 +185,7 @@ class TestGemVersion < RubyGemTestCase
def assert_adequate(version, requirement)
ver = Gem::Version.new(version)
- req = Gem::Version::Requirement.new(requirement)
+ req = Gem::Requirement.new(requirement)
assert req.satisfied_by?(ver),
"Version #{version} should be adequate for Requirement #{requirement}"
end
diff --git a/test/rubygems/test_kernel.rb b/test/rubygems/test_kernel.rb
index e06a78e32a..3c6448e470 100644
--- a/test/rubygems/test_kernel.rb
+++ b/test/rubygems/test_kernel.rb
@@ -7,6 +7,7 @@
require 'test/unit'
require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
+require 'rubygems/package'
class TestKernel < RubyGemTestCase
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 12:16:41 +0000