diff options
author | Sutou Kouhei <kou@clear-code.com> | 2020-01-15 06:45:25 +0900 |
---|---|---|
committer | Sutou Kouhei <kou@clear-code.com> | 2020-01-15 06:45:25 +0900 |
commit | fd11bd3089122ea332e0637fa00d4b0149c2b53f (patch) | |
tree | 388e492e5a476a521d073aa7a63ac38305c27e44 /spec | |
parent | 637b695640b147061a04b5c11ed3de4ec7a656c0 (diff) | |
download | bundler-fd11bd3089122ea332e0637fa00d4b0149c2b53f.tar.gz |
Always add "ruby" version to selected spec groups as fallback
Diffstat (limited to 'spec')
-rw-r--r-- | spec/resolver/platform_spec.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/spec/resolver/platform_spec.rb b/spec/resolver/platform_spec.rb index b650f12b88..1f39e77117 100644 --- a/spec/resolver/platform_spec.rb +++ b/spec/resolver/platform_spec.rb @@ -69,7 +69,9 @@ RSpec.describe "Resolving platform craziness" do @index = build_index do gem "foo", "1.0.0" gem "foo", "1.0.0", "x64-mingw32" - gem "foo", "1.1.0" + gem "foo", "1.1.0" do |s| + s.required_ruby_version = [">= 2.0"] + end gem "foo", "1.1.0", "x64-mingw32" do |s| s.required_ruby_version = [">= 2.0", "< 2.4"] end @@ -144,11 +146,11 @@ RSpec.describe "Resolving platform craziness" do end end - it "reports on the conflict" do + it "takes the ruby version as fallback" do platforms "ruby", "java" dep "foo" - should_conflict_on "baz" + should_resolve_as %w[bar-1.0.0 baz-1.0.0 foo-1.0.0] end end end |