summaryrefslogtreecommitdiff
path: root/spec/resolver
diff options
context:
space:
mode:
authorMichael Rykov <mrykov@gmail.com>2013-02-08 19:31:54 -0800
committerMichael Rykov <mrykov@gmail.com>2013-02-08 19:47:39 -0800
commit2d15c0a3be9a7ba820613d1f72c042eb87a68fd0 (patch)
treeca00d785597c0fd80df5922935187b5e68fff92a /spec/resolver
parentf51e1f1b4e12036b6292d85a80260ab5a51a91cf (diff)
downloadbundler-2d15c0a3be9a7ba820613d1f72c042eb87a68fd0.tar.gz
Skip unnecessary attempts when resolving conflicts
Diffstat (limited to 'spec/resolver')
-rw-r--r--spec/resolver/basic_spec.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/spec/resolver/basic_spec.rb b/spec/resolver/basic_spec.rb
index cd1016fd11..6371dc518b 100644
--- a/spec/resolver/basic_spec.rb
+++ b/spec/resolver/basic_spec.rb
@@ -17,4 +17,10 @@ describe "Resolving" do
should_resolve_as %w(actionpack-2.3.5 activesupport-2.3.5 rack-1.0)
end
+
+ it "resolve a conflicting index" do
+ @index = a_conflict_index
+ dep "my_app"
+ should_resolve_as %w(activemodel-3.2.11 builder-3.0.4 grape-0.2.6 my_app-1.0.0)
+ end
end