diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-06-26 15:27:15 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-06-26 15:27:15 +0000 |
commit | e45843302a43e338204a66c00fd197b748a8231a (patch) | |
tree | 45c92325bae0bb6db72ec5ea6b8206216552b659 | |
parent | 4d6ed39b49775267759ae4e0ce454418d211859b (diff) | |
parent | b6118afd889fd5f04f7cd16afa413d132236ca44 (diff) | |
download | gitlab-ce-e45843302a43e338204a66c00fd197b748a8231a.tar.gz |
Merge branch 'backport-destroy-service-spec-fixes' into 'master'
Backport from EE: Fixed DestroyService spec to actually test if removal was successful
See merge request !12437
-rw-r--r-- | spec/services/projects/destroy_service_spec.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/spec/services/projects/destroy_service_spec.rb b/spec/services/projects/destroy_service_spec.rb index 0d6dd28e332..697dc18feb0 100644 --- a/spec/services/projects/destroy_service_spec.rb +++ b/spec/services/projects/destroy_service_spec.rb @@ -15,8 +15,9 @@ describe Projects::DestroyService, services: true do shared_examples 'deleting the project' do it 'deletes the project' do expect(Project.unscoped.all).not_to include(project) - expect(Dir.exist?(path)).to be_falsey - expect(Dir.exist?(remove_path)).to be_falsey + + expect(project.gitlab_shell.exists?(project.repository_storage_path, path + '.git')).to be_falsey + expect(project.gitlab_shell.exists?(project.repository_storage_path, remove_path + '.git')).to be_falsey end end |