From d6a5fe709ec4b04589684074d901b1ec21e812dc Mon Sep 17 00:00:00 2001 From: drbrain Date: Tue, 10 Dec 2013 19:54:19 +0000 Subject: * lib/rubygems: Update to RubyGems master ec8ed22. Notable changes include: * Renamed extension_install_dir to extension_dir (backwards compatible). * Fixed creation of gem.deps.rb.lock file from TestGemRequestSet#test_install_from_gemdeps_install_dir * Fixed a typo and some documentation. * test/rubygems: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44129 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/rubygems/test_gem_ext_builder.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'test/rubygems/test_gem_ext_builder.rb') diff --git a/test/rubygems/test_gem_ext_builder.rb b/test/rubygems/test_gem_ext_builder.rb index fc6bbe4e18..eea8488b63 100644 --- a/test/rubygems/test_gem_ext_builder.rb +++ b/test/rubygems/test_gem_ext_builder.rb @@ -124,10 +124,10 @@ install: @builder.build_extensions end - assert_path_exists @spec.extension_install_dir + assert_path_exists @spec.extension_dir assert_path_exists @spec.gem_build_complete_path - assert_path_exists File.join @spec.extension_install_dir, 'gem_make.out' - assert_path_exists File.join @spec.extension_install_dir, 'a.rb' + assert_path_exists File.join @spec.extension_dir, 'gem_make.out' + assert_path_exists File.join @spec.extension_dir, 'a.rb' assert_path_exists File.join @spec.gem_dir, 'lib', 'a.rb' assert_path_exists File.join @spec.gem_dir, 'lib', 'a', 'b.rb' end @@ -140,11 +140,11 @@ install: assert_equal '', @ui.output assert_equal '', @ui.error - refute_path_exists File.join @spec.extension_install_dir, 'gem_make.out' + refute_path_exists File.join @spec.extension_dir, 'gem_make.out' end def test_build_extensions_rebuild_failure - FileUtils.mkdir_p @spec.extension_install_dir + FileUtils.mkdir_p @spec.extension_dir FileUtils.touch @spec.gem_build_complete_path @spec.extensions << nil @@ -175,7 +175,7 @@ install: @ui.output assert_equal '', @ui.error - gem_make_out = File.join @spec.extension_install_dir, 'gem_make.out' + gem_make_out = File.join @spec.extension_dir, 'gem_make.out' assert_match %r%#{Regexp.escape Gem.ruby} extconf\.rb%, File.read(gem_make_out) @@ -187,7 +187,7 @@ install: def test_build_extensions_unsupported FileUtils.mkdir_p @spec.gem_dir - gem_make_out = File.join @spec.extension_install_dir, 'gem_make.out' + gem_make_out = File.join @spec.extension_dir, 'gem_make.out' @spec.extensions << nil e = assert_raises Gem::Ext::BuildError do @@ -239,7 +239,7 @@ install: path = File.join @spec.gem_dir, "extconf_args" assert_equal args.inspect, File.read(path).strip - assert_path_exists @spec.extension_install_dir + assert_path_exists @spec.extension_dir end def test_initialize -- cgit v1.2.3