summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--spec/bundler/cache/gems_spec.rb4
-rw-r--r--spec/bundler/cache/git_spec.rb16
-rw-r--r--spec/bundler/commands/cache_spec.rb8
-rw-r--r--spec/bundler/commands/check_spec.rb6
-rw-r--r--spec/bundler/commands/clean_spec.rb4
-rw-r--r--spec/bundler/commands/exec_spec.rb2
-rw-r--r--spec/bundler/commands/info_spec.rb2
-rw-r--r--spec/bundler/commands/install_spec.rb6
-rw-r--r--spec/bundler/commands/outdated_spec.rb2
-rw-r--r--spec/bundler/commands/show_spec.rb2
-rw-r--r--spec/bundler/commands/update_spec.rb2
-rw-r--r--spec/bundler/install/gemfile/git_spec.rb4
-rw-r--r--spec/bundler/install/gemfile/groups_spec.rb2
-rw-r--r--spec/bundler/install/gems/compact_index_spec.rb14
-rw-r--r--spec/bundler/install/gems/dependency_api_spec.rb14
-rw-r--r--spec/bundler/install/git_spec.rb2
-rw-r--r--spec/bundler/install/global_cache_spec.rb2
-rw-r--r--spec/bundler/install/path_spec.rb2
-rw-r--r--spec/bundler/install/prereleases_spec.rb2
-rw-r--r--spec/bundler/lock/git_spec.rb2
-rw-r--r--spec/bundler/plugins/source/example_spec.rb8
-rw-r--r--spec/bundler/runtime/setup_spec.rb6
-rw-r--r--spec/bundler/spec_helper.rb2
-rw-r--r--spec/bundler/support/helpers.rb6
-rw-r--r--spec/bundler/update/git_spec.rb2
25 files changed, 61 insertions, 61 deletions
diff --git a/spec/bundler/cache/gems_spec.rb b/spec/bundler/cache/gems_spec.rb
index f43c1f7241..780972b9af 100644
--- a/spec/bundler/cache/gems_spec.rb
+++ b/spec/bundler/cache/gems_spec.rb
@@ -312,7 +312,7 @@ RSpec.describe "bundle cache" do
path: cached_myrack.parent,
rubygems_version: "1.3.2"
- FileUtils.rm_rf default_bundle_path
+ FileUtils.rm_r default_bundle_path
system_gems :bundler
FileUtils.rm bundled_app_lock
@@ -345,7 +345,7 @@ RSpec.describe "bundle cache" do
c.checksum gem_repo1, "myrack", "1.0.0"
end
- FileUtils.rm_rf default_bundle_path
+ FileUtils.rm_r default_bundle_path
system_gems :bundler
lockfile <<-L
diff --git a/spec/bundler/cache/git_spec.rb b/spec/bundler/cache/git_spec.rb
index 118977e99a..b337882a6e 100644
--- a/spec/bundler/cache/git_spec.rb
+++ b/spec/bundler/cache/git_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe "bundle cache with git" do
expect(bundled_app("vendor/cache/foo-1.0-#{ref}/.git")).not_to exist
expect(bundled_app("vendor/cache/foo-1.0-#{ref}/.bundlecache")).to be_file
- FileUtils.rm_rf lib_path("foo-1.0")
+ FileUtils.rm_r lib_path("foo-1.0")
expect(the_bundle).to include_gems "foo 1.0"
end
@@ -49,7 +49,7 @@ RSpec.describe "bundle cache with git" do
expect(bundled_app("vendor/cache/foo-1.0-#{ref}")).to exist
expect(bundled_app("vendor/cache/foo-1.0-#{ref}/.git")).not_to exist
- FileUtils.rm_rf lib_path("foo-1.0")
+ FileUtils.rm_r lib_path("foo-1.0")
expect(the_bundle).to include_gems "foo 1.0"
end
@@ -66,7 +66,7 @@ RSpec.describe "bundle cache with git" do
bundle :cache
expect(out).to include "Updating files in vendor/cache"
- FileUtils.rm_rf lib_path("foo-1.0")
+ FileUtils.rm_r lib_path("foo-1.0")
expect(the_bundle).to include_gems "foo 1.0"
end
@@ -95,7 +95,7 @@ RSpec.describe "bundle cache with git" do
expect(bundled_app("vendor/cache/foo-1.0-#{ref}")).to exist
expect(bundled_app("vendor/cache/foo-1.0-#{old_ref}")).not_to exist
- FileUtils.rm_rf lib_path("foo-1.0")
+ FileUtils.rm_r lib_path("foo-1.0")
run "require 'foo'"
expect(out).to eq("CACHE")
end
@@ -124,7 +124,7 @@ RSpec.describe "bundle cache with git" do
expect(bundled_app("vendor/cache/foo-1.0-#{ref}")).to exist
expect(bundled_app("vendor/cache/foo-1.0-#{old_ref}")).not_to exist
- FileUtils.rm_rf lib_path("foo-1.0")
+ FileUtils.rm_r lib_path("foo-1.0")
run "require 'foo'"
expect(out).to eq("CACHE")
end
@@ -249,7 +249,7 @@ RSpec.describe "bundle cache with git" do
# Simulate old cache by copying the real cache folder to vendor/cache
FileUtils.mkdir_p bundled_app("vendor/cache")
FileUtils.cp_r "#{Dir.glob(vendored_gems("cache/bundler/git/foo-1.0-*")).first}/.", cache_dir
- FileUtils.rm_rf bundled_app("vendor/bundle")
+ FileUtils.rm_r bundled_app("vendor/bundle")
bundle "install --local --verbose"
expect(err).to include("Installing from cache in old \"bare repository\" format for compatibility")
@@ -281,7 +281,7 @@ RSpec.describe "bundle cache with git" do
# Simulate old cache by copying the real cache folder to vendor/cache
FileUtils.mkdir_p bundled_app("vendor/cache")
FileUtils.cp_r "#{Dir.glob(vendored_gems("cache/bundler/git/foo-1.0-*")).first}/.", cache_dir
- FileUtils.rm_rf bundled_app("vendor/bundle")
+ FileUtils.rm_r bundled_app("vendor/bundle")
bundle "install --verbose"
expect(out).to include("Fetching")
@@ -423,7 +423,7 @@ RSpec.describe "bundle cache with git" do
# Simulate an old incorrect situation where vendor/cache would be the install location of git gems
FileUtils.mkdir_p bundled_app("vendor/cache")
FileUtils.cp_r git_path, bundled_app("vendor/cache/foo-1.0-#{path_revision}")
- FileUtils.rm_rf bundled_app("vendor/cache/foo-1.0-#{path_revision}/.git")
+ FileUtils.rm_r bundled_app("vendor/cache/foo-1.0-#{path_revision}/.git")
bundle :install, env: { "BUNDLE_DEPLOYMENT" => "true", "BUNDLE_CACHE_ALL" => "true" }
end
diff --git a/spec/bundler/commands/cache_spec.rb b/spec/bundler/commands/cache_spec.rb
index b2e89855bf..3f7a627296 100644
--- a/spec/bundler/commands/cache_spec.rb
+++ b/spec/bundler/commands/cache_spec.rb
@@ -357,7 +357,7 @@ RSpec.describe "bundle install with gem sources" do
bundle :cache
pristine_system_gems :bundler
- FileUtils.rm_rf gem_repo2
+ FileUtils.rm_r gem_repo2
bundle "install --local"
expect(the_bundle).to include_gems "myrack 1.0.0"
@@ -372,7 +372,7 @@ RSpec.describe "bundle install with gem sources" do
bundle :cache
pristine_system_gems :bundler
- FileUtils.rm_rf gem_repo2
+ FileUtils.rm_r gem_repo2
bundle "config set --local deployment true"
bundle "config set --local path vendor/bundle"
@@ -389,7 +389,7 @@ RSpec.describe "bundle install with gem sources" do
bundle :cache
pristine_system_gems :bundler
- FileUtils.rm_rf gem_repo2
+ FileUtils.rm_r gem_repo2
bundle "config set --local cache_all_platforms true"
bundle "config set --local path vendor/bundle"
@@ -449,7 +449,7 @@ RSpec.describe "bundle install with gem sources" do
empty_repo4
# delete compact index cache
- FileUtils.rm_rf home(".bundle/cache/compact_index")
+ FileUtils.rm_r home(".bundle/cache/compact_index")
bundle "install", artifice: "compact_index", env: { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }
diff --git a/spec/bundler/commands/check_spec.rb b/spec/bundler/commands/check_spec.rb
index 1d850cf38d..71bc4e39d7 100644
--- a/spec/bundler/commands/check_spec.rb
+++ b/spec/bundler/commands/check_spec.rb
@@ -95,7 +95,7 @@ RSpec.describe "bundle check" do
gem "foo", git: "#{lib_path("foo")}"
G
- FileUtils.rm_rf bundled_app("vendor/bundle")
+ FileUtils.rm_r bundled_app("vendor/bundle")
bundle :check, raise_on_error: false
expect(exitstatus).to eq 1
expect(err).to include("Bundler can't satisfy your Gemfile's dependencies.")
@@ -281,7 +281,7 @@ RSpec.describe "bundle check" do
G
bundle "install --path vendor/bundle"
- FileUtils.rm_rf(bundled_app(".bundle"))
+ FileUtils.rm_r(bundled_app(".bundle"))
end
it "returns success" do
@@ -328,7 +328,7 @@ RSpec.describe "bundle check" do
end
it "shows what is missing with the current Gemfile if it is not satisfied" do
- FileUtils.rm_rf default_bundle_path
+ FileUtils.rm_r default_bundle_path
system_gems :bundler
bundle :check, raise_on_error: false
expect(err).to match(/The following gems are missing/)
diff --git a/spec/bundler/commands/clean_spec.rb b/spec/bundler/commands/clean_spec.rb
index c27766835e..2559be0205 100644
--- a/spec/bundler/commands/clean_spec.rb
+++ b/spec/bundler/commands/clean_spec.rb
@@ -352,8 +352,8 @@ RSpec.describe "bundle clean" do
bundle "install"
FileUtils.rm(vendored_gems("bin/myrackup"))
- FileUtils.rm_rf(vendored_gems("gems/thin-1.0"))
- FileUtils.rm_rf(vendored_gems("gems/myrack-1.0.0"))
+ FileUtils.rm_r(vendored_gems("gems/thin-1.0"))
+ FileUtils.rm_r(vendored_gems("gems/myrack-1.0.0"))
bundle :clean
diff --git a/spec/bundler/commands/exec_spec.rb b/spec/bundler/commands/exec_spec.rb
index 2607c736f9..051e9a18f1 100644
--- a/spec/bundler/commands/exec_spec.rb
+++ b/spec/bundler/commands/exec_spec.rb
@@ -1264,7 +1264,7 @@ RSpec.describe "bundle exec" do
end
it "allows calling bundle install after removing gem.build_complete" do
- FileUtils.rm_rf Dir[bundled_app(".bundle/**/gem.build_complete")]
+ FileUtils.rm_r Dir[bundled_app(".bundle/**/gem.build_complete")]
bundle "exec #{Gem.ruby} -S bundle install"
end
end
diff --git a/spec/bundler/commands/info_spec.rb b/spec/bundler/commands/info_spec.rb
index 4016cc5291..478cf06405 100644
--- a/spec/bundler/commands/info_spec.rb
+++ b/spec/bundler/commands/info_spec.rb
@@ -70,7 +70,7 @@ RSpec.describe "bundle info" do
end
it "warns if path does not exist on disk, but specification is there" do
- FileUtils.rm_rf(default_bundle_path("gems", "rails-2.3.2"))
+ FileUtils.rm_r(default_bundle_path("gems", "rails-2.3.2"))
bundle "info rails --path"
diff --git a/spec/bundler/commands/install_spec.rb b/spec/bundler/commands/install_spec.rb
index 75bfe9ec63..c4861e9dbc 100644
--- a/spec/bundler/commands/install_spec.rb
+++ b/spec/bundler/commands/install_spec.rb
@@ -100,7 +100,7 @@ RSpec.describe "bundle install with gem sources" do
gem 'myrack'
G
- FileUtils.rm_rf(default_bundle_path("gems/myrack-1.0.0"))
+ FileUtils.rm_r(default_bundle_path("gems/myrack-1.0.0"))
bundle "install --verbose"
@@ -337,13 +337,13 @@ RSpec.describe "bundle install with gem sources" do
it "allows running bundle install --system without deleting foo", bundler: "< 3" do
bundle "install --path vendor"
bundle "install --system"
- FileUtils.rm_rf(bundled_app("vendor"))
+ FileUtils.rm_r(bundled_app("vendor"))
expect(the_bundle).to include_gems "myrack 1.0"
end
it "allows running bundle install --system after deleting foo", bundler: "< 3" do
bundle "install --path vendor"
- FileUtils.rm_rf(bundled_app("vendor"))
+ FileUtils.rm_r(bundled_app("vendor"))
bundle "install --system"
expect(the_bundle).to include_gems "myrack 1.0"
end
diff --git a/spec/bundler/commands/outdated_spec.rb b/spec/bundler/commands/outdated_spec.rb
index 5e5afe944d..09b0e6f32f 100644
--- a/spec/bundler/commands/outdated_spec.rb
+++ b/spec/bundler/commands/outdated_spec.rb
@@ -417,7 +417,7 @@ RSpec.describe "bundle outdated" do
end
it "doesn't hit repo2" do
- FileUtils.rm_rf(gem_repo2)
+ FileUtils.rm_r(gem_repo2)
bundle "outdated --local"
expect(out).not_to match(/Fetching (gem|version|dependency) metadata from/)
diff --git a/spec/bundler/commands/show_spec.rb b/spec/bundler/commands/show_spec.rb
index 8ccda50c9c..0ff9416757 100644
--- a/spec/bundler/commands/show_spec.rb
+++ b/spec/bundler/commands/show_spec.rb
@@ -36,7 +36,7 @@ RSpec.describe "bundle show", bundler: "< 3" do
end
it "warns if specification is installed, but path does not exist on disk" do
- FileUtils.rm_rf(default_bundle_path("gems", "rails-2.3.2"))
+ FileUtils.rm_r(default_bundle_path("gems", "rails-2.3.2"))
bundle "show rails"
diff --git a/spec/bundler/commands/update_spec.rb b/spec/bundler/commands/update_spec.rb
index f6d0188794..6cbd167bb0 100644
--- a/spec/bundler/commands/update_spec.rb
+++ b/spec/bundler/commands/update_spec.rb
@@ -653,7 +653,7 @@ RSpec.describe "bundle update" do
bundle "install"
- FileUtils.rm_rf(gem_repo2)
+ FileUtils.rm_r(gem_repo2)
bundle "update --local --all"
expect(out).not_to include("Fetching source index")
diff --git a/spec/bundler/install/gemfile/git_spec.rb b/spec/bundler/install/gemfile/git_spec.rb
index 889d81e1dc..c763da4c00 100644
--- a/spec/bundler/install/gemfile/git_spec.rb
+++ b/spec/bundler/install/gemfile/git_spec.rb
@@ -31,7 +31,7 @@ RSpec.describe "bundle install with git sources" do
end
it "does not write to cache on bundler/setup" do
- FileUtils.rm_rf(default_cache_path)
+ FileUtils.rm_r(default_cache_path)
ruby "require 'bundler/setup'"
expect(default_cache_path).not_to exist
end
@@ -1038,7 +1038,7 @@ RSpec.describe "bundle install with git sources" do
gem "foo", :git => "#{lib_path("foo-1.0")}"
G
- FileUtils.rm_rf(lib_path("foo-1.0"))
+ FileUtils.rm_r(lib_path("foo-1.0"))
bundle "install"
expect(out).not_to match(/updating/i)
diff --git a/spec/bundler/install/gemfile/groups_spec.rb b/spec/bundler/install/gemfile/groups_spec.rb
index 71871899a2..c5f50a8c5d 100644
--- a/spec/bundler/install/gemfile/groups_spec.rb
+++ b/spec/bundler/install/gemfile/groups_spec.rb
@@ -394,7 +394,7 @@ RSpec.describe "bundle install with groups" do
end
it "does not hit the remote a second time" do
- FileUtils.rm_rf gem_repo2
+ FileUtils.rm_r gem_repo2
bundle "config set --local without myrack"
bundle :install, verbose: true
expect(last_command.stdboth).not_to match(/fetching/i)
diff --git a/spec/bundler/install/gems/compact_index_spec.rb b/spec/bundler/install/gems/compact_index_spec.rb
index cf661ee284..4274172772 100644
--- a/spec/bundler/install/gems/compact_index_spec.rb
+++ b/spec/bundler/install/gems/compact_index_spec.rb
@@ -323,7 +323,7 @@ RSpec.describe "compact index api" do
build_gem "back_deps" do |s|
s.add_dependency "foo"
end
- FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
+ FileUtils.rm_r Dir[gem_repo2("gems/foo-*.gem")]
end
gemfile <<-G
@@ -341,7 +341,7 @@ RSpec.describe "compact index api" do
build_gem "back_deps" do |s|
s.add_dependency "foo"
end
- FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
+ FileUtils.rm_r Dir[gem_repo2("gems/foo-*.gem")]
end
install_gemfile <<-G, artifice: "compact_index_extra", verbose: true
@@ -406,7 +406,7 @@ RSpec.describe "compact index api" do
build_gem "back_deps" do |s|
s.add_dependency "foo"
end
- FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
+ FileUtils.rm_r Dir[gem_repo2("gems/foo-*.gem")]
end
gemfile <<-G
@@ -429,7 +429,7 @@ RSpec.describe "compact index api" do
end
build_gem "missing"
- FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
+ FileUtils.rm_r Dir[gem_repo2("gems/foo-*.gem")]
end
install_gemfile <<-G, artifice: "compact_index_extra_missing"
@@ -449,7 +449,7 @@ RSpec.describe "compact index api" do
end
build_gem "missing"
- FileUtils.rm_rf Dir[gem_repo4("gems/foo-*.gem")]
+ FileUtils.rm_r Dir[gem_repo4("gems/foo-*.gem")]
end
install_gemfile <<-G, artifice: "compact_index_extra_api_missing"
@@ -478,7 +478,7 @@ RSpec.describe "compact index api" do
build_gem "back_deps" do |s|
s.add_dependency "foo"
end
- FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
+ FileUtils.rm_r Dir[gem_repo2("gems/foo-*.gem")]
end
gemfile <<-G
@@ -498,7 +498,7 @@ RSpec.describe "compact index api" do
build_gem "back_deps" do |s|
s.add_dependency "foo"
end
- FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
+ FileUtils.rm_r Dir[gem_repo2("gems/foo-*.gem")]
end
gemfile <<-G
diff --git a/spec/bundler/install/gems/dependency_api_spec.rb b/spec/bundler/install/gems/dependency_api_spec.rb
index 01331d1c4b..4e06e3e711 100644
--- a/spec/bundler/install/gems/dependency_api_spec.rb
+++ b/spec/bundler/install/gems/dependency_api_spec.rb
@@ -260,7 +260,7 @@ RSpec.describe "gemcutter's dependency API" do
build_gem "back_deps" do |s|
s.add_dependency "foo"
end
- FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
+ FileUtils.rm_r Dir[gem_repo2("gems/foo-*.gem")]
end
gemfile <<-G
@@ -278,7 +278,7 @@ RSpec.describe "gemcutter's dependency API" do
build_gem "back_deps" do |s|
s.add_dependency "foo"
end
- FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
+ FileUtils.rm_r Dir[gem_repo2("gems/foo-*.gem")]
end
gemfile <<-G
@@ -343,7 +343,7 @@ RSpec.describe "gemcutter's dependency API" do
build_gem "back_deps" do |s|
s.add_dependency "foo"
end
- FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
+ FileUtils.rm_r Dir[gem_repo2("gems/foo-*.gem")]
end
gemfile <<-G
@@ -366,7 +366,7 @@ RSpec.describe "gemcutter's dependency API" do
end
build_gem "missing"
- FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
+ FileUtils.rm_r Dir[gem_repo2("gems/foo-*.gem")]
end
install_gemfile <<-G, artifice: "endpoint_extra_missing"
@@ -385,7 +385,7 @@ RSpec.describe "gemcutter's dependency API" do
end
build_gem "missing"
- FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
+ FileUtils.rm_r Dir[gem_repo2("gems/foo-*.gem")]
end
install_gemfile <<-G, artifice: "endpoint_extra_missing"
@@ -403,7 +403,7 @@ RSpec.describe "gemcutter's dependency API" do
build_gem "back_deps" do |s|
s.add_dependency "foo"
end
- FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
+ FileUtils.rm_r Dir[gem_repo2("gems/foo-*.gem")]
end
gemfile <<-G
@@ -423,7 +423,7 @@ RSpec.describe "gemcutter's dependency API" do
build_gem "back_deps" do |s|
s.add_dependency "foo"
end
- FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
+ FileUtils.rm_r Dir[gem_repo2("gems/foo-*.gem")]
end
gemfile <<-G
diff --git a/spec/bundler/install/git_spec.rb b/spec/bundler/install/git_spec.rb
index 37cefc8254..670bd1fb72 100644
--- a/spec/bundler/install/git_spec.rb
+++ b/spec/bundler/install/git_spec.rb
@@ -242,7 +242,7 @@ RSpec.describe "bundle install" do
expect([install_directory, dot_git_directory, lib_directory, gemspec]).to all exist
# remove all elements in the install directory except .git directory
- FileUtils.rm_rf(lib_directory)
+ FileUtils.rm_r(lib_directory)
gemspec.delete
expect(dot_git_directory).to exist
diff --git a/spec/bundler/install/global_cache_spec.rb b/spec/bundler/install/global_cache_spec.rb
index 471c403eea..a4431bff8b 100644
--- a/spec/bundler/install/global_cache_spec.rb
+++ b/spec/bundler/install/global_cache_spec.rb
@@ -238,7 +238,7 @@ RSpec.describe "global gem caching" do
R
expect(out).to eq "VERY_SIMPLE_BINARY_IN_C\nVERY_SIMPLE_GIT_BINARY_IN_C"
- FileUtils.rm_rf Dir[home(".bundle", "cache", "extensions", "**", "*binary_c*")]
+ FileUtils.rm_r Dir[home(".bundle", "cache", "extensions", "**", "*binary_c*")]
gem_binary_cache.join("very_simple_binary_c.rb").open("w") {|f| f << "puts File.basename(__FILE__)" }
git_binary_cache.join("very_simple_git_binary_c.rb").open("w") {|f| f << "puts File.basename(__FILE__)" }
diff --git a/spec/bundler/install/path_spec.rb b/spec/bundler/install/path_spec.rb
index 8d32e033d6..1412e8dd24 100644
--- a/spec/bundler/install/path_spec.rb
+++ b/spec/bundler/install/path_spec.rb
@@ -52,7 +52,7 @@ RSpec.describe "bundle install" do
it "remembers to disable system gems after the first time with bundle --path vendor/bundle", bundler: "< 3" do
bundle "install --path vendor/bundle"
- FileUtils.rm_rf bundled_app("vendor")
+ FileUtils.rm_r bundled_app("vendor")
bundle "install"
expect(vendored_gems("gems/myrack-1.0.0")).to be_directory
diff --git a/spec/bundler/install/prereleases_spec.rb b/spec/bundler/install/prereleases_spec.rb
index 57764ce722..9f764d127c 100644
--- a/spec/bundler/install/prereleases_spec.rb
+++ b/spec/bundler/install/prereleases_spec.rb
@@ -41,7 +41,7 @@ RSpec.describe "bundle install" do
build_repo3 do
build_gem "myrack"
end
- FileUtils.rm_rf Dir[gem_repo3("prerelease*")]
+ FileUtils.rm_r Dir[gem_repo3("prerelease*")]
install_gemfile <<-G
source "https://gem.repo3"
diff --git a/spec/bundler/lock/git_spec.rb b/spec/bundler/lock/git_spec.rb
index 0e08b7ee30..49c0a2af1c 100644
--- a/spec/bundler/lock/git_spec.rb
+++ b/spec/bundler/lock/git_spec.rb
@@ -19,7 +19,7 @@ RSpec.describe "bundle lock with git gems" do
it "doesn't print errors even if running lock after removing the cache" do
install_gemfile_with_foo_as_a_git_dependency
- FileUtils.rm_rf(Dir[default_cache_path("git/foo-1.0-*")].first)
+ FileUtils.rm_r(Dir[default_cache_path("git/foo-1.0-*")].first)
bundle "lock --verbose"
diff --git a/spec/bundler/plugins/source/example_spec.rb b/spec/bundler/plugins/source/example_spec.rb
index 32940bf849..115a44cc69 100644
--- a/spec/bundler/plugins/source/example_spec.rb
+++ b/spec/bundler/plugins/source/example_spec.rb
@@ -131,7 +131,7 @@ RSpec.describe "real source plugins" do
expect(bundled_app("vendor/cache/a-path-gem-1.0-#{uri_hash}/.git")).not_to exist
expect(bundled_app("vendor/cache/a-path-gem-1.0-#{uri_hash}/.bundlecache")).to be_file
- FileUtils.rm_rf lib_path("a-path-gem-1.0")
+ FileUtils.rm_r lib_path("a-path-gem-1.0")
expect(the_bundle).to include_gems("a-path-gem 1.0")
end
@@ -143,7 +143,7 @@ RSpec.describe "real source plugins" do
expect(bundled_app("vendor/cache/a-path-gem-1.0-#{uri_hash}")).to exist
- FileUtils.rm_rf lib_path("a-path-gem-1.0")
+ FileUtils.rm_r lib_path("a-path-gem-1.0")
expect(the_bundle).to include_gems("a-path-gem 1.0")
end
@@ -155,7 +155,7 @@ RSpec.describe "real source plugins" do
expect(bundled_app("vendor/cache/a-path-gem-1.0-#{uri_hash}")).to exist
- FileUtils.rm_rf lib_path("a-path-gem-1.0")
+ FileUtils.rm_r lib_path("a-path-gem-1.0")
expect(the_bundle).to include_gems("a-path-gem 1.0")
end
end
@@ -452,7 +452,7 @@ RSpec.describe "real source plugins" do
expect(bundled_app("vendor/cache/foo-1.0-#{ref}/.git")).not_to exist
expect(bundled_app("vendor/cache/foo-1.0-#{ref}/.bundlecache")).to be_file
- FileUtils.rm_rf lib_path("foo-1.0")
+ FileUtils.rm_r lib_path("foo-1.0")
expect(the_bundle).to include_gems "foo 1.0"
end
end
diff --git a/spec/bundler/runtime/setup_spec.rb b/spec/bundler/runtime/setup_spec.rb
index 372a4e7299..09dad71dbf 100644
--- a/spec/bundler/runtime/setup_spec.rb
+++ b/spec/bundler/runtime/setup_spec.rb
@@ -459,7 +459,7 @@ RSpec.describe "Bundler.setup" do
it "works even when the cache directory has been deleted" do
bundle :install
- FileUtils.rm_rf default_cache_path
+ FileUtils.rm_r default_cache_path
expect(the_bundle).to include_gems "myrack 1.0.0"
end
@@ -496,7 +496,7 @@ RSpec.describe "Bundler.setup" do
bundle %(config set local.myrack #{lib_path("local-myrack")})
bundle :install
- FileUtils.rm_rf(lib_path("local-myrack"))
+ FileUtils.rm_r(lib_path("local-myrack"))
run "require 'myrack'", raise_on_error: false
expect(err).to match(/Cannot use local override for myrack-0.8 because #{Regexp.escape(lib_path("local-myrack").to_s)} does not exist/)
end
@@ -611,7 +611,7 @@ RSpec.describe "Bundler.setup" do
gem 'foo', :path => 'vendor/foo', :group => :development
G
- FileUtils.rm_rf(path)
+ FileUtils.rm_r(path)
ruby "require 'bundler'; Bundler.setup", env: { "DEBUG" => "1" }
expect(out).to include("Assuming that source at `vendor/foo` has not changed since fetching its specs errored")
diff --git a/spec/bundler/spec_helper.rb b/spec/bundler/spec_helper.rb
index bf7604659c..470bf3e414 100644
--- a/spec/bundler/spec_helper.rb
+++ b/spec/bundler/spec_helper.rb
@@ -121,6 +121,6 @@ RSpec.configure do |config|
end
config.after :suite do
- FileUtils.rm_rf Spec::Path.pristine_system_gem_path
+ FileUtils.rm_r Spec::Path.pristine_system_gem_path
end
end
diff --git a/spec/bundler/support/helpers.rb b/spec/bundler/support/helpers.rb
index f9d89b168e..951c370064 100644
--- a/spec/bundler/support/helpers.rb
+++ b/spec/bundler/support/helpers.rb
@@ -20,7 +20,7 @@ module Spec
def reset!
Dir.glob("#{tmp}/{gems/*,*}", File::FNM_DOTMATCH).each do |dir|
next if %w[base base_system remote1 rubocop standard gems rubygems . ..].include?(File.basename(dir))
- FileUtils.rm_rf(dir)
+ FileUtils.rm_r(dir)
end
FileUtils.mkdir_p(home)
FileUtils.mkdir_p(tmpdir)
@@ -396,7 +396,7 @@ module Spec
end
def pristine_system_gems(*gems)
- FileUtils.rm_rf(system_gem_path)
+ FileUtils.rm_r(system_gem_path)
system_gems(*gems)
end
@@ -424,7 +424,7 @@ module Spec
end
def simulate_new_machine
- FileUtils.rm_rf bundled_app(".bundle")
+ FileUtils.rm_r bundled_app(".bundle")
pristine_system_gems :bundler
end
diff --git a/spec/bundler/update/git_spec.rb b/spec/bundler/update/git_spec.rb
index 64124e0920..2cb0abe02f 100644
--- a/spec/bundler/update/git_spec.rb
+++ b/spec/bundler/update/git_spec.rb
@@ -87,7 +87,7 @@ RSpec.describe "bundle update" do
gem "foo", "1.0", :git => "#{lib_path("foo_one")}"
G
- FileUtils.rm_rf lib_path("foo_one")
+ FileUtils.rm_r lib_path("foo_one")
install_gemfile <<-G
source "https://gem.repo1"
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-03 23:29:44 +0000