Merge branch 'ee-7126-admin-projects-geo-status' into 'master'

EE Backport: enable Geo Status widget in admin/projects

See merge request gitlab-org/gitlab-ce!22161

1 files changed, 11 insertions, 0 deletions

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