Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42

1 files changed, 8 insertions, 16 deletions

diff --git a/spec/support/helpers/test_env.rb b/spec/support/helpers/test_env.rb
index 691f978550a..c58353558df 100644
--- a/spec/support/helpers/test_env.rb
+++ b/spec/support/helpers/test_env.rb
@@ -295,14 +295,6 @@ module TestEnv
     end
   end
 
-  def rm_storage_dir(storage, dir)
-    Gitlab::GitalyClient::StorageSettings.allow_disk_access do
-      target_repo_refs_path = File.join(GitalySetup.repos_path(storage), dir)
-      FileUtils.remove_dir(target_repo_refs_path)
-    end
-  rescue Errno::ENOENT
-  end
-
   def storage_dir_exists?(storage, dir)
     Gitlab::GitalyClient::StorageSettings.allow_disk_access do
       File.exist?(File.join(GitalySetup.repos_path(storage), dir))
@@ -348,6 +340,14 @@ module TestEnv
     Capybara.current_session.visit '/'
   end
 
+  def factory_repo_path
+    @factory_repo_path ||= Rails.root.join('tmp', 'tests', factory_repo_name)
+  end
+
+  def forked_repo_path
+    @forked_repo_path ||= Rails.root.join('tmp', 'tests', forked_repo_name)
+  end
+
   def factory_repo_bundle_path
     "#{factory_repo_path}.bundle"
   end
@@ -377,18 +377,10 @@ module TestEnv
     ]
   end
 
-  def factory_repo_path
-    @factory_repo_path ||= Rails.root.join('tmp', 'tests', factory_repo_name)
-  end
-
   def factory_repo_name
     'gitlab-test'
   end
 
-  def forked_repo_path
-    @forked_repo_path ||= Rails.root.join('tmp', 'tests', forked_repo_name)
-  end
-
   def forked_repo_name
     'gitlab-test-fork'
   end