[Resolver] Ordering and 1.8.7 arent friends

rubygems · Aug 1, 2015 · ef5b0ea · ef5b0ea
1 parent 4c53d07
commit ef5b0ea
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb
@@ -12,7 +12,7 @@ def message
             o << %(\n)
           end
           o << %(  In Gemfile:\n)
-          o << conflict.requirement_trees.map do |tree|
+          o << conflict.requirement_trees.sort_by {|t| t.reverse.map(&:name) }.map do |tree|
             t = ""
             depth = 2
             tree.each do |req|

diff --git a/spec/install/bundler_spec.rb b/spec/install/bundler_spec.rb
@@ -119,10 +119,10 @@
         Resolving dependencies...
         Bundler could not find compatible versions for gem "activesupport":
           In Gemfile:
+            activesupport (= 2.3.5)
+
             rails_fail was resolved to 1.0, which depends on
               activesupport (= 1.2.3)
-
-            activesupport (= 2.3.5)
       E
       expect(out).to eq(nice_error)
     end