summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Mazetto <brodock@gmail.com>2018-10-01 23:50:48 -0300
committerGabriel Mazetto <brodock@gmail.com>2018-10-05 18:11:16 -0300
commit7b8b2563c4d6b0090fd33fd50aad81561519f9cd (patch)
tree9833d906cbccaeeb07063bdbfb72378ebee29bc4
parent1a90632cc9555d06edfa3a86808ab65f47558be9 (diff)
downloadgitlab-ce-7b8b2563c4d6b0090fd33fd50aad81561519f9cd.tar.gz
Prepare admin/projects/show view to allow EE specific feature
In EE it will render a Geo Status widget when Geo is enabled and it is in a secondary node. Also added minimal specs to that action.
-rw-r--r--app/views/admin/projects/show.html.haml2
-rw-r--r--spec/controllers/admin/projects_controller_spec.rb11
2 files changed, 13 insertions, 0 deletions
diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml
index 32f6eefc16a..fefb4c7455d 100644
--- a/app/views/admin/projects/show.html.haml
+++ b/app/views/admin/projects/show.html.haml
@@ -112,6 +112,8 @@
= visibility_level_icon(@project.visibility_level)
= visibility_level_label(@project.visibility_level)
+ = render_if_exists 'admin/projects/geo_status_widget', locals: { project: @project }
+
.card
.card-header
Transfer project
diff --git a/spec/controllers/admin/projects_controller_spec.rb b/spec/controllers/admin/projects_controller_spec.rb
index cc200b9fed9..ee1aff09bdf 100644
--- a/spec/controllers/admin/projects_controller_spec.rb
+++ b/spec/controllers/admin/projects_controller_spec.rb
@@ -42,4 +42,15 @@ describe Admin::ProjectsController do
expect { get :index }.not_to exceed_query_limit(control_count)
end
end
+
+ describe 'GET /projects/:id' do
+ render_views
+
+ it 'renders show page' do
+ get :show, namespace_id: project.namespace.path, id: project.path
+
+ expect(response).to have_gitlab_http_status(200)
+ expect(response.body).to match(project.name)
+ end
+ end
end