rubygems-update 3.1.2 → 3.2.6

data/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb

@@ -6,7 +6,6 @@ require 'rubygems/request_set/lockfile/tokenizer'
 require 'rubygems/request_set/lockfile/parser'
 
 class TestGemRequestSetLockfileTokenizer < Gem::TestCase
-
   def setup
     super
 
@@ -64,86 +63,86 @@ DEPENDENCIES
     LOCKFILE
 
     expected = [
-      [:section,     'GEM',                0,  0],
-      [:newline,     nil,                  3,  0],
-
-      [:entry,       'remote',             2,  1],
-      [:text,        @gem_repo,           10,  1],
-      [:newline,     nil,                 34,  1],
-
-      [:entry,       'specs',              2,  2],
-      [:newline,     nil,                  8,  2],
-
-      [:text,        'a',                  4,  3],
-      [:l_paren,     nil,                  6,  3],
-      [:text,        '2',                  7,  3],
-      [:r_paren,     nil,                  8,  3],
-      [:newline,     nil,                  9,  3],
-
-      [:text,        'b',                  6,  4],
-      [:l_paren,     nil,                  8,  4],
-      [:requirement, '=',                  9,  4],
-      [:text,        '2',                 11,  4],
-      [:r_paren,     nil,                 12,  4],
-      [:newline,     nil,                 13,  4],
-
-      [:text,        'c',                  6,  5],
-      [:l_paren,     nil,                  8,  5],
-      [:requirement, '!=',                 9,  5],
-      [:text,        '3',                 12,  5],
-      [:r_paren,     nil,                 13,  5],
-      [:newline,     nil,                 14,  5],
-
-      [:text,        'd',                  6,  6],
-      [:l_paren,     nil,                  8,  6],
-      [:requirement, '>',                  9,  6],
-      [:text,        '4',                 11,  6],
-      [:r_paren,     nil,                 12,  6],
-      [:newline,     nil,                 13,  6],
-
-      [:text,        'e',                  6,  7],
-      [:l_paren,     nil,                  8,  7],
-      [:requirement, '<',                  9,  7],
-      [:text,        '5',                 11,  7],
-      [:r_paren,     nil,                 12,  7],
-      [:newline,     nil,                 13,  7],
-
-      [:text,        'f',                  6,  8],
-      [:l_paren,     nil,                  8,  8],
-      [:requirement, '>=',                 9,  8],
-      [:text,        '6',                 12,  8],
-      [:r_paren,     nil,                 13,  8],
-      [:newline,     nil,                 14,  8],
-
-      [:text,        'g',                  6,  9],
-      [:l_paren,     nil,                  8,  9],
-      [:requirement, '<=',                 9,  9],
-      [:text,        '7',                 12,  9],
-      [:r_paren,     nil,                 13,  9],
-      [:newline,     nil,                 14,  9],
-
-      [:text,        'h',                  6, 10],
-      [:l_paren,     nil,                  8, 10],
-      [:requirement, '~>',                 9, 10],
+      [:section,     'GEM',               0,  0],
+      [:newline,     nil,                 3,  0],
+
+      [:entry,       'remote',            2,  1],
+      [:text,        @gem_repo,           10, 1],
+      [:newline,     nil,                 34, 1],
+
+      [:entry,       'specs',             2,  2],
+      [:newline,     nil,                 8,  2],
+
+      [:text,        'a',                 4,  3],
+      [:l_paren,     nil,                 6,  3],
+      [:text,        '2',                 7,  3],
+      [:r_paren,     nil,                 8,  3],
+      [:newline,     nil,                 9,  3],
+
+      [:text,        'b',                 6,  4],
+      [:l_paren,     nil,                 8,  4],
+      [:requirement, '=',                 9,  4],
+      [:text,        '2',                 11, 4],
+      [:r_paren,     nil,                 12, 4],
+      [:newline,     nil,                 13, 4],
+
+      [:text,        'c',                 6,  5],
+      [:l_paren,     nil,                 8,  5],
+      [:requirement, '!=',                9,  5],
+      [:text,        '3',                 12, 5],
+      [:r_paren,     nil,                 13, 5],
+      [:newline,     nil,                 14, 5],
+
+      [:text,        'd',                 6,  6],
+      [:l_paren,     nil,                 8,  6],
+      [:requirement, '>',                 9,  6],
+      [:text,        '4',                 11, 6],
+      [:r_paren,     nil,                 12, 6],
+      [:newline,     nil,                 13, 6],
+
+      [:text,        'e',                 6,  7],
+      [:l_paren,     nil,                 8,  7],
+      [:requirement, '<',                 9,  7],
+      [:text,        '5',                 11, 7],
+      [:r_paren,     nil,                 12, 7],
+      [:newline,     nil,                 13, 7],
+
+      [:text,        'f',                 6,  8],
+      [:l_paren,     nil,                 8,  8],
+      [:requirement, '>=',                9,  8],
+      [:text,        '6',                 12, 8],
+      [:r_paren,     nil,                 13, 8],
+      [:newline,     nil,                 14, 8],
+
+      [:text,        'g',                 6,  9],
+      [:l_paren,     nil,                 8,  9],
+      [:requirement, '<=',                9,  9],
+      [:text,        '7',                 12, 9],
+      [:r_paren,     nil,                 13, 9],
+      [:newline,     nil,                 14, 9],
+
+      [:text,        'h',                 6,  10],
+      [:l_paren,     nil,                 8,  10],
+      [:requirement, '~>',                9,  10],
       [:text,        '8',                 12, 10],
       [:r_paren,     nil,                 13, 10],
       [:newline,     nil,                 14, 10],
 
-      [:newline,     nil,                  0, 11],
+      [:newline,     nil,                 0,  11],
 
-      [:section,     'PLATFORMS',          0, 12],
-      [:newline,     nil,                  9, 12],
+      [:section,     'PLATFORMS',         0,  12],
+      [:newline,     nil,                 9,  12],
 
-      [:text,        Gem::Platform::RUBY,  2, 13],
-      [:newline,     nil,                  6, 13],
+      [:text,        Gem::Platform::RUBY, 2,  13],
+      [:newline,     nil,                 6,  13],
 
-      [:newline,     nil,                  0, 14],
+      [:newline,     nil,                 0,  14],
 
-      [:section,     'DEPENDENCIES',       0, 15],
+      [:section,     'DEPENDENCIES',      0,  15],
       [:newline,     nil,                 12, 15],
 
-      [:text,        'a',                  2, 16],
-      [:newline,     nil,                  3, 16],
+      [:text,        'a',                 2,  16],
+      [:newline,     nil,                 3,  16],
     ]
 
     assert_equal expected, tokenize_lockfile
@@ -164,28 +163,28 @@ DEPENDENCIES
     LOCKFILE
 
     expected = [
-      [:section, 'GEM',                0, 0],
-      [:newline, nil,                  3, 0],
-      [:entry,   'remote',             2, 1],
+      [:section, 'GEM',               0,  0],
+      [:newline, nil,                 3,  0],
+      [:entry,   'remote',            2,  1],
       [:text,    @gem_repo,           10, 1],
       [:newline, nil,                 34, 1],
-      [:entry,   'specs',              2, 2],
-      [:newline, nil,                  8, 2],
-      [:text,    'Ab',                 4, 3],
-      [:l_paren, nil,                  7, 3],
-      [:text,    '2',                  8, 3],
-      [:r_paren, nil,                  9, 3],
+      [:entry,   'specs',             2,  2],
+      [:newline, nil,                 8,  2],
+      [:text,    'Ab',                4,  3],
+      [:l_paren, nil,                 7,  3],
+      [:text,    '2',                 8,  3],
+      [:r_paren, nil,                 9,  3],
       [:newline, nil,                 10, 3],
-      [:newline, nil,                  0, 4],
-      [:section, 'PLATFORMS',          0, 5],
-      [:newline, nil,                  9, 5],
-      [:text,    Gem::Platform::RUBY,  2, 6],
-      [:newline, nil,                  6, 6],
-      [:newline, nil,                  0, 7],
-      [:section, 'DEPENDENCIES',       0, 8],
+      [:newline, nil,                 0,  4],
+      [:section, 'PLATFORMS',         0,  5],
+      [:newline, nil,                 9,  5],
+      [:text,    Gem::Platform::RUBY, 2,  6],
+      [:newline, nil,                 6,  6],
+      [:newline, nil,                 0,  7],
+      [:section, 'DEPENDENCIES',      0,  8],
       [:newline, nil,                 12, 8],
-      [:text,    'Ab',                 2, 9],
-      [:newline, nil,                  4, 9],
+      [:text,    'Ab',                2,  9],
+      [:newline, nil,                 4,  9],
     ]
 
     assert_equal expected, tokenize_lockfile
@@ -236,12 +235,12 @@ DEPENDENCIES
     LOCKFILE
 
     expected = [
-      [:section, 'DEPENDENCIES',  0,  0],
-      [:newline, nil,            12,  0],
+      [:section, 'DEPENDENCIES', 0,  0],
+      [:newline, nil,            12, 0],
 
-      [:text,    'a',             2,  1],
-      [:bang,    nil,             3,  1],
-      [:newline, nil,             4,  1],
+      [:text,    'a',            2,  1],
+      [:bang,    nil,            3,  1],
+      [:newline, nil,            4,  1],
     ]
 
     assert_equal expected, tokenize_lockfile
@@ -257,31 +256,31 @@ GEM
     LOCKFILE
 
     expected = [
-      [:section,     'GEM',      0,  0],
-      [:newline,     nil,        3,  0],
-
-      [:entry,       'remote',   2,  1],
-      [:text,        @gem_repo, 10,  1],
-      [:newline,     nil,       34,  1],
-
-      [:entry,       'specs',    2,  2],
-      [:newline,     nil,        8,  2],
-
-      [:text,        'a',        4,  3],
-      [:l_paren,     nil,        6,  3],
-      [:text,        '2',        7,  3],
-      [:r_paren,     nil,        8,  3],
-      [:newline,     nil,        9,  3],
-
-      [:text,        'b',        6,  4],
-      [:l_paren,     nil,        8,  4],
-      [:requirement, '~>',       9,  4],
-      [:text,        '3.0',     12,  4],
-      [:comma,       nil,       15,  4],
-      [:requirement, '>=',      17,  4],
-      [:text,        '3.0.1',   20,  4],
-      [:r_paren,     nil,       25,  4],
-      [:newline,     nil,       26,  4],
+      [:section,     'GEM',     0,  0],
+      [:newline,     nil,       3,  0],
+
+      [:entry,       'remote',  2,  1],
+      [:text,        @gem_repo, 10, 1],
+      [:newline,     nil,       34, 1],
+
+      [:entry,       'specs',   2,  2],
+      [:newline,     nil,       8,  2],
+
+      [:text,        'a',       4,  3],
+      [:l_paren,     nil,       6,  3],
+      [:text,        '2',       7,  3],
+      [:r_paren,     nil,       8,  3],
+      [:newline,     nil,       9,  3],
+
+      [:text,        'b',       6,  4],
+      [:l_paren,     nil,       8,  4],
+      [:requirement, '~>',      9,  4],
+      [:text,        '3.0',     12, 4],
+      [:comma,       nil,       15, 4],
+      [:requirement, '>=',      17, 4],
+      [:text,        '3.0.1',   20, 4],
+      [:r_paren,     nil,       25, 4],
+      [:newline,     nil,       26, 4],
     ]
 
     assert_equal expected, tokenize_lockfile
@@ -304,5 +303,4 @@ GEM
   def tokenize_lockfile
     Gem::RequestSet::Lockfile::Tokenizer.from_file(@lock_file).to_a
   end
-
 end

data/test/rubygems/test_gem_requirement.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require "rubygems/requirement"
 
 class TestGemRequirement < Gem::TestCase
-
   def test_concat
     r = req '>= 1'
 
@@ -23,6 +22,8 @@ class TestGemRequirement < Gem::TestCase
     refute_requirement_equal "~> 1.3", "~> 1.3.0"
     refute_requirement_equal "~> 1.3.0", "~> 1.3"
 
+    assert_requirement_equal ["> 2", "~> 1.3", "~> 1.3.1"], ["~> 1.3.1", "~> 1.3", "> 2"]
+
     assert_requirement_equal ["> 2", "~> 1.3"], ["> 2.0", "~> 1.3"]
     assert_requirement_equal ["> 2.0", "~> 1.3"], ["> 2", "~> 1.3"]
 
@@ -82,6 +83,12 @@ class TestGemRequirement < Gem::TestCase
       Gem::Requirement.parse(Gem::Version.new('2'))
   end
 
+  if RUBY_VERSION >= '2.5'
+    def test_parse_deduplication
+      assert_same '~>', Gem::Requirement.parse('~> 1').first
+    end
+  end
+
   def test_parse_bad
     [
       nil,
@@ -390,11 +397,32 @@ class TestGemRequirement < Gem::TestCase
     r2 = req('2.0', '1.0')
     assert_equal r1.hash, r2.hash
 
-    r1 = req('1.0', '2.0').tap { |r| r.concat(['3.0']) }
-    r2 = req('3.0', '1.0').tap { |r| r.concat(['2.0']) }
+    r1 = req('1.0', '2.0').tap {|r| r.concat(['3.0']) }
+    r2 = req('3.0', '1.0').tap {|r| r.concat(['2.0']) }
     assert_equal r1.hash, r2.hash
   end
 
+  def test_hash_returns_equal_hashes_for_equivalent_requirements
+    refute_requirement_hash_equal "= 1.2", "= 1.3"
+    refute_requirement_hash_equal "= 1.3", "= 1.2"
+
+    refute_requirement_hash_equal "~> 1.3", "~> 1.3.0"
+    refute_requirement_hash_equal "~> 1.3.0", "~> 1.3"
+
+    assert_requirement_hash_equal ["> 2", "~> 1.3", "~> 1.3.1"], ["~> 1.3.1", "~> 1.3", "> 2"]
+
+    assert_requirement_hash_equal ["> 2", "~> 1.3"], ["> 2.0", "~> 1.3"]
+    assert_requirement_hash_equal ["> 2.0", "~> 1.3"], ["> 2", "~> 1.3"]
+
+    assert_requirement_hash_equal "= 1.0", "= 1.0.0"
+    assert_requirement_hash_equal "= 1.1", "= 1.1.0"
+    assert_requirement_hash_equal "= 1", "= 1.0.0"
+
+    assert_requirement_hash_equal "1.0", "1.0.0"
+    assert_requirement_hash_equal "1.1", "1.1.0"
+    assert_requirement_hash_equal "1", "1.0.0"
+  end
+
   # Assert that two requirements are equal. Handles Gem::Requirements,
   # strings, arrays, numbers, and versions.
 
@@ -409,6 +437,13 @@ class TestGemRequirement < Gem::TestCase
       "#{requirement} is satisfied by #{version}"
   end
 
+  # Assert that two requirement hashes are equal. Handles Gem::Requirements,
+  # strings, arrays, numbers, and versions.
+
+  def assert_requirement_hash_equal(expected, actual)
+    assert_equal req(expected).hash, req(actual).hash
+  end
+
   # Refute the assumption that two requirements are equal.
 
   def refute_requirement_equal(unexpected, actual)
@@ -422,4 +457,9 @@ class TestGemRequirement < Gem::TestCase
       "#{requirement} is not satisfied by #{version}"
   end
 
+  # Refute the assumption that two requirements hashes are equal.
+
+  def refute_requirement_hash_equal(unexpected, actual)
+    refute_equal req(unexpected).hash, req(actual).hash
+  end
 end

data/test/rubygems/test_gem_resolver.rb

@@ -2,7 +2,6 @@
 require 'rubygems/test_case'
 
 class TestGemResolver < Gem::TestCase
-
   def setup
     super
 
@@ -26,10 +25,10 @@ class TestGemResolver < Gem::TestCase
   def assert_resolves_to(expected, resolver)
     actual = resolver.resolve
 
-    exp = expected.sort_by { |s| s.full_name }
-    act = actual.map { |a| a.spec.spec }.sort_by { |s| s.full_name }
+    exp = expected.sort_by {|s| s.full_name }
+    act = actual.map {|a| a.spec.spec }.sort_by {|s| s.full_name }
 
-    msg = "Set of gems was not the same: #{exp.map { |x| x.full_name}.inspect} != #{act.map { |x| x.full_name}.inspect}"
+    msg = "Set of gems was not the same: #{exp.map {|x| x.full_name }.inspect} != #{act.map {|x| x.full_name }.inspect}"
 
     assert_equal exp, act, msg
   rescue Gem::DependencyResolutionError => e
@@ -105,7 +104,7 @@ class TestGemResolver < Gem::TestCase
 
     res.requests a1, act, reqs
 
-    assert_equal ['b (= 2)'], reqs.map { |req| req.to_s }
+    assert_equal ['b (= 2)'], reqs.map {|req| req.to_s }
   end
 
   def test_requests_development
@@ -127,7 +126,7 @@ class TestGemResolver < Gem::TestCase
 
     res.requests spec, act, reqs
 
-    assert_equal ['b (= 2)'], reqs.map { |req| req.to_s }
+    assert_equal ['b (= 2)'], reqs.map {|req| req.to_s }
 
     assert spec.instance_variable_defined? :@called
   end
@@ -546,7 +545,7 @@ class TestGemResolver < Gem::TestCase
 
     dependency = e.conflict.dependency
 
-    assert_includes %w(a b), dependency.name
+    assert_includes %w[a b], dependency.name
     assert_equal req('>= 0'), dependency.requirement
 
     activated = e.conflict.activated
@@ -789,5 +788,4 @@ class TestGemResolver < Gem::TestCase
     assert_match "No match for 'a (= 1)' on this platform. Found: c-p-1",
                  e.message
   end
-
 end

data/test/rubygems/test_gem_resolver_activation_request.rb

@@ -2,7 +2,6 @@
 require 'rubygems/test_case'
 
 class TestGemResolverActivationRequest < Gem::TestCase
-
   def setup
     super
 
@@ -40,5 +39,4 @@ class TestGemResolverActivationRequest < Gem::TestCase
 
     assert @req.installed?
   end
-
 end

data/test/rubygems/test_gem_resolver_api_set.rb

@@ -2,35 +2,34 @@
 require 'rubygems/test_case'
 
 class TestGemResolverAPISet < Gem::TestCase
-
   def setup
     super
 
     @DR = Gem::Resolver
-    @dep_uri = URI "#{@gem_repo}api/v1/dependencies"
+    @dep_uri = URI "#{@gem_repo}info/"
   end
 
   def test_initialize
     set = @DR::APISet.new
 
-    assert_equal URI('https://rubygems.org/api/v1/dependencies'), set.dep_uri
-    assert_equal URI('https://rubygems.org'),                     set.uri
-    assert_equal Gem::Source.new(URI('https://rubygems.org')),    set.source
+    assert_equal URI('https://index.rubygems.org/info/'),            set.dep_uri
+    assert_equal URI('https://index.rubygems.org/'),                 set.uri
+    assert_equal Gem::Source.new(URI('https://index.rubygems.org')), set.source
   end
 
   def test_initialize_deeper_uri
-    set = @DR::APISet.new 'https://rubygemsserver.com/mygems/api/v1/dependencies'
+    set = @DR::APISet.new 'https://rubygemsserver.com/mygems/info'
 
-    assert_equal URI('https://rubygemsserver.com/mygems/api/v1/dependencies'), set.dep_uri
-    assert_equal URI('https://rubygemsserver.com/mygems/'),                    set.uri
-    assert_equal Gem::Source.new(URI('https://rubygemsserver.com/mygems/')),    set.source
+    assert_equal URI('https://rubygemsserver.com/mygems/info'),       set.dep_uri
+    assert_equal URI('https://rubygemsserver.com/'),                  set.uri
+    assert_equal Gem::Source.new(URI('https://rubygemsserver.com/')), set.source
   end
 
   def test_initialize_uri
     set = @DR::APISet.new @dep_uri
 
-    assert_equal URI("#{@gem_repo}api/v1/dependencies"), set.dep_uri
-    assert_equal URI("#{@gem_repo}"),                     set.uri
+    assert_equal URI("#{@gem_repo}info/"), set.dep_uri
+    assert_equal URI("#{@gem_repo}"), set.uri
   end
 
   def test_find_all
@@ -40,17 +39,46 @@ class TestGemResolverAPISet < Gem::TestCase
       { :name         => 'a',
         :number       => '1',
         :platform     => 'ruby',
-        :dependencies => [], },
+        :dependencies => [] },
+    ]
+
+    @fetcher.data["#{@dep_uri}a"] = "---\n1  "
+
+    set = @DR::APISet.new @dep_uri
+
+    a_dep = @DR::DependencyRequest.new dep('a'), nil
+
+    expected = [
+      @DR::APISpecification.new(set, data.first),
+    ]
+
+    assert_equal expected, set.find_all(a_dep)
+  end
+
+  def test_find_all_prereleases
+    spec_fetcher
+
+    data = [
+      { :name         => 'a',
+        :number       => '1',
+        :platform     => 'ruby',
+        :dependencies => [] },
+      { :name         => 'a',
+        :number       => '2.a',
+        :platform     => 'ruby',
+        :dependencies => [] },
     ]
 
-    @fetcher.data["#{@dep_uri}?gems=a"] = Marshal.dump data
+    @fetcher.data["#{@dep_uri}a"] = "---\n1\n2.a"
 
     set = @DR::APISet.new @dep_uri
+    set.prerelease = true
 
     a_dep = @DR::DependencyRequest.new dep('a'), nil
 
     expected = [
-      @DR::APISpecification.new(set, data.first)
+      @DR::APISpecification.new(set, data.first),
+      @DR::APISpecification.new(set, data.last),
     ]
 
     assert_equal expected, set.find_all(a_dep)
@@ -63,10 +91,10 @@ class TestGemResolverAPISet < Gem::TestCase
       { :name         => 'a',
         :number       => '1',
         :platform     => 'ruby',
-        :dependencies => [], },
+        :dependencies => [] },
     ]
 
-    @fetcher.data["#{@dep_uri}?gems=a"] = Marshal.dump data
+    @fetcher.data["#{@dep_uri}a"] = "---\n1  "
 
     set = @DR::APISet.new @dep_uri
 
@@ -75,12 +103,12 @@ class TestGemResolverAPISet < Gem::TestCase
     set.prefetch [a_dep]
 
     expected = [
-      @DR::APISpecification.new(set, data.first)
+      @DR::APISpecification.new(set, data.first),
     ]
 
     assert_equal expected, set.find_all(a_dep)
 
-    @fetcher.data.delete "#{@dep_uri}?gems=a"
+    @fetcher.data.delete "#{@dep_uri}a"
   end
 
   def test_find_all_local
@@ -95,7 +123,7 @@ class TestGemResolverAPISet < Gem::TestCase
   def test_find_all_missing
     spec_fetcher
 
-    @fetcher.data["#{@dep_uri}?gems=a"] = Marshal.dump []
+    @fetcher.data["#{@dep_uri}a"] = "---"
 
     set = @DR::APISet.new @dep_uri
 
@@ -103,7 +131,7 @@ class TestGemResolverAPISet < Gem::TestCase
 
     assert_empty set.find_all(a_dep)
 
-    @fetcher.data.delete "#{@dep_uri}?gems=a"
+    @fetcher.data.delete "#{@dep_uri}a"
 
     assert_empty set.find_all(a_dep)
   end
@@ -111,15 +139,8 @@ class TestGemResolverAPISet < Gem::TestCase
   def test_prefetch
     spec_fetcher
 
-    data = [
-      { :name         => 'a',
-        :number       => '1',
-        :platform     => 'ruby',
-        :dependencies => [], },
-    ]
-
-    @fetcher.data["#{@dep_uri}?gems=a,b"] = Marshal.dump data
-    @fetcher.data["#{@dep_uri}?gems=b"]   = Marshal.dump []
+    @fetcher.data["#{@dep_uri}a"] = "---\n1  \n"
+    @fetcher.data["#{@dep_uri}b"] = "---"
 
     set = @DR::APISet.new @dep_uri
 
@@ -128,21 +149,14 @@ class TestGemResolverAPISet < Gem::TestCase
 
     set.prefetch [a_dep, b_dep]
 
-    assert_equal %w[a-1], set.find_all(a_dep).map { |s| s.full_name }
+    assert_equal %w[a-1], set.find_all(a_dep).map {|s| s.full_name }
     assert_empty          set.find_all(b_dep)
   end
 
   def test_prefetch_cache
     spec_fetcher
 
-    data = [
-      { :name         => 'a',
-        :number       => '1',
-        :platform     => 'ruby',
-        :dependencies => [], },
-    ]
-
-    @fetcher.data["#{@dep_uri}?gems=a"] = Marshal.dump data
+    @fetcher.data["#{@dep_uri}a"] = "---\n1  \n"
 
     set = @DR::APISet.new @dep_uri
 
@@ -151,8 +165,8 @@ class TestGemResolverAPISet < Gem::TestCase
 
     set.prefetch [a_dep]
 
-    @fetcher.data.delete "#{@dep_uri}?gems=a"
-    @fetcher.data["#{@dep_uri}?gems=b"]   = Marshal.dump []
+    @fetcher.data.delete "#{@dep_uri}a"
+    @fetcher.data["#{@dep_uri}?b"] = "---"
 
     set.prefetch [a_dep, b_dep]
   end
@@ -160,14 +174,8 @@ class TestGemResolverAPISet < Gem::TestCase
   def test_prefetch_cache_missing
     spec_fetcher
 
-    data = [
-      { :name         => 'a',
-        :number       => '1',
-        :platform     => 'ruby',
-        :dependencies => [], },
-    ]
-
-    @fetcher.data["#{@dep_uri}?gems=a,b"] = Marshal.dump data
+    @fetcher.data["#{@dep_uri}a"] = "---\n1  \n"
+    @fetcher.data["#{@dep_uri}b"] = "---"
 
     set = @DR::APISet.new @dep_uri
 
@@ -176,7 +184,8 @@ class TestGemResolverAPISet < Gem::TestCase
 
     set.prefetch [a_dep, b_dep]
 
-    @fetcher.data.delete "#{@dep_uri}?gems=a,b"
+    @fetcher.data.delete "#{@dep_uri}a"
+    @fetcher.data.delete "#{@dep_uri}b"
 
     set.prefetch [a_dep, b_dep]
   end
@@ -184,15 +193,8 @@ class TestGemResolverAPISet < Gem::TestCase
   def test_prefetch_local
     spec_fetcher
 
-    data = [
-      { :name         => 'a',
-        :number       => '1',
-        :platform     => 'ruby',
-        :dependencies => [], },
-    ]
-
-    @fetcher.data["#{@dep_uri}?gems=a,b"] = Marshal.dump data
-    @fetcher.data["#{@dep_uri}?gems=b"]   = Marshal.dump []
+    @fetcher.data["#{@dep_uri}a"] = "---\n1  \n"
+    @fetcher.data["#{@dep_uri}b"] = "---"
 
     set = @DR::APISet.new @dep_uri
     set.remote = false
@@ -204,5 +206,4 @@ class TestGemResolverAPISet < Gem::TestCase
 
     assert_empty set.instance_variable_get :@data
   end
-
 end