diff options
Diffstat (limited to 'test/rubygems/test_gem_resolver_conflict.rb')
-rw-r--r-- | test/rubygems/test_gem_resolver_conflict.rb | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/test/rubygems/test_gem_resolver_conflict.rb b/test/rubygems/test_gem_resolver_conflict.rb index 1d46e69c3f..5696ff266d 100644 --- a/test/rubygems/test_gem_resolver_conflict.rb +++ b/test/rubygems/test_gem_resolver_conflict.rb @@ -1,16 +1,17 @@ # frozen_string_literal: true -require_relative 'helper' + +require_relative "helper" class TestGemResolverConflict < Gem::TestCase def test_explanation root = - dependency_request dep('net-ssh', '>= 2.0.13'), 'rye', '0.9.8' + dependency_request dep("net-ssh", ">= 2.0.13"), "rye", "0.9.8" child = - dependency_request dep('net-ssh', '>= 2.6.5'), 'net-ssh', '2.2.2', root + dependency_request dep("net-ssh", ">= 2.6.5"), "net-ssh", "2.2.2", root - dep = Gem::Resolver::DependencyRequest.new dep('net-ssh', '>= 2.0.13'), nil + dep = Gem::Resolver::DependencyRequest.new dep("net-ssh", ">= 2.0.13"), nil - spec = util_spec 'net-ssh', '2.2.2' + spec = util_spec "net-ssh", "2.2.2" active = Gem::Resolver::ActivationRequest.new spec, dep @@ -35,16 +36,14 @@ class TestGemResolverConflict < Gem::TestCase end def test_explanation_user_request - @DR = Gem::Resolver - - spec = util_spec 'a', 2 + spec = util_spec "a", 2 - a1_req = @DR::DependencyRequest.new dep('a', '= 1'), nil - a2_req = @DR::DependencyRequest.new dep('a', '= 2'), nil + a1_req = Gem::Resolver::DependencyRequest.new dep("a", "= 1"), nil + a2_req = Gem::Resolver::DependencyRequest.new dep("a", "= 2"), nil - activated = @DR::ActivationRequest.new spec, a2_req + activated = Gem::Resolver::ActivationRequest.new spec, a2_req - conflict = @DR::Conflict.new a1_req, activated + conflict = Gem::Resolver::Conflict.new a1_req, activated expected = <<-EXPECTED Activated a-2 @@ -63,17 +62,17 @@ class TestGemResolverConflict < Gem::TestCase def test_request_path root = - dependency_request dep('net-ssh', '>= 2.0.13'), 'rye', '0.9.8' + dependency_request dep("net-ssh", ">= 2.0.13"), "rye", "0.9.8" child = - dependency_request dep('other', '>= 1.0'), 'net-ssh', '2.2.2', root + dependency_request dep("other", ">= 1.0"), "net-ssh", "2.2.2", root conflict = Gem::Resolver::Conflict.new nil, nil expected = [ - 'net-ssh (>= 2.0.13), 2.2.2 activated', - 'rye (= 0.9.8), 0.9.8 activated', + "net-ssh (>= 2.0.13), 2.2.2 activated", + "rye (= 0.9.8), 0.9.8 activated", ] assert_equal expected, conflict.request_path(child.requester) |