diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-08-11 18:14:39 +0300 |
---|---|---|
committer | Simon Knox <psimyn@gmail.com> | 2017-08-15 02:23:29 +0300 |
commit | 72682bd10c472b360ac42eb24a83434157b1f0d3 (patch) | |
tree | 7c6b453de17468e111680a478d72eade7159a3d7 /spec | |
parent | 2007cca9eff592eeb9fc8af1ac8a57dc751e0295 (diff) |
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')
-rw-r--r-- | spec/controllers/admin/projects_controller_spec.rb | 12 | ||||
-rw-r--r-- | spec/finders/admin/projects_finder_spec.rb | 6 |
2 files changed, 18 insertions, 0 deletions
diff --git a/spec/controllers/admin/projects_controller_spec.rb b/spec/controllers/admin/projects_controller_spec.rb index 65587064eb1..373260b3978 100644 --- a/spec/controllers/admin/projects_controller_spec.rb +++ b/spec/controllers/admin/projects_controller_spec.rb @@ -12,12 +12,24 @@ describe Admin::ProjectsController do it 'retrieves the project for the given visibility level' do get :index, visibility_level: [Gitlab::VisibilityLevel::PUBLIC] + expect(response.body).to match(project.name) end it 'does not retrieve the project' do get :index, visibility_level: [Gitlab::VisibilityLevel::INTERNAL] + expect(response.body).not_to match(project.name) end + + it 'does not respond with projects pending deletion' do + pending_delete_project = create(:project, pending_delete: true) + + get :index + + expect(response).to have_http_status(200) + expect(response.body).not_to match(pending_delete_project.name) + expect(response.body).to match(project.name) + end end end 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) } |