Add latest changes from gitlab-org/gitlab@15-2-stable-eev15.2.0-rc42

1 files changed, 4 insertions, 7 deletions

diff --git a/spec/lib/gitlab/bare_repository_import/repository_spec.rb b/spec/lib/gitlab/bare_repository_import/repository_spec.rb
index bf115046744..d29447ee376 100644
--- a/spec/lib/gitlab/bare_repository_import/repository_spec.rb
+++ b/spec/lib/gitlab/bare_repository_import/repository_spec.rb
@@ -59,18 +59,15 @@ RSpec.describe ::Gitlab::BareRepositoryImport::Repository do
     let(:root_path) { TestEnv.repos_path }
     let(:repo_path) { File.join(root_path, "#{hashed_path}.git") }
     let(:wiki_path) { File.join(root_path, "#{hashed_path}.wiki.git") }
+    let(:raw_repository) { Gitlab::Git::Repository.new('default', "#{hashed_path}.git", nil, nil) }
 
     before do
-      TestEnv.create_bare_repository(repo_path)
-
-      Gitlab::GitalyClient::StorageSettings.allow_disk_access do
-        repository = Rugged::Repository.new(repo_path)
-        repository.config['gitlab.fullpath'] = 'to/repo'
-      end
+      raw_repository.create_repository
+      raw_repository.set_full_path(full_path: 'to/repo')
     end
 
     after do
-      FileUtils.rm_rf(repo_path)
+      raw_repository.remove
     end
 
     subject { described_class.new(root_path, repo_path) }