diff options
author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-05-01 15:24:39 +0300 |
---|---|---|
committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-05-01 15:24:39 +0300 |
commit | b337a086d5118e80518945abfc2e88008d9fc1ec (patch) | |
tree | fc6dafd174170773190eb9ed6f7b098a68611695 /spec/factories | |
parent | 3c5cac7655985583ddd2ed64a84bbae2f3d5d703 (diff) | |
parent | 3fcb9c115d776feba3f71fb58359a3935edfda9b (diff) |
Merge branch 'master' into backstage/gb/migrate-pipeline-stages-index
* master: (106 commits)
Diffstat (limited to 'spec/factories')
-rw-r--r-- | spec/factories/projects.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/spec/factories/projects.rb b/spec/factories/projects.rb index 803498d3b19..1904615778c 100644 --- a/spec/factories/projects.rb +++ b/spec/factories/projects.rb @@ -147,7 +147,8 @@ FactoryBot.define do # We delete hooks so that gitlab-shell will not try to authenticate with # an API that isn't running - FileUtils.rm_r(File.join(project.repository_storage_path, "#{project.disk_path}.git", 'hooks')) + project.gitlab_shell.rm_directory(project.repository_storage, + File.join("#{project.disk_path}.git", 'hooks')) end end @@ -172,7 +173,8 @@ FactoryBot.define do after(:create) do |project| raise "Failed to create repository!" unless project.create_repository - FileUtils.rm_r(File.join(project.repository_storage_path, "#{project.disk_path}.git", 'refs')) + project.gitlab_shell.rm_directory(project.repository_storage, + File.join("#{project.disk_path}.git", 'refs')) end end |