From 5f6715275e703ab49666a0440e6fcbb92a24c32f Mon Sep 17 00:00:00 2001
From: hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 19 Nov 2015 06:16:19 +0000
Subject: * lib/rubygems: Update to RubyGems 2.5.0+ HEAD(c6b4946).   this
 version includes #1114, #1314, #1322, #1375, #1383, #1387 * test/rubygems:
 ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52666 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/rubygems/test_gem_specification.rb | 61 +++++++++++++++++++++++++++++++++
 test/rubygems/test_require.rb           | 15 ++++++++
 2 files changed, 76 insertions(+)

(limited to 'test/rubygems')

diff --git a/test/rubygems/test_gem_specification.rb b/test/rubygems/test_gem_specification.rb
index 60f603361a..1ca2046195 100644
--- a/test/rubygems/test_gem_specification.rb
+++ b/test/rubygems/test_gem_specification.rb
@@ -2128,6 +2128,27 @@ dependencies: []
     assert_nil @ext.to_fullpath("notexist")
   end
 
+  def test_fullpath_return_rb_extension_file_when_exist_the_same_name_file
+    ext_spec
+
+    @ext.require_paths = 'lib'
+
+    dir = File.join(@gemhome, 'gems', @ext.original_name, 'lib')
+    expected_rb = File.join(dir, 'code.rb')
+    FileUtils.mkdir_p dir
+    FileUtils.touch expected_rb
+
+    dir = @ext.extension_dir
+    ext = RbConfig::CONFIG["DLEXT"]
+    expected_so = File.join(dir, "code.#{ext}")
+    FileUtils.mkdir_p dir
+    FileUtils.touch expected_so
+
+    @ext.activate
+
+    assert_equal expected_rb, @ext.to_fullpath("code")
+  end
+
   def test_require_already_activated
     save_loaded_features do
       a1 = new_spec "a", "1", nil, "lib/d.rb"
@@ -2874,6 +2895,46 @@ http://spdx.org/licenses or 'Nonstandard' for a nonstandard license.
     warning
   end
 
+  def test_validate_license_values_plus
+    util_setup_validate
+
+    use_ui @ui do
+      @a1.licenses = ['GPL-2.0+']
+      @a1.validate
+    end
+
+    assert_empty @ui.error
+  end
+
+  def test_validate_license_values_with
+    util_setup_validate
+
+    use_ui @ui do
+      @a1.licenses = ['GPL-2.0+ WITH Autoconf-exception-2.0']
+      @a1.validate
+    end
+
+    assert_empty @ui.error
+  end
+
+  def test_validate_license_with_nonsense_suffix
+    util_setup_validate
+
+    use_ui @ui do
+      @a1.licenses = ['GPL-2.0+ FOO', 'GPL-2.0 FOO']
+      @a1.validate
+    end
+
+    assert_match <<-warning, @ui.error
+WARNING: license value 'GPL-2.0+ FOO' is invalid.  Use a license identifier from
+http://spdx.org/licenses or 'Nonstandard' for a nonstandard license.
+    warning
+    assert_match <<-warning, @ui.error
+WARNING: license value 'GPL-2.0 FOO' is invalid.  Use a license identifier from
+http://spdx.org/licenses or 'Nonstandard' for a nonstandard license.
+    warning
+  end
+
   def test_validate_name
     util_setup_validate
 
diff --git a/test/rubygems/test_require.rb b/test/rubygems/test_require.rb
index 08dd4cb9f9..ec6662f917 100644
--- a/test/rubygems/test_require.rb
+++ b/test/rubygems/test_require.rb
@@ -277,6 +277,21 @@ class TestGemRequire < Gem::TestCase
     assert_equal %w(a-1.0 b-2.0), loaded_spec_names
   end
 
+  def test_require_doesnt_traverse_development_dependencies
+    a = new_spec("a", "1", nil, "lib/a.rb")
+    z = new_spec("z", "1", "w" => "> 0")
+    w1 = new_spec("w", "1") { |s| s.add_development_dependency "non-existent" }
+    w2 = new_spec("w", "2") { |s| s.add_development_dependency "non-existent" }
+
+    install_specs a, w1, w2, z
+
+    assert gem("z")
+    assert_equal %w(z-1), loaded_spec_names
+    assert_equal ["w (> 0)"], unresolved_names
+
+    assert require("a")
+  end
+
   def test_default_gem_only
     default_gem_spec = new_default_spec("default", "2.0.0.0",
                                         nil, "default/gem.rb")
-- 
cgit v1.2.3