diff options
author | Sutou Kouhei <kou@clear-code.com> | 2020-01-05 06:56:11 +0900 |
---|---|---|
committer | Sutou Kouhei <kou@clear-code.com> | 2020-01-15 06:27:03 +0900 |
commit | 13f5a8a72090727e55ec789f44a1820ad61069d3 (patch) | |
tree | c443708c55dc49c7ecac0732c73bc45157a3e02f /spec/install/gems/resolving_spec.rb | |
parent | 9397c2c75486bc0178ab8486fc2bc44c95d924b8 (diff) | |
download | bundler-13f5a8a72090727e55ec789f44a1820ad61069d3.tar.gz |
Update expected for specific_platform feature flags case
In this case, Bundler uses specific platform to resolve dependency. So
error message includes specific platform information.
Diffstat (limited to 'spec/install/gems/resolving_spec.rb')
-rw-r--r-- | spec/install/gems/resolving_spec.rb | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/spec/install/gems/resolving_spec.rb b/spec/install/gems/resolving_spec.rb index 523f9eb151..0e933bfd8e 100644 --- a/spec/install/gems/resolving_spec.rb +++ b/spec/install/gems/resolving_spec.rb @@ -156,6 +156,13 @@ RSpec.describe "bundle install with install-time dependencies" do let(:ruby_requirement) { %("#{RUBY_VERSION}") } let(:error_message_requirement) { "~> #{RUBY_VERSION}.0" } + let(:error_message_platform) do + if Bundler.feature_flag.specific_platform? + " #{Bundler.local_platform}" + else + "" + end + end shared_examples_for "ruby version conflicts" do it "raises an error during resolution" do @@ -172,10 +179,10 @@ RSpec.describe "bundle install with install-time dependencies" do nice_error = strip_whitespace(<<-E).strip Bundler found conflicting requirements for the Ruby\0 version: In Gemfile: - Ruby\0 (#{error_message_requirement}) + Ruby\0 (#{error_message_requirement})#{error_message_platform} require_ruby was resolved to 1.0, which depends on - Ruby\0 (> 9000) + Ruby\0 (> 9000)#{error_message_platform} Ruby\0 (> 9000), which is required by gem 'require_ruby', is not available in the local ruby installation E |