summaryrefslogtreecommitdiff
path: root/spec/bundler
diff options
context:
space:
mode:
authorDaniel Colson <danieljamescolson@gmail.com>2023-02-08 14:56:53 -0500
committergit <svn-admin@ruby-lang.org>2023-02-08 22:20:24 +0000
commit728d2f808e7baf92d9190b3b27161d2405236eb0 (patch)
tree4c68b277376250381f38cac8b6e00580ddfcd3be /spec/bundler
parent861d70e3839856fb27f488755752e06f9183efba (diff)
downloadruby-728d2f808e7baf92d9190b3b27161d2405236eb0.tar.gz
[rubygems/rubygems] Improve wording of unmet dependencies warning
`trying to manually editing` doesn't seem quite grammatically correct. We could change it to `trying to manually edit` (is that a split infinitive?), but I don't think `trying to` adds much here so I've removed it instead so `editing` is the verb. For the list of dependencies, the wording before this commit seemed to reverse the dependency. "B, depended on A" sounds like B depends on A (or did in the past but doesn't anymore?), but that's not correct. I think there's a missing word: "B, depended on by A", but I find "B, dependency of A" a bit nicer. https://github.com/rubygems/rubygems/commit/49a31257e3
Diffstat (limited to 'spec/bundler')
-rw-r--r--spec/bundler/bundler/installer/parallel_installer_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/bundler/bundler/installer/parallel_installer_spec.rb b/spec/bundler/bundler/installer/parallel_installer_spec.rb
index f67d03356d..c8403a2e38 100644
--- a/spec/bundler/bundler/installer/parallel_installer_spec.rb
+++ b/spec/bundler/bundler/installer/parallel_installer_spec.rb
@@ -22,9 +22,9 @@ RSpec.describe Bundler::ParallelInstaller do
it "prints a warning" do
expect(Bundler.ui).to receive(:warn).with(<<-W.strip)
Your lockfile doesn't include a valid resolution.
-You can fix this by regenerating your lockfile or trying to manually editing the bad locked gems to a version that satisfies all dependencies.
+You can fix this by regenerating your lockfile or manually editing the bad locked gems to a version that satisfies all dependencies.
The unmet dependencies are:
-* diff-lcs (< 1.4), depended upon cucumber-4.1.0, unsatisfied by diff-lcs-1.4.4
+* diff-lcs (< 1.4), dependency of cucumber-4.1.0, unsatisfied by diff-lcs-1.4.4
W
subject.check_for_unmet_dependencies
end