diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-08-11 15:14:39 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-08-11 15:14:39 +0000 |
commit | f662721eedbbbd145301f1c3c1724b5ac1adc69e (patch) | |
tree | cf0c157ab32ddedeabb549f12c98ab94682fbbc3 /spec/finders | |
parent | 2a4304aea7effb18ba36fc653b1989cf3599768d (diff) | |
parent | 21066e827ab6b957b0948b025745b563f01a00d5 (diff) | |
download | gitlab-ce-f662721eedbbbd145301f1c3c1724b5ac1adc69e.tar.gz |
Merge branch '35435-pending-delete-project-error-in-admin-interface-fix' into 'master'
Pending delete projects no longer return 500 error in Admins projects view
Closes #35435
See merge request !13389
Diffstat (limited to 'spec/finders')
-rw-r--r-- | spec/finders/admin/projects_finder_spec.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/spec/finders/admin/projects_finder_spec.rb b/spec/finders/admin/projects_finder_spec.rb index 4e367d39cf3..28e36330029 100644 --- a/spec/finders/admin/projects_finder_spec.rb +++ b/spec/finders/admin/projects_finder_spec.rb @@ -38,6 +38,12 @@ describe Admin::ProjectsFinder do it { is_expected.to match_array([shared_project, public_project, internal_project, private_project]) } end + context 'with pending delete project' do + let!(:pending_delete_project) { create(:project, pending_delete: true) } + + it { is_expected.not_to include(pending_delete_project) } + end + context 'filter by namespace_id' do let(:namespace) { create(:namespace) } let!(:project_in_namespace) { create(:project, namespace: namespace) } |