From 7ed9b794b4e3f3f9874f2ce19401461596d8a2c0 Mon Sep 17 00:00:00 2001
From: drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 8 Dec 2013 01:22:39 +0000
Subject: * lib/rubygems:  Update to RubyGems master 14749ce.  This fixes bugs 
  handling of gem dependencies lockfiles (Gemfile.lock).

* test/rubygems:  ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44054 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/rubygems/test_gem_resolver_git_set.rb | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

(limited to 'test/rubygems/test_gem_resolver_git_set.rb')

diff --git a/test/rubygems/test_gem_resolver_git_set.rb b/test/rubygems/test_gem_resolver_git_set.rb
index b1a8d838bb..4643624ee0 100644
--- a/test/rubygems/test_gem_resolver_git_set.rb
+++ b/test/rubygems/test_gem_resolver_git_set.rb
@@ -36,13 +36,31 @@ class TestGemResolverGitSet < Gem::TestCase
     assert @set.need_submodules[repository]
   end
 
+  def test_add_git_spec
+    name, version, repository, revision = git_gem
+
+    @set.add_git_spec name, version, repository, revision, true
+
+    dependency = dep 'a'
+
+    specs = @set.find_all dependency
+
+    spec = specs.first
+
+    assert_equal "#{name}-#{version}", spec.full_name
+
+    assert @set.need_submodules[repository]
+
+    refute_path_exists spec.source.repo_cache_dir
+  end
+
   def test_find_all
     name, _, repository, = git_gem
 
     @set.add_git_gem name, repository, 'master', false
 
     dependency = dep 'a', '~> 1.0'
-    req = Gem::Resolver::ActivationRequest.new dependency, nil
+    req = Gem::Resolver::DependencyRequest.new dependency, nil
     @reqs.add req
 
     @set.prefetch @reqs
@@ -66,7 +84,7 @@ class TestGemResolverGitSet < Gem::TestCase
     @set.add_git_gem name, repository, 'master', false
 
     dependency = dep name
-    req = Gem::Resolver::ActivationRequest.new dependency, nil
+    req = Gem::Resolver::DependencyRequest.new dependency, nil
     @reqs.add req
 
     @set.prefetch @reqs
@@ -80,7 +98,7 @@ class TestGemResolverGitSet < Gem::TestCase
     @set.add_git_gem name, repository, 'master', false
 
     dependency = dep name
-    req = Gem::Resolver::ActivationRequest.new dependency, nil
+    req = Gem::Resolver::DependencyRequest.new dependency, nil
     @reqs.add req
 
     @set.prefetch @reqs
@@ -98,7 +116,7 @@ class TestGemResolverGitSet < Gem::TestCase
     @set.add_git_gem name, repository, 'master', false
 
     dependency = dep 'b'
-    req = Gem::Resolver::ActivationRequest.new dependency, nil
+    req = Gem::Resolver::DependencyRequest.new dependency, nil
     @reqs.add req
 
     @set.prefetch @reqs
@@ -112,7 +130,7 @@ class TestGemResolverGitSet < Gem::TestCase
     @set.add_git_gem name, repository, 'master', false
 
     dependency = dep name
-    req = Gem::Resolver::ActivationRequest.new dependency, nil
+    req = Gem::Resolver::DependencyRequest.new dependency, nil
     @reqs.add req
 
     @set.root_dir = "#{@gemhome}2"
-- 
cgit v1.2.3