diff options
| author | bronzdoc <lsagastume1990@gmail.com> | 2019-06-22 16:58:55 -0600 |
|---|---|---|
| committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2019-07-31 07:47:01 +0800 |
| commit | 5eacb4c52ed52185d78aa1437c0a69ed986a95f6 (patch) | |
| tree | d2e943b07ee9c726c57855b4e3da4322d8cf4928 | |
| parent | a7bce01175762ba763148fe29f5cbadf5d0f6250 (diff) | |
| download | ruby-5eacb4c52ed52185d78aa1437c0a69ed986a95f6.tar.gz | |
[rubygems/rubygems] Remove conflict.rb code that was supposed to be removed in Rubygems 3
https://github.com/rubygems/rubygems/commit/6d5f743a89
| -rw-r--r-- | lib/rubygems/resolver/conflict.rb | 5 | ||||
| -rw-r--r-- | test/rubygems/test_gem_resolver_conflict.rb | 4 |
2 files changed, 0 insertions, 9 deletions
diff --git a/lib/rubygems/resolver/conflict.rb b/lib/rubygems/resolver/conflict.rb index fb1e661b21..2b337db339 100644 --- a/lib/rubygems/resolver/conflict.rb +++ b/lib/rubygems/resolver/conflict.rb @@ -153,8 +153,3 @@ class Gem::Resolver::Conflict end end - -## -# TODO: Remove in RubyGems 3 - -Gem::Resolver::DependencyConflict = Gem::Resolver::Conflict # :nodoc: diff --git a/test/rubygems/test_gem_resolver_conflict.rb b/test/rubygems/test_gem_resolver_conflict.rb index a078136510..2385c3eee9 100644 --- a/test/rubygems/test_gem_resolver_conflict.rb +++ b/test/rubygems/test_gem_resolver_conflict.rb @@ -3,10 +3,6 @@ require 'rubygems/test_case' class TestGemResolverConflict < Gem::TestCase - def test_self_compatibility - assert_same Gem::Resolver::Conflict, Gem::Resolver::DependencyConflict - end - def test_explanation root = dependency_request dep('net-ssh', '>= 2.0.13'), 'rye', '0.9.8' |