diff options
Diffstat (limited to 'spec/bundler/install')
| -rw-r--r-- | spec/bundler/install/gemfile/git_spec.rb | 6 | ||||
| -rw-r--r-- | spec/bundler/install/gemfile/specific_platform_spec.rb | 18 |
2 files changed, 17 insertions, 7 deletions
diff --git a/spec/bundler/install/gemfile/git_spec.rb b/spec/bundler/install/gemfile/git_spec.rb index cffb730841..a0fb4a3cea 100644 --- a/spec/bundler/install/gemfile/git_spec.rb +++ b/spec/bundler/install/gemfile/git_spec.rb @@ -89,7 +89,7 @@ RSpec.describe "bundle install with git sources" do gem "foo", "1.1", :git => "#{lib_path("foo-1.0")}" G - expect(err).to include("The source contains the following gems matching 'foo': foo-1.0") + expect(err).to include("The source contains the following gems matching 'foo':\n * foo-1.0") end it "complains with version and platform if pinned specs don't exist in the git repo" do @@ -106,7 +106,7 @@ RSpec.describe "bundle install with git sources" do end G - expect(err).to include("The source contains the following gems matching 'only_java': only_java-1.0-java") + expect(err).to include("The source contains the following gems matching 'only_java':\n * only_java-1.0-java") end it "complains with multiple versions and platforms if pinned specs don't exist in the git repo" do @@ -128,7 +128,7 @@ RSpec.describe "bundle install with git sources" do end G - expect(err).to include("The source contains the following gems matching 'only_java': only_java-1.0-java, only_java-1.1-java") + expect(err).to include("The source contains the following gems matching 'only_java':\n * only_java-1.0-java\n * only_java-1.1-java") end it "still works after moving the application directory" do diff --git a/spec/bundler/install/gemfile/specific_platform_spec.rb b/spec/bundler/install/gemfile/specific_platform_spec.rb index 6035f55ef2..113a0a1352 100644 --- a/spec/bundler/install/gemfile/specific_platform_spec.rb +++ b/spec/bundler/install/gemfile/specific_platform_spec.rb @@ -298,8 +298,13 @@ RSpec.describe "bundle install with specific platforms" do bundle "install", :raise_on_error => false end - expect(err).to include("Could not find gem 'sorbet-static (= 0.5.6433) arm64-darwin-21' in rubygems repository #{file_uri_for(gem_repo2)}/ or installed locally.") - expect(err).to include("The source contains the following gems matching 'sorbet-static (= 0.5.6433)': sorbet-static-0.5.6433-universal-darwin-20, sorbet-static-0.5.6433-x86_64-linux") + expect(err).to include <<~ERROR.rstrip + Could not find gem 'sorbet-static (= 0.5.6433) arm64-darwin-21' in rubygems repository #{file_uri_for(gem_repo2)}/ or installed locally. + + The source contains the following gems matching 'sorbet-static (= 0.5.6433)': + * sorbet-static-0.5.6433-universal-darwin-20 + * sorbet-static-0.5.6433-x86_64-linux + ERROR end it "does not resolve if the current platform does not match any of available platform specific variants for a transitive dependency" do @@ -319,8 +324,13 @@ RSpec.describe "bundle install with specific platforms" do bundle "install", :raise_on_error => false end - expect(err).to include("Could not find gem 'sorbet-static (= 0.5.6433) arm64-darwin-21', which is required by gem 'sorbet (= 0.5.6433)', in rubygems repository #{file_uri_for(gem_repo2)}/ or installed locally.") - expect(err).to include("The source contains the following gems matching 'sorbet-static (= 0.5.6433)': sorbet-static-0.5.6433-universal-darwin-20, sorbet-static-0.5.6433-x86_64-linux") + expect(err).to include <<~ERROR.rstrip + Could not find gem 'sorbet-static (= 0.5.6433) arm64-darwin-21', which is required by gem 'sorbet (= 0.5.6433)', in rubygems repository #{file_uri_for(gem_repo2)}/ or installed locally. + + The source contains the following gems matching 'sorbet-static (= 0.5.6433)': + * sorbet-static-0.5.6433-universal-darwin-20 + * sorbet-static-0.5.6433-x86_64-linux + ERROR end private |