diff options
| author | The Bundler Bot <bot@bundler.io> | 2017-01-24 20:28:04 +0000 |
|---|---|---|
| committer | Samuel Giddins <segiddins@segiddins.me> | 2017-01-24 15:39:54 -0600 |
| commit | 91cc62210040c4984b5d03f21943d7b60e07b28d (patch) | |
| tree | 3b682d795f293a08abe02903dafefb7599c04a75 | |
| parent | b26be39561c713c7982cf34f83acd32d16e17a9f (diff) | |
| download | bundler-91cc62210040c4984b5d03f21943d7b60e07b28d.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
(cherry picked from commit d3c50f80d34d1ee7fa84d3d8a6a930c55186fbab)
| -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 |