diff options
Diffstat (limited to 'test/rubygems/test_gem_resolver_best_set.rb')
-rw-r--r-- | test/rubygems/test_gem_resolver_best_set.rb | 41 |
1 files changed, 18 insertions, 23 deletions
diff --git a/test/rubygems/test_gem_resolver_best_set.rb b/test/rubygems/test_gem_resolver_best_set.rb index c1c67ba832..8a750cdf8f 100644 --- a/test/rubygems/test_gem_resolver_best_set.rb +++ b/test/rubygems/test_gem_resolver_best_set.rb @@ -1,15 +1,10 @@ # frozen_string_literal: true + require_relative "helper" class TestGemResolverBestSet < Gem::TestCase - def setup - super - - @DR = Gem::Resolver - end - def test_initialize - set = @DR::BestSet.new + set = Gem::Resolver::BestSet.new assert_empty set.sets end @@ -21,15 +16,15 @@ class TestGemResolverBestSet < Gem::TestCase fetcher.spec "b", 1 end - set = @DR::BestSet.new + set = Gem::Resolver::BestSet.new dependency = dep "a", "~> 1" - req = @DR::DependencyRequest.new dependency, nil + req = Gem::Resolver::DependencyRequest.new dependency, nil found = set.find_all req - assert_equal %w[a-1], found.map {|s| s.full_name } + assert_equal %w[a-1], found.map(&:full_name) end def test_find_all_fallback @@ -37,19 +32,19 @@ class TestGemResolverBestSet < Gem::TestCase fetcher.spec "a", 1 end - set = @DR::BestSet.new + set = Gem::Resolver::BestSet.new - api_uri = URI(@gem_repo) + api_uri = Gem::URI(@gem_repo) set.sets << Gem::Resolver::APISet.new(api_uri) dependency = dep "a", "~> 1" - req = @DR::DependencyRequest.new dependency, nil + req = Gem::Resolver::DependencyRequest.new dependency, nil found = set.find_all req - assert_equal %w[a-1], found.map {|s| s.full_name } + assert_equal %w[a-1], found.map(&:full_name) end def test_find_all_local @@ -59,12 +54,12 @@ class TestGemResolverBestSet < Gem::TestCase fetcher.spec "b", 1 end - set = @DR::BestSet.new + set = Gem::Resolver::BestSet.new set.remote = false dependency = dep "a", "~> 1" - req = @DR::DependencyRequest.new dependency, nil + req = Gem::Resolver::DependencyRequest.new dependency, nil found = set.find_all req @@ -76,7 +71,7 @@ class TestGemResolverBestSet < Gem::TestCase fetcher.spec "a", 1 end - set = @DR::BestSet.new + set = Gem::Resolver::BestSet.new set.prefetch [] @@ -88,7 +83,7 @@ class TestGemResolverBestSet < Gem::TestCase fetcher.spec "a", 1 end - set = @DR::BestSet.new + set = Gem::Resolver::BestSet.new set.remote = false set.prefetch [] @@ -97,9 +92,9 @@ class TestGemResolverBestSet < Gem::TestCase end def test_replace_failed_api_set - set = @DR::BestSet.new + set = Gem::Resolver::BestSet.new - api_uri = URI(@gem_repo) + "./info/" + api_uri = Gem::URI(@gem_repo) + "./info/" api_set = Gem::Resolver::APISet.new api_uri set.sets << api_set @@ -118,7 +113,7 @@ class TestGemResolverBestSet < Gem::TestCase end def test_replace_failed_api_set_no_api_set - set = @DR::BestSet.new + set = Gem::Resolver::BestSet.new index_set = Gem::Resolver::IndexSet.new Gem::Source.new @gem_repo @@ -134,9 +129,9 @@ class TestGemResolverBestSet < Gem::TestCase end def test_replace_failed_api_set_uri_with_credentials - set = @DR::BestSet.new + set = Gem::Resolver::BestSet.new - api_uri = URI(@gem_repo) + "./info/" + api_uri = Gem::URI(@gem_repo) + "./info/" api_uri.user = "user" api_uri.password = "pass" api_set = Gem::Resolver::APISet.new api_uri |