diff options
author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-29 06:52:18 +0000 |
---|---|---|
committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-29 06:52:18 +0000 |
commit | 9694bb8cac12969300692dac5a1cf7aa4e3a46cd (patch) | |
tree | c3cb423d701f7049ba9382de052e2a937cd1302d /test/rubygems/test_gem_commands_build_command.rb | |
parent | 3f606b7063fc7a8b191556365ad343a314719a8d (diff) | |
download | ruby-9694bb8cac12969300692dac5a1cf7aa4e3a46cd.tar.gz |
* lib/rubygems*: Updated to RubyGems 2.0
* test/rubygems*: ditto.
* common.mk (prelude): Updated for RubyGems 2.0 source rearrangement.
* tool/change_maker.rb: Allow invalid UTF-8 characters in source
files.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37976 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/rubygems/test_gem_commands_build_command.rb')
-rw-r--r-- | test/rubygems/test_gem_commands_build_command.rb | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/test/rubygems/test_gem_commands_build_command.rb b/test/rubygems/test_gem_commands_build_command.rb index 5d374542ba..24ee9c8bba 100644 --- a/test/rubygems/test_gem_commands_build_command.rb +++ b/test/rubygems/test_gem_commands_build_command.rb @@ -1,6 +1,6 @@ require 'rubygems/test_case' require 'rubygems/commands/build_command' -require 'rubygems/format' +require 'rubygems/package' class TestGemCommandsBuildCommand < Gem::TestCase @@ -24,16 +24,6 @@ class TestGemCommandsBuildCommand < Gem::TestCase util_test_build_gem @gem, gemspec_file end - def test_execute_yaml - gemspec_file = File.join(@tempdir, @gem.spec_name) - - File.open gemspec_file, 'w' do |gs| - gs.write @gem.to_yaml - end - - util_test_build_gem @gem, gemspec_file - end - def test_execute_bad_spec @gem.date = "2010-11-08" @@ -72,7 +62,7 @@ class TestGemCommandsBuildCommand < Gem::TestCase assert_equal "ERROR: Gemspec file not found: some_gem\n", @ui.error end - def util_test_build_gem(gem, gemspec_file) + def util_test_build_gem(gem, gemspec_file, check_licenses=true) @cmd.options[:args] = [gemspec_file] use_ui @ui do @@ -87,32 +77,34 @@ class TestGemCommandsBuildCommand < Gem::TestCase assert_equal " Version: 2", output.shift assert_equal " File: some_gem-2.gem", output.shift assert_equal [], output - assert_equal '', @ui.error + + if check_licenses + assert_equal "WARNING: licenses is empty\n", @ui.error + end gem_file = File.join @tempdir, File.basename(gem.cache_file) assert File.exist?(gem_file) - spec = Gem::Format.from_file_by_path(gem_file).spec + spec = Gem::Package.new(gem_file).spec assert_equal "some_gem", spec.name assert_equal "this is a summary", spec.summary end def test_execute_force - @gem.instance_variable_set :@required_rubygems_version, nil - gemspec_file = File.join(@tempdir, @gem.spec_name) + @gem.send :remove_instance_variable, :@rubygems_version + File.open gemspec_file, 'w' do |gs| - gs.write @gem.to_yaml + gs.write @gem.to_ruby end @cmd.options[:args] = [gemspec_file] @cmd.options[:force] = true - util_test_build_gem @gem, gemspec_file + util_test_build_gem @gem, gemspec_file, false end - end |