diff options
| author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-11-21 23:27:30 +0000 |
|---|---|---|
| committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-11-21 23:27:30 +0000 |
| commit | 5307d803f5cce7b14a6afd1d51f6d53ec85ca87d (patch) | |
| tree | aac2997a9ff000fbf2f1f9f27077bb7b2403f2c9 /test/rubygems/test_gem_impossible_dependencies_error.rb | |
| parent | b1529a30e08040b717adef8ac1fa8be1c060e7e1 (diff) | |
* lib/rubygems: Update to RubyGems master 50a8210. Important changes
in this commit:
RubyGems now automatically checks for gem.deps.rb or Gemfile when
running ruby executables. This behavior is similar to `bundle exec
rake`. This change may be reverted before Ruby 2.1.0 if too many bugs
are found.
* test/rubygems: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43767 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/rubygems/test_gem_impossible_dependencies_error.rb')
| -rw-r--r-- | test/rubygems/test_gem_impossible_dependencies_error.rb | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/test/rubygems/test_gem_impossible_dependencies_error.rb b/test/rubygems/test_gem_impossible_dependencies_error.rb index f61b86e490..577ee580ec 100644 --- a/test/rubygems/test_gem_impossible_dependencies_error.rb +++ b/test/rubygems/test_gem_impossible_dependencies_error.rb @@ -28,10 +28,14 @@ class TestGemImpossibleDependenciesError < Gem::TestCase expected = <<-EXPECTED rye-0.9.8 requires net-ssh (>= 2.0.13) but it conflicted: - Activated net-ssh-2.6.5 instead of (~> 2.2.2) via: - net-ssh-2.6.5, rye-0.9.8 - Activated net-ssh-2.2.2 instead of (>= 2.6.5) via: - net-ssh-2.2.2, rye-0.9.8 + Activated net-ssh-2.6.5 via: + net-ssh-2.6.5 (>= 2.0.13), rye-0.9.8 (= 0.9.8) + instead of (~> 2.2.2) via: + net-ssh-2.6.5 (>= 2.0.13), rye-0.9.8 (= 0.9.8) + Activated net-ssh-2.2.2 via: + net-ssh-2.2.2 (>= 2.0.13), rye-0.9.8 (= 0.9.8) + instead of (>= 2.6.5) via: + net-ssh-2.2.2 (>= 2.0.13), rye-0.9.8 (= 0.9.8) EXPECTED assert_equal expected, error.message |