Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 13 deletions

diff --git a/spec/controllers/admin/services_controller_spec.rb b/spec/controllers/admin/services_controller_spec.rb
index 35801643181..5dde0d57293 100644
--- a/spec/controllers/admin/services_controller_spec.rb
+++ b/spec/controllers/admin/services_controller_spec.rb
@@ -10,21 +10,14 @@ describe Admin::ServicesController do
   end
 
   describe 'GET #edit' do
-    let!(:project) { create(:project) }
-
-    Service.available_services_names.each do |service_name|
-      context "#{service_name}" do
-        let!(:service) do
-          service_template = "#{service_name}_service".camelize.constantize
-          service_template.where(template: true).first_or_create
-        end
+    let!(:service) do
+      create(:jira_service, :template)
+    end
 
-        it 'successfully displays the template' do
-          get :edit, params: { id: service.id }
+    it 'successfully displays the template' do
+      get :edit, params: { id: service.id }
 
-          expect(response).to have_gitlab_http_status(:ok)
-        end
-      end
+      expect(response).to have_gitlab_http_status(:ok)
     end
   end