diff options
| -rw-r--r-- | lib/bundler/spec_set.rb | 2 | ||||
| -rw-r--r-- | spec/bundler/bundler/spec_set_spec.rb | 26 |
2 files changed, 27 insertions, 1 deletions
diff --git a/lib/bundler/spec_set.rb b/lib/bundler/spec_set.rb index 84f20d90d0..163e16863b 100644 --- a/lib/bundler/spec_set.rb +++ b/lib/bundler/spec_set.rb @@ -155,7 +155,7 @@ module Bundler def incomplete_specs_for_platform(deps, platform) return [] if @specs.empty? - validation_set = self.class.new(@specs) + validation_set = self.class.new(@specs).with_overrides(@overrides) validation_set.for(deps, [platform]) validation_set.incomplete_specs end diff --git a/spec/bundler/bundler/spec_set_spec.rb b/spec/bundler/bundler/spec_set_spec.rb index d69d0bf8fd..dce86793b9 100644 --- a/spec/bundler/bundler/spec_set_spec.rb +++ b/spec/bundler/bundler/spec_set_spec.rb @@ -92,4 +92,30 @@ RSpec.describe Bundler::SpecSet do ] end end + + describe "#with_overrides" do + it "defaults to an empty override list" do + expect(described_class.new([]).overrides).to eq([]) + end + + it "stores the overrides supplied" do + override = Bundler::Override.new("rails", :version, ">= 8.0") + expect(described_class.new([]).with_overrides([override]).overrides).to eq([override]) + end + + it "treats nil as an empty override list" do + set = described_class.new([]) + override = Bundler::Override.new("rails", :version, ">= 8.0") + set.with_overrides([override]) + set.with_overrides(nil) + expect(set.overrides).to eq([]) + end + + it "cascades overrides to contained specs that accept them" do + lazy = Bundler::LazySpecification.new("rails", "8.0", Gem::Platform::RUBY) + override = Bundler::Override.new("rails", :version, ">= 8.0") + described_class.new([lazy]).with_overrides([override]) + expect(lazy.overrides).to eq([override]) + end + end end |