diff options
| author | David RodrÃguez <[email protected]> | 2025-03-12 18:16:57 +0100 |
|---|---|---|
| committer | Hiroshi SHIBATA <[email protected]> | 2025-03-24 13:25:07 +0900 |
| commit | bb1b5877a7b2dba79c81275f32b7cc5485323540 (patch) | |
| tree | 8a84614699ceff3bfdd0b46d08f2f812720ebafb /spec/bundler/install | |
| parent | 33201adf686044163951de3068ca915fd6cea6cd (diff) | |
[rubygems/rubygems] Consistently use "lockfile" over "lock file"
https://github.com/rubygems/rubygems/commit/e891be9197
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/12968
Diffstat (limited to 'spec/bundler/install')
| -rw-r--r-- | spec/bundler/install/deploy_spec.rb | 2 | ||||
| -rw-r--r-- | spec/bundler/install/gemfile/sources_spec.rb | 4 | ||||
| -rw-r--r-- | spec/bundler/install/gemfile/specific_platform_spec.rb | 2 | ||||
| -rw-r--r-- | spec/bundler/install/gems/resolving_spec.rb | 2 | ||||
| -rw-r--r-- | spec/bundler/install/process_lock_spec.rb | 6 |
5 files changed, 8 insertions, 8 deletions
diff --git a/spec/bundler/install/deploy_spec.rb b/spec/bundler/install/deploy_spec.rb index f44e24b790..bba49aad0a 100644 --- a/spec/bundler/install/deploy_spec.rb +++ b/spec/bundler/install/deploy_spec.rb @@ -321,7 +321,7 @@ RSpec.describe "install in deployment or frozen mode" do L bundle :install, env: { "BUNDLE_FROZEN" => "true" }, raise_on_error: false, artifice: "compact_index" - expect(err).to include("Your lock file is missing \"bar\", but the lockfile can't be updated because frozen mode is set") + expect(err).to include("Your lockfile is missing \"bar\", but the lockfile can't be updated because frozen mode is set") end it "explodes if a path gem is missing" do diff --git a/spec/bundler/install/gemfile/sources_spec.rb b/spec/bundler/install/gemfile/sources_spec.rb index 84af5c0d06..f3892db5c9 100644 --- a/spec/bundler/install/gemfile/sources_spec.rb +++ b/spec/bundler/install/gemfile/sources_spec.rb @@ -273,7 +273,7 @@ RSpec.describe "bundle install with gems on multiple sources" do expect(the_bundle).to include_gems("depends_on_myrack 1.0.1", "myrack 1.0.0", source: "remote3") # In https://github.com/bundler/bundler/issues/3585 this failed - # when there is already a lock file, and the gems are missing, so try again + # when there is already a lockfile, and the gems are missing, so try again system_gems [] bundle :install, artifice: "compact_index" @@ -482,7 +482,7 @@ RSpec.describe "bundle install with gems on multiple sources" do expect(the_bundle).to include_gems("depends_on_myrack 1.0.1", "myrack 1.0.0") # In https://github.com/rubygems/bundler/issues/3585 this failed - # when there is already a lock file, and the gems are missing, so try again + # when there is already a lockfile, and the gems are missing, so try again system_gems [] bundle :install, artifice: "compact_index" diff --git a/spec/bundler/install/gemfile/specific_platform_spec.rb b/spec/bundler/install/gemfile/specific_platform_spec.rb index 257f78f2c5..e09336e435 100644 --- a/spec/bundler/install/gemfile/specific_platform_spec.rb +++ b/spec/bundler/install/gemfile/specific_platform_spec.rb @@ -91,7 +91,7 @@ RSpec.describe "bundle install with specific platforms" do #{Bundler::VERSION} L - # force strict usage of the lock file by setting frozen mode + # force strict usage of the lockfile by setting frozen mode bundle "config set --local frozen true" # make sure the platform that got actually installed with the old bundler is used diff --git a/spec/bundler/install/gems/resolving_spec.rb b/spec/bundler/install/gems/resolving_spec.rb index df55a03bbf..eb6e5aa995 100644 --- a/spec/bundler/install/gems/resolving_spec.rb +++ b/spec/bundler/install/gems/resolving_spec.rb @@ -394,7 +394,7 @@ RSpec.describe "bundle install with install-time dependencies" do end end - context "with a Gemfile and lock file that don't resolve under the current platform" do + context "with a Gemfile and lockfile that don't resolve under the current platform" do before do build_repo4 do build_gem "sorbet", "0.5.10554" do |s| diff --git a/spec/bundler/install/process_lock_spec.rb b/spec/bundler/install/process_lock_spec.rb index 8082ec40fa..344caa3a93 100644 --- a/spec/bundler/install/process_lock_spec.rb +++ b/spec/bundler/install/process_lock_spec.rb @@ -24,7 +24,7 @@ RSpec.describe "process lock spec" do context "when creating a lock raises Errno::ENOTSUP" do before { allow(File).to receive(:open).and_raise(Errno::ENOTSUP) } - it "skips creating the lock file and yields" do + it "skips creating the lockfile and yields" do processed = false Bundler::ProcessLock.lock(default_bundle_path) { processed = true } @@ -35,7 +35,7 @@ RSpec.describe "process lock spec" do context "when creating a lock raises Errno::EPERM" do before { allow(File).to receive(:open).and_raise(Errno::EPERM) } - it "skips creating the lock file and yields" do + it "skips creating the lockfile and yields" do processed = false Bundler::ProcessLock.lock(default_bundle_path) { processed = true } @@ -46,7 +46,7 @@ RSpec.describe "process lock spec" do context "when creating a lock raises Errno::EROFS" do before { allow(File).to receive(:open).and_raise(Errno::EROFS) } - it "skips creating the lock file and yields" do + it "skips creating the lockfile and yields" do processed = false Bundler::ProcessLock.lock(default_bundle_path) { processed = true } |