Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 3 deletions

diff --git a/spec/controllers/projects/services_controller_spec.rb b/spec/controllers/projects/services_controller_spec.rb
index 0c074714bf3..b76d350ebbc 100644
--- a/spec/controllers/projects/services_controller_spec.rb
+++ b/spec/controllers/projects/services_controller_spec.rb
@@ -154,12 +154,12 @@ describe Projects::ServicesController do
         end
       end
 
-      context 'when activating Jira service from a template' do
+      context 'when activating Jira service from instance level service' do
         let(:service) do
-          create(:jira_service, project: project, template: true)
+          create(:jira_service, project: project, instance: true)
         end
 
-        it 'activate Jira service from template' do
+        it 'activate Jira service from instance level service' do
           expect(flash[:notice]).to eq 'Jira activated.'
         end
       end