diff options
| author | Homu <homu@barosl.com> | 2016-07-26 10:38:26 +0900 |
|---|---|---|
| committer | Homu <homu@barosl.com> | 2016-07-26 10:38:26 +0900 |
| commit | f26eec76ed6356a53a09a2e34f3552366b6c7d8b (patch) | |
| tree | 3abff2110dca8997fef6883dadb525420603af03 /spec/support | |
| parent | 4e85e96cacf5406a801ae8ce04c646a8bd4906a5 (diff) | |
| parent | 3050ab317bbfc127b38e165fba8257e3015a0ffe (diff) | |
| download | bundler-f26eec76ed6356a53a09a2e34f3552366b6c7d8b.tar.gz | |
Auto merge of #4800 - bundler:seg-locked-resolve-keep-platforms, r=indirect
[Definition] Ensure gemspec dependencies include all lockfile platforms
Closes #4798
This is necessary since `gemspec` declares platforms for the dependency as the reverse platform map of the generic local platform, thus missing out on all those platforms that aren't currently being resolved for
Diffstat (limited to 'spec/support')
| -rw-r--r-- | spec/support/builders.rb | 2 | ||||
| -rw-r--r-- | spec/support/helpers.rb | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/spec/support/builders.rb b/spec/support/builders.rb index 3c10cba757..6ed3a2904e 100644 --- a/spec/support/builders.rb +++ b/spec/support/builders.rb @@ -395,6 +395,8 @@ module Spec s.name = name s.version = Gem::Version.new(v) s.platform = platform + s.authors = ["no one in particular"] + s.summary = "a gemspec used only for testing" DepBuilder.run(s, &block) if block_given? end end diff --git a/spec/support/helpers.rb b/spec/support/helpers.rb index 0293f08716..0d2338df90 100644 --- a/spec/support/helpers.rb +++ b/spec/support/helpers.rb @@ -217,6 +217,7 @@ module Spec opts[:retry] ||= 0 bundle :install, opts end + bang :install_gemfile def lock_gemfile(*args) gemfile(*args) |