diff options
| author | The Bundler Bot <bot@bundler.io> | 2017-01-24 20:28:04 +0000 |
|---|---|---|
| committer | The Bundler Bot <bot@bundler.io> | 2017-01-24 20:28:04 +0000 |
| commit | d3c50f80d34d1ee7fa84d3d8a6a930c55186fbab (patch) | |
| tree | 3aede2b9f54ce5c68312ed21ff0eabb27edf41fe | |
| parent | 6e69db334661fd31f559fb72463e7911b6f9c6a1 (diff) | |
| parent | fd1d8926a7d65ecad22e5a8f271cb740ea9cf8bd (diff) | |
| download | bundler-d3c50f80d34d1ee7fa84d3d8a6a930c55186fbab.tar.gz | |
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
| -rw-r--r-- | spec/support/rubygems_ext.rb | 3 |
1 files changed, 2 insertions, 1 deletions
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 |