aboutsummaryrefslogtreecommitdiffstats
path: root/test/rubygems
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-01-09 14:20:10 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-01-09 14:20:10 +0000
commit07b87cd239db5b556a6a9bb38ea78cd2540e4682 (patch)
tree6ee91107d81d30c7c9786dbf8f48be468827f851 /test/rubygems
parent30253e6a247425a6916132a79efed30db7eb2e2c (diff)
downloadruby-07b87cd239db5b556a6a9bb38ea78cd2540e4682.tar.gz
* lib/rubygems: Update to RubyGems HEAD(e53c54a).
* test/rubygems: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49195 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/rubygems')
-rw-r--r--test/rubygems/test_gem.rb7
-rw-r--r--test/rubygems/test_gem_commands_pristine_command.rb4
-rw-r--r--test/rubygems/test_gem_commands_unpack_command.rb4
-rw-r--r--test/rubygems/test_gem_dependency_installer.rb28
-rw-r--r--test/rubygems/test_gem_ext_cmake_builder.rb2
-rw-r--r--test/rubygems/test_gem_installer.rb2
-rw-r--r--test/rubygems/test_gem_package.rb2
-rw-r--r--test/rubygems/test_gem_uninstaller.rb4
8 files changed, 38 insertions, 15 deletions
diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb
index 47f57abf81..0428bea213 100644
--- a/test/rubygems/test_gem.rb
+++ b/test/rubygems/test_gem.rb
@@ -1145,7 +1145,7 @@ class TestGem < Gem::TestCase
]
tests.each do |_name, _paths, expected|
- Gem.paths = { 'GEM_HOME' => _paths.first, 'GEM_PATH' => _paths }
+ Gem.use_paths _paths.first, _paths
Gem::Specification.reset
Gem.searcher = nil
@@ -1192,10 +1192,7 @@ class TestGem < Gem::TestCase
install_gem m, :install_dir => Gem.dir
install_gem m, :install_dir => Gem.user_dir
- Gem.paths = {
- 'GEM_HOME' => Gem.dir,
- 'GEM_PATH' => [ Gem.dir, Gem.user_dir]
- }
+ Gem.use_paths Gem.dir, [ Gem.dir, Gem.user_dir]
assert_equal \
File.join(Gem.dir, "gems", "m-1"),
diff --git a/test/rubygems/test_gem_commands_pristine_command.rb b/test/rubygems/test_gem_commands_pristine_command.rb
index 554d503811..38e00bb1cc 100644
--- a/test/rubygems/test_gem_commands_pristine_command.rb
+++ b/test/rubygems/test_gem_commands_pristine_command.rb
@@ -231,7 +231,7 @@ class TestGemCommandsPristineCommand < Gem::TestCase
Gem.clear_paths
gemhome2 = File.join @tempdir, 'gemhome2'
- Gem.paths = { "GEM_PATH" => [gemhome2, @gemhome], "GEM_HOME" => gemhome2 }
+ Gem.use_paths gemhome2, [gemhome2, @gemhome]
b = util_spec 'b'
install_gem b
@@ -301,7 +301,7 @@ class TestGemCommandsPristineCommand < Gem::TestCase
Gem.clear_paths
gemhome2 = File.join(@tempdir, 'gemhome2')
- Gem.paths = { "GEM_PATH" => [gemhome2, @gemhome], "GEM_HOME" => gemhome2 }
+ Gem.use_paths gemhome2, [gemhome2, @gemhome]
install_gem specs["b-1"]
FileUtils.rm File.join(gemhome2, 'cache', 'b-1.gem')
diff --git a/test/rubygems/test_gem_commands_unpack_command.rb b/test/rubygems/test_gem_commands_unpack_command.rb
index 59f6cc6c74..9264b3fc13 100644
--- a/test/rubygems/test_gem_commands_unpack_command.rb
+++ b/test/rubygems/test_gem_commands_unpack_command.rb
@@ -66,7 +66,7 @@ class TestGemCommandsUnpackCommand < Gem::TestCase
gemhome2 = File.join @tempdir, 'gemhome2'
- Gem.paths = { "GEM_PATH" => [gemhome2, @gemhome], "GEM_HOME" => gemhome2 }
+ Gem.use_paths gemhome2, [gemhome2, @gemhome]
@cmd.options[:args] = %w[a]
@@ -86,7 +86,7 @@ class TestGemCommandsUnpackCommand < Gem::TestCase
gemhome2 = File.join @tempdir, 'gemhome2'
- Gem.paths = { "GEM_PATH" => [gemhome2, @gemhome], "GEM_HOME" => gemhome2 }
+ Gem.use_paths gemhome2, [gemhome2, @gemhome]
@cmd.options[:args] = %w[z]
diff --git a/test/rubygems/test_gem_dependency_installer.rb b/test/rubygems/test_gem_dependency_installer.rb
index 8a0470761e..82640068e4 100644
--- a/test/rubygems/test_gem_dependency_installer.rb
+++ b/test/rubygems/test_gem_dependency_installer.rb
@@ -14,6 +14,14 @@ class TestGemDependencyInstaller < Gem::TestCase
FileUtils.mkdir @gems_dir
Gem::RemoteFetcher.fetcher = @fetcher = Gem::FakeFetcher.new
+
+ @original_platforms = Gem.platforms
+ Gem.platforms = []
+ end
+
+ def teardown
+ Gem.platforms = @original_platforms
+ super
end
def util_setup_gems
@@ -272,7 +280,7 @@ class TestGemDependencyInstaller < Gem::TestCase
# This asserts that if a gem's dependency is satisfied by an
# already installed gem, RubyGems doesn't installed a newer
# version
- def test_install_doesnt_upgrade_installed_depedencies
+ def test_install_doesnt_upgrade_installed_dependencies
util_setup_gems
a2, a2_gem = util_gem 'a', '2'
@@ -1084,6 +1092,24 @@ class TestGemDependencyInstaller < Gem::TestCase
assert_equal [@a1_pre, @a1], prereleases
end
+ def test_find_gems_with_sources_with_best_only_and_platform
+ util_setup_gems
+ a1_x86_mingw32, = util_gem 'a', '1' do |s|
+ s.platform = 'x86-mingw32'
+ end
+ util_setup_spec_fetcher @a1, a1_x86_mingw32
+ Gem.platforms << Gem::Platform.new('x86-mingw32')
+
+ installer = Gem::DependencyInstaller.new
+
+ dependency = Gem::Dependency.new('a', Gem::Requirement.default)
+
+ releases =
+ installer.find_gems_with_sources(dependency, true).all_specs
+
+ assert_equal [a1_x86_mingw32], releases
+ end
+
def test_find_gems_with_sources_with_bad_source
Gem.sources.replace ["http://not-there.nothing"]
diff --git a/test/rubygems/test_gem_ext_cmake_builder.rb b/test/rubygems/test_gem_ext_cmake_builder.rb
index aaece6868b..a36be476be 100644
--- a/test/rubygems/test_gem_ext_cmake_builder.rb
+++ b/test/rubygems/test_gem_ext_cmake_builder.rb
@@ -20,7 +20,7 @@ class TestGemExtCmakeBuilder < Gem::TestCase
def test_self_build
File.open File.join(@ext, 'CMakeLists.txt'), 'w' do |cmakelists|
cmakelists.write <<-eo_cmake
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.6)
install (FILES test.txt DESTINATION bin)
eo_cmake
end
diff --git a/test/rubygems/test_gem_installer.rb b/test/rubygems/test_gem_installer.rb
index 6f8012feb8..701fda15d4 100644
--- a/test/rubygems/test_gem_installer.rb
+++ b/test/rubygems/test_gem_installer.rb
@@ -319,7 +319,7 @@ gem 'other', version
options = {
:bin_dir => bin_dir,
- :install_dir => "/non/existant"
+ :install_dir => "/non/existent"
}
inst = Gem::Installer.new '', options
diff --git a/test/rubygems/test_gem_package.rb b/test/rubygems/test_gem_package.rb
index 128dcdb1c4..9d9c224349 100644
--- a/test/rubygems/test_gem_package.rb
+++ b/test/rubygems/test_gem_package.rb
@@ -298,7 +298,7 @@ class TestGemPackage < Gem::Package::TarTestCase
assert_equal %w[lib/code.rb], reader.contents
end
- def test_build_signed_encryped_key
+ def test_build_signed_encrypted_key
skip 'openssl is missing' unless defined?(OpenSSL::SSL)
spec = Gem::Specification.new 'build', '1'
diff --git a/test/rubygems/test_gem_uninstaller.rb b/test/rubygems/test_gem_uninstaller.rb
index 2a9a15d5b1..774fbe5ae8 100644
--- a/test/rubygems/test_gem_uninstaller.rb
+++ b/test/rubygems/test_gem_uninstaller.rb
@@ -385,7 +385,7 @@ create_makefile '#{@spec.name}'
assert_match %r!Successfully uninstalled q-1!, lines.last
end
- def test_uninstall_only_lists_unsatified_deps
+ def test_uninstall_only_lists_unsatisfied_deps
quick_gem 'r', '1' do |s| s.add_dependency 'q', '~> 1.0' end
quick_gem 'x', '1' do |s| s.add_dependency 'q', '= 1.0' end
quick_gem 'q', '1.0'
@@ -409,7 +409,7 @@ create_makefile '#{@spec.name}'
assert_match %r!Successfully uninstalled q-1.0!, lines.last
end
- def test_uninstall_doesnt_prompt_when_other_gem_satifies_requirement
+ def test_uninstall_doesnt_prompt_when_other_gem_satisfies_requirement
quick_gem 'r', '1' do |s| s.add_dependency 'q', '~> 1.0' end
quick_gem 'q', '1.0'
quick_gem 'q', '1.1'