diff options
author | Lars Kanis <kanis@comcard.de> | 2020-01-09 15:33:23 +0100 |
---|---|---|
committer | Lars Kanis <kanis@comcard.de> | 2020-01-16 12:53:04 +0100 |
commit | 394cd143f007e03db70d72c353bf5d3752139b21 (patch) | |
tree | e395db8e83fdfaec5cf30861fd8902e59a39be74 /spec | |
parent | d852b30b66165dbb88682f72a8929568af7e7c57 (diff) | |
download | bundler-394cd143f007e03db70d72c353bf5d3752139b21.tar.gz |
Reactivate usused code for ruby version resolution
The code was changed in commit 38b0e7ed64c3ca1c40f43c5aa9a1ead2f6cd7049 so that RubyVersion.system was no longer respected.
This is reactivated now and specs are adjusted accordingly.
Diffstat (limited to 'spec')
-rw-r--r-- | spec/install/gems/resolving_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/install/gems/resolving_spec.rb b/spec/install/gems/resolving_spec.rb index 547d13134f..20fe4c7728 100644 --- a/spec/install/gems/resolving_spec.rb +++ b/spec/install/gems/resolving_spec.rb @@ -194,7 +194,7 @@ RSpec.describe "bundle install with install-time dependencies" do describe "with a < requirement" do let(:ruby_requirement) { %("< 5000") } - let(:error_message_requirement) { "< 5000" } + let(:error_message_requirement) { Gem::Requirement.new(["< 5000", "= #{RUBY_VERSION}.#{RUBY_PATCHLEVEL}"]).to_s } it_behaves_like "ruby version conflicts" end @@ -202,7 +202,7 @@ RSpec.describe "bundle install with install-time dependencies" do describe "with a compound requirement" do let(:reqs) { ["> 0.1", "< 5000"] } let(:ruby_requirement) { reqs.map(&:dump).join(", ") } - let(:error_message_requirement) { Gem::Requirement.new(reqs).to_s } + let(:error_message_requirement) { Gem::Requirement.new(reqs + ["= #{RUBY_VERSION}.#{RUBY_PATCHLEVEL}"]).to_s } it_behaves_like "ruby version conflicts" end |