summaryrefslogtreecommitdiff
path: root/spec/controllers
diff options
context:
space:
mode:
authorTiago Botelho <tiagonbotelho@hotmail.com>2017-08-08 17:40:22 +0100
committerTiago Botelho <tiagonbotelho@hotmail.com>2017-08-11 11:45:09 +0100
commit21066e827ab6b957b0948b025745b563f01a00d5 (patch)
tree088a6b6427fc2455a40c0db881046cc4645cc61f /spec/controllers
parent86f5a4aaf19935b4d23a81426c1576bc16024696 (diff)
downloadgitlab-ce-21066e827ab6b957b0948b025745b563f01a00d5.tar.gz
Pending delete projects no longer return 500 error in Admins projects view35435-pending-delete-project-error-in-admin-interface-fix
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/admin/projects_controller_spec.rb12
1 files changed, 12 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