summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2021-12-14 14:49:43 +0100
committergit <svn-admin@ruby-lang.org>2021-12-17 16:35:17 +0900
commitaf4b4fd19b7972adc165e70e9d41ad7e14c9a235 (patch)
tree9b2b458ae30d7ef637beb8ebf81afc3175326a97 /spec
parentce6fc20f973e307071533bfd9699da88986c67a3 (diff)
[rubygems/rubygems] Improve resolver error messages
Use a more standard naming for gems. https://github.com/rubygems/rubygems/commit/75121e83f1
Diffstat (limited to 'spec')
-rw-r--r--spec/bundler/commands/exec_spec.rb4
-rw-r--r--spec/bundler/install/gemfile/git_spec.rb6
2 files changed, 5 insertions, 5 deletions
diff --git a/spec/bundler/commands/exec_spec.rb b/spec/bundler/commands/exec_spec.rb
index e67e5b96ef..83e8088349 100644
--- a/spec/bundler/commands/exec_spec.rb
+++ b/spec/bundler/commands/exec_spec.rb
@@ -867,7 +867,7 @@ RSpec.describe "bundle exec" do
let(:expected) { "" }
let(:expected_err) { <<-EOS.strip }
Could not find gem 'rack (= 2)' in locally installed gems.
-The source contains the following versions of 'rack': 0.9.1, 1.0.0
+The source contains the following gems matching 'rack': rack-0.9.1, rack-1.0.0
Run `bundle install` to install missing gems.
EOS
@@ -894,7 +894,7 @@ Run `bundle install` to install missing gems.
let(:expected) { "" }
let(:expected_err) { <<-EOS.strip }
Could not find gem 'rack (= 2)' in locally installed gems.
-The source contains the following versions of 'rack': 1.0.0
+The source contains the following gems matching 'rack': rack-1.0.0
Run `bundle install` to install missing gems.
EOS
diff --git a/spec/bundler/install/gemfile/git_spec.rb b/spec/bundler/install/gemfile/git_spec.rb
index 150fcf2c42..cffb730841 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 versions of 'foo': 1.0")
+ expect(err).to include("The source contains the following gems matching 'foo': 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 versions of 'only_java': 1.0 java")
+ expect(err).to include("The source contains the following gems matching 'only_java': 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 versions of 'only_java': 1.0 java, 1.1 java")
+ expect(err).to include("The source contains the following gems matching 'only_java': only_java-1.0-java, only_java-1.1-java")
end
it "still works after moving the application directory" do