diff options
author | David Rodriguez <deivid.rodriguez@riseup.net> | 2023-09-25 09:51:33 +0200 |
---|---|---|
committer | git <svn-admin@ruby-lang.org> | 2023-09-27 05:20:57 +0000 |
commit | a812f1fed0e6e184447ca00b713d54b25be05911 (patch) | |
tree | 61b0a140a005fa7741158eaa41a7d057bbac3a11 /spec | |
parent | bc664609df6a5dfb95bc9c604bd0a661b3fbcf26 (diff) | |
download | ruby-a812f1fed0e6e184447ca00b713d54b25be05911.tar.gz |
[rubygems/rubygems] Reword a couple of error messages
When a path does not make a lot of sense.
https://github.com/rubygems/rubygems/commit/d173c79e9a
Diffstat (limited to 'spec')
-rw-r--r-- | spec/bundler/install/deploy_spec.rb | 4 | ||||
-rw-r--r-- | spec/bundler/lock/lockfile_spec.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/bundler/install/deploy_spec.rb b/spec/bundler/install/deploy_spec.rb index 045d643a8f..f7b41595be 100644 --- a/spec/bundler/install/deploy_spec.rb +++ b/spec/bundler/install/deploy_spec.rb @@ -11,12 +11,12 @@ RSpec.describe "install in deployment or frozen mode" do context "with CLI flags", :bundler => "< 3" do it "fails without a lockfile and says that --deployment requires a lock" do bundle "install --deployment", :raise_on_error => false - expect(err).to include("The --deployment flag requires a Gemfile.lock") + expect(err).to include("The --deployment flag requires a lockfile") end it "fails without a lockfile and says that --frozen requires a lock" do bundle "install --frozen", :raise_on_error => false - expect(err).to include("The --frozen flag requires a Gemfile.lock") + expect(err).to include("The --frozen flag requires a lockfile") end it "disallows --deployment --system" do diff --git a/spec/bundler/lock/lockfile_spec.rb b/spec/bundler/lock/lockfile_spec.rb index ccf23a9e3c..5a236dd5d2 100644 --- a/spec/bundler/lock/lockfile_spec.rb +++ b/spec/bundler/lock/lockfile_spec.rb @@ -1584,7 +1584,7 @@ RSpec.describe "the lockfile format" do gem "rack" G - expect(err).to match(/your Gemfile.lock contains merge conflicts/i) + expect(err).to match(/your lockfile contains merge conflicts/i) expect(err).to match(/git checkout HEAD -- Gemfile.lock/i) end |