diff options
| author | The Bundler Bot <bot@bundler.io> | 2017-11-30 15:19:20 +0000 |
|---|---|---|
| committer | Samuel Giddins <segiddins@segiddins.me> | 2017-12-12 14:46:26 -0600 |
| commit | d94badec10aae8f163c900675384976ecf9678b3 (patch) | |
| tree | 9f85057edf057734b7faddb0be2cc3d0cc63858d | |
| parent | 8c08626303a164100345f1b4e015bbf845344300 (diff) | |
| download | bundler-d94badec10aae8f163c900675384976ecf9678b3.tar.gz | |
Auto merge of #6188 - bundler:indirect/fix-6072, r=indirect
Stop overriding specs during double-checks
This fixes my test-case reproduction of #6072. I’m pretty sure it’s because
the double-check was overriding the locally installed index specs with
specs fetched from the RubyGems API, causing Bundler to conclude that the
gems aren’t installed, even though they are.
@deivid-rodriguez @y-yagi can you verify that this patch fixes the issues with `inline` that you were seeing?
(cherry picked from commit 953acf7eb7c27f8fb569713c5276e12561687d6d)
| -rw-r--r-- | spec/realworld/double_check_spec.rb | 66 |
1 files changed, 32 insertions, 34 deletions
diff --git a/spec/realworld/double_check_spec.rb b/spec/realworld/double_check_spec.rb index 0aa58b3de3..94ab49ba2a 100644 --- a/spec/realworld/double_check_spec.rb +++ b/spec/realworld/double_check_spec.rb @@ -1,42 +1,40 @@ # frozen_string_literal: true RSpec.describe "double checking sources", :realworld => true do - if RUBY_VERSION >= "2.2" # rails 5.x and rack 2.x only supports >= Ruby 2.2. - it "finds already-installed gems" do - create_file("rails.gemspec", <<-RUBY) - Gem::Specification.new do |s| - s.name = "rails" - s.version = "5.1.4" - s.summary = "" - s.description = "" - s.author = "" - s.add_dependency "actionpack", "5.1.4" - end - RUBY + it "finds already-installed gems", :ruby => ">= 2.2" do + create_file("rails.gemspec", <<-RUBY) + Gem::Specification.new do |s| + s.name = "rails" + s.version = "5.1.4" + s.summary = "" + s.description = "" + s.author = "" + s.add_dependency "actionpack", "5.1.4" + end + RUBY - create_file("actionpack.gemspec", <<-RUBY) - Gem::Specification.new do |s| - s.name = "actionpack" - s.version = "5.1.4" - s.summary = "" - s.description = "" - s.author = "" - s.add_dependency "rack", "~> 2.0.0" - end - RUBY + create_file("actionpack.gemspec", <<-RUBY) + Gem::Specification.new do |s| + s.name = "actionpack" + s.version = "5.1.4" + s.summary = "" + s.description = "" + s.author = "" + s.add_dependency "rack", "~> 2.0.0" + end + RUBY - cmd = <<-RUBY - require "bundler" - require #{File.expand_path("../../support/artifice/vcr.rb", __FILE__).dump} - require "bundler/inline" - gemfile(true) do - source "https://rubygems.org" - gem "rails", path: "." - end - RUBY + cmd = <<-RUBY + require "bundler" + require #{File.expand_path("../../support/artifice/vcr.rb", __FILE__).dump} + require "bundler/inline" + gemfile(true) do + source "https://rubygems.org" + gem "rails", path: "." + end + RUBY - ruby! cmd - ruby! cmd - end + ruby! cmd + ruby! cmd end end |