diff options
author | Samuel Giddins <segiddins@segiddins.me> | 2016-06-24 11:20:12 -0500 |
---|---|---|
committer | Samuel Giddins <segiddins@segiddins.me> | 2016-06-24 11:20:34 -0500 |
commit | 4415786879c5734a8571960b9b4edebc27a09c84 (patch) | |
tree | bc6800aea0acfa366f2e2746a30a834f7285f3e6 | |
parent | 2d9311ea2a476f3d55c9bc39a37a566988f76c06 (diff) | |
download | bundler-4415786879c5734a8571960b9b4edebc27a09c84.tar.gz |
Use new source_requirements format for indexes helper
-rw-r--r-- | spec/resolver/basic_spec.rb | 2 | ||||
-rw-r--r-- | spec/support/indexes.rb | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/spec/resolver/basic_spec.rb b/spec/resolver/basic_spec.rb index cb5bc45597..861fa6e35a 100644 --- a/spec/resolver/basic_spec.rb +++ b/spec/resolver/basic_spec.rb @@ -100,7 +100,7 @@ describe "Resolving" do deps << Bundler::DepProxy.new(d, "ruby") end - got = Bundler::Resolver.resolve(deps, @index, {}, [], Bundler::RubyVersion.new("1.8.7", nil, nil, nil)) + got = Bundler::Resolver.resolve(deps, @index, { :default => double(:specs => @index) }, [], Bundler::RubyVersion.new("1.8.7", nil, nil, nil)) got = got.map(&:full_name).sort expect(got).to eq(%w(foo-1.0.0 bar-1.0.0).sort) end diff --git a/spec/support/indexes.rb b/spec/support/indexes.rb index acace96886..2fdc1f23f4 100644 --- a/spec/support/indexes.rb +++ b/spec/support/indexes.rb @@ -16,12 +16,15 @@ module Spec def resolve @platforms ||= ["ruby"] deps = [] + default_source = instance_double("Bundler::Source::Rubygems", :specs => @index) + source_requirements = { :default => default_source } @deps.each do |d| @platforms.each do |p| + source_requirements[d.name] = d.source = default_source deps << Bundler::DepProxy.new(d, p) end end - Bundler::Resolver.resolve(deps, @index) + Bundler::Resolver.resolve(deps, @index, source_requirements) end def should_resolve_as(specs) |