* 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

1 files changed, 17 insertions, 17 deletions

diff --git a/test/rubygems/test_gem_specification.rb b/test/rubygems/test_gem_specification.rb
index 76cb12ca58..4c35329003 100644
--- a/test/rubygems/test_gem_specification.rb
+++ b/test/rubygems/test_gem_specification.rb
@@ -1115,7 +1115,7 @@ dependencies: []
   def test_build_extensions
     ext_spec
 
-    refute_path_exists @ext.extension_install_dir, 'sanity check'
+    refute_path_exists @ext.extension_dir, 'sanity check'
     refute_empty @ext.extensions, 'sanity check'
 
     extconf_rb = File.join @ext.gem_dir, @ext.extensions.first
@@ -1133,7 +1133,7 @@ dependencies: []
 
     @ext.build_extensions
 
-    assert_path_exists @ext.extension_install_dir
+    assert_path_exists @ext.extension_dir
   end
 
   def test_build_extensions_built
@@ -1142,14 +1142,14 @@ dependencies: []
     refute_empty @ext.extensions, 'sanity check'
 
     gem_build_complete =
-      File.join @ext.extension_install_dir, 'gem.build_complete'
+      File.join @ext.extension_dir, 'gem.build_complete'
 
-    FileUtils.mkdir_p @ext.extension_install_dir
+    FileUtils.mkdir_p @ext.extension_dir
     FileUtils.touch gem_build_complete
 
     @ext.build_extensions
 
-    gem_make_out = File.join @ext.extension_install_dir, 'gem_make.out'
+    gem_make_out = File.join @ext.extension_dir, 'gem_make.out'
     refute_path_exists gem_make_out
   end
 
@@ -1171,7 +1171,7 @@ dependencies: []
 
     spec.build_extensions
 
-    refute_path_exists spec.extension_install_dir
+    refute_path_exists spec.extension_dir
   end
 
   def test_build_extensions_error
@@ -1243,19 +1243,19 @@ dependencies: []
 
     @ext.build_extensions
 
-    gem_make_out = File.join @ext.extension_install_dir, 'gem_make.out'
+    gem_make_out = File.join @ext.extension_dir, 'gem_make.out'
     refute_path_exists gem_make_out
   ensure
     FileUtils.chmod 0755, @gemhome
   end
 
   def test_build_extensions_none
-    refute_path_exists @a1.extension_install_dir, 'sanity check'
+    refute_path_exists @a1.extension_dir, 'sanity check'
     assert_empty @a1.extensions, 'sanity check'
 
     @a1.build_extensions
 
-    refute_path_exists @a1.extension_install_dir
+    refute_path_exists @a1.extension_dir
   end
 
   def test_build_extensions_old
@@ -1267,7 +1267,7 @@ dependencies: []
 
     @ext.build_extensions
 
-    gem_make_out = File.join @ext.extension_install_dir, 'gem_make.out'
+    gem_make_out = File.join @ext.extension_dir, 'gem_make.out'
     refute_path_exists gem_make_out
   end
 
@@ -1293,7 +1293,7 @@ dependencies: []
 
     @ext.build_extensions
 
-    gem_make_out = File.join @ext.extension_install_dir, 'gem_make.out'
+    gem_make_out = File.join @ext.extension_dir, 'gem_make.out'
     assert_path_exists gem_make_out
   end
 
@@ -1323,7 +1323,7 @@ dependencies: []
 
     refute @ext.contains_requirable_file? 'nonexistent'
 
-    assert_path_exists @ext.extension_install_dir
+    assert_path_exists @ext.extension_dir
   end
 
   def test_date
@@ -1444,7 +1444,7 @@ dependencies: []
     assert_equal ['ext/extconf.rb'], ext_spec.extensions
   end
 
-  def test_extension_install_dir
+  def test_extension_dir
     enable_shared, RbConfig::CONFIG['ENABLE_SHARED'] =
       RbConfig::CONFIG['ENABLE_SHARED'], 'no'
 
@@ -1456,7 +1456,7 @@ dependencies: []
       File.join(@ext.base_dir, 'extensions', Gem::Platform.local.to_s,
                 "#{Gem.ruby_api_version}-static", @ext.full_name)
 
-    assert_equal expected, @ext.extension_install_dir
+    assert_equal expected, @ext.extension_dir
   ensure
     RbConfig::CONFIG['ENABLE_SHARED'] = enable_shared
   end
@@ -1610,7 +1610,7 @@ dependencies: []
   end
 
   def test_gem_build_complete_path
-    expected = File.join @a1.extension_install_dir, 'gem.build_complete'
+    expected = File.join @a1.extension_dir, 'gem.build_complete'
     assert_equal expected, @a1.gem_build_complete_path
   end
 
@@ -1743,7 +1743,7 @@ dependencies: []
 
     @ext.require_path = 'lib'
 
-    ext_install_dir = Pathname(@ext.extension_install_dir)
+    ext_install_dir = Pathname(@ext.extension_dir)
     full_gem_path = Pathname(@ext.full_gem_path)
     relative_install_dir = ext_install_dir.relative_path_from full_gem_path
 
@@ -1762,7 +1762,7 @@ dependencies: []
     @ext.require_path = 'lib'
 
     expected = [
-      @ext.extension_install_dir,
+      @ext.extension_dir,
       File.join(@gemhome, 'gems', @ext.original_name, 'lib'),
     ]