summaryrefslogtreecommitdiff
path: root/spec/resolver
diff options
context:
space:
mode:
authorSmit Shah <who828@gmail.com>2013-11-22 01:02:43 +0530
committerSmit Shah <who828@gmail.com>2013-11-22 01:02:43 +0530
commitcc4d4abb6fc1f640bc494e39e0a578c223eee1cf (patch)
treed6f13b23261e1fcf34e96dd20dec6c65d837fad4 /spec/resolver
parent2be104f634c103682cef5a5c3bd4e41b14a9fc67 (diff)
downloadbundler-cc4d4abb6fc1f640bc494e39e0a578c223eee1cf.tar.gz
Added a fix for multiple level conflict resolution
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 22dc2f0fbe..2481e53e13 100644
--- a/spec/resolver/basic_spec.rb
+++ b/spec/resolver/basic_spec.rb
@@ -23,6 +23,12 @@ describe "Resolving" do
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
+
+ it "resolves a complex conflicting index" do
+ @index = a_complex_conflict_index
+ dep "my_app"
+ should_resolve_as %w(a-1.4.0 b-0.3.5 c-3.2 d-0.9.8 my_app-1.1.0)
+ end
it "should throw error in case of circular dependencies" do
@index = a_circular_index