diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-17 15:01:47 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-17 15:01:47 +0000 |
commit | 3e3f03461b83e8cb3bd6c9033d5f3619ee18bb92 (patch) | |
tree | dbdc4ee69d27e9f8de00989d6fc36998ca9a696b /test/rubygems | |
parent | d1ce1051b9057a1ac76ad87822a56db539efdb8b (diff) |
merge revision(s) 39606,39609: [Backport #8019]
* lib/rubygems/commands/query_command.rb: Only fetch remote specs when
showing details. [ruby-trunk - Bug #8019] RubyGems bug #487
* lib/rubygems/remote_fetcher.rb: ditto.
* lib/rubygems/security/policy.rb: ditto.
* test/rubygems/test_gem_commands_query_command.rb: Test for the
above.
* lib/rubygems/security.rb: Make OpenSSL optional for RubyGems.
* lib/rubygems/commands/cert_command.rb: ditto.
* lib/rubygems/config_file.rb: Display file with YAML error, not
~/.gemrc
* lib/rubygems/remote_fetcher.rb: Only create gem subdirectories when
installing gems.
* lib/rubygems/dependency_resolver.rb: ditto.
* lib/rubygems/test_utilities.rb: ditto.
* test/rubygems/test_gem_commands_fetch_command.rb: Test for the
above.
* lib/rubygems/spec_fetcher.rb: Only try to upgrade
http://rubygems.org to HTTPS
* test/rubygems/test_gem_spec_fetcher.rb: Test for the above.
* lib/rubygems.rb: Update win_platform? check for JRuby compatibility.
* test/rubygems/test_gem_installer.rb: Update for Ruby 1.9.2
compatibility
* test/rubygems/test_gem_spec_fetcher.rb: Removed unused variable.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39797 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/rubygems')
-rw-r--r-- | test/rubygems/test_gem_commands_fetch_command.rb | 4 | ||||
-rw-r--r-- | test/rubygems/test_gem_commands_query_command.rb | 16 | ||||
-rw-r--r-- | test/rubygems/test_gem_installer.rb | 4 | ||||
-rw-r--r-- | test/rubygems/test_gem_spec_fetcher.rb | 26 |
4 files changed, 44 insertions, 6 deletions
diff --git a/test/rubygems/test_gem_commands_fetch_command.rb b/test/rubygems/test_gem_commands_fetch_command.rb index 561075aac5..924f4c44e7 100644 --- a/test/rubygems/test_gem_commands_fetch_command.rb +++ b/test/rubygems/test_gem_commands_fetch_command.rb @@ -18,6 +18,8 @@ class TestGemCommandsFetchCommand < Gem::TestCase @fetcher.data["#{@gem_repo}gems/#{@a2.file_name}"] = File.read(@a2.cache_file) + refute_path_exists File.join(@tempdir, 'cache'), 'sanity check' + @cmd.options[:args] = [@a2.name] use_ui @ui do @@ -28,6 +30,8 @@ class TestGemCommandsFetchCommand < Gem::TestCase assert_path_exists(File.join(@tempdir, @a2.file_name), "#{@a2.full_name} not fetched") + refute_path_exists File.join(@tempdir, 'cache'), + 'gem repository directories must not be created' end def test_execute_prerelease diff --git a/test/rubygems/test_gem_commands_query_command.rb b/test/rubygems/test_gem_commands_query_command.rb index c14fbc0099..b79d13d270 100644 --- a/test/rubygems/test_gem_commands_query_command.rb +++ b/test/rubygems/test_gem_commands_query_command.rb @@ -430,5 +430,21 @@ pl \(1\) assert_equal expected, @ui.output end + def test_make_entry + @fetcher.data.delete \ + "#{@gem_repo}quick/Marshal.#{Gem.marshal_version}/#{@a2.original_name}.gemspec.rz" + + entry_tuples = [ + [Gem::NameTuple.new(@a2.name, @a2.version, @a2.platform), + Gem.sources.first], + ] + + platforms = { @a2.version => [@a2.platform] } + + entry = @cmd.send :make_entry, entry_tuples, platforms + + assert_equal 'a (2)', entry + end + end diff --git a/test/rubygems/test_gem_installer.rb b/test/rubygems/test_gem_installer.rb index 3f3d4c5a00..0f9bfefd0e 100644 --- a/test/rubygems/test_gem_installer.rb +++ b/test/rubygems/test_gem_installer.rb @@ -1060,7 +1060,9 @@ gem 'other', version end def test_install_extension_flat - skip '1.8 mkmf.rb does not create TOUCH' if RUBY_VERSION < '1.9' + skip '1.9.2 and earlier mkmf.rb does not create TOUCH' if + RUBY_VERSION < '1.9.3' + @spec.require_paths = ["."] @spec.extensions << "extconf.rb" diff --git a/test/rubygems/test_gem_spec_fetcher.rb b/test/rubygems/test_gem_spec_fetcher.rb index ac48edde96..51cdee7687 100644 --- a/test/rubygems/test_gem_spec_fetcher.rb +++ b/test/rubygems/test_gem_spec_fetcher.rb @@ -245,7 +245,6 @@ class TestGemSpecFetcher < Gem::TestCase source = Gem::Source.new URI 'http://example' same_source = nil - https_source = nil use_ui @ui do same_source = @sf.upgrade_http_source source @@ -253,19 +252,36 @@ class TestGemSpecFetcher < Gem::TestCase assert_equal URI('http://example'), same_source.uri - @fetcher.data['https://example/'] = 'hello' + assert_empty @ui.output + assert_empty @ui.error + end + + def test_upgrade_http_source_rubygems + Gem.configuration.verbose = :really + + source = Gem::Source.new URI 'http://rubygems.org' + same_source = nil + https_source = nil + + use_ui @ui do + same_source = @sf.upgrade_http_source source + end + + assert_equal URI('http://rubygems.org'), same_source.uri + + @fetcher.data['https://rubygems.org/'] = 'hello' use_ui @ui do https_source = @sf.upgrade_http_source source end - assert_equal URI('https://example'), https_source.uri + assert_equal URI('https://rubygems.org'), https_source.uri assert_empty @ui.error expected = <<-EXPECTED -Upgrading http://example to HTTPS failed, continuing -Upgraded http://example to HTTPS +Upgrading http://rubygems.org to HTTPS failed, continuing +Upgraded http://rubygems.org to HTTPS EXPECTED assert_equal expected, @ui.output |