From 91cc62210040c4984b5d03f21943d7b60e07b28d Mon Sep 17 00:00:00 2001 From: The Bundler Bot Date: Tue, 24 Jan 2017 20:28:04 +0000 Subject: Auto merge of #5361 - bundler:seg-1-8-7-spec-install, r=segiddins Ensure rack is always installed first on 1.8.7 in the specs (cherry picked from commit d3c50f80d34d1ee7fa84d3d8a6a930c55186fbab) --- spec/support/rubygems_ext.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spec/support/rubygems_ext.rb b/spec/support/rubygems_ext.rb index bb8b7f2a..b75350f4 100644 --- a/spec/support/rubygems_ext.rb +++ b/spec/support/rubygems_ext.rb @@ -48,10 +48,11 @@ module Spec def self.install_gems(gems) reqs, no_reqs = gems.partition {|_, req| !req.nil? && !req.split(" ").empty? } + reqs = reqs.sort_by {|name, _| name == "rack" ? 0 : 1 } # TODO: remove when we drop ruby 1.8.7 support no_reqs.map!(&:first) reqs.map! {|name, req| "'#{name}:#{req}'" } deps = reqs.concat(no_reqs).join(" ") - cmd = "gem install #{deps} --no-rdoc --no-ri" + cmd = "gem install #{deps} --no-rdoc --no-ri --conservative" puts cmd system(cmd) || raise("Installing gems #{deps} for the tests to use failed!") end -- cgit v1.2.3