Merge branch 'fix_jira_integration_VCS1019' into 'master'

Fix comparing equality between `ActionController::Parameters` and a `Hash`....

Closes #57221

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

1 files changed, 10 insertions, 0 deletions

diff --git a/spec/controllers/projects/services_controller_spec.rb b/spec/controllers/projects/services_controller_spec.rb
index 4a5d2bdecb7..601a292bf54 100644
--- a/spec/controllers/projects/services_controller_spec.rb
+++ b/spec/controllers/projects/services_controller_spec.rb
@@ -152,6 +152,16 @@ describe Projects::ServicesController do
         expect(service.namespace).not_to eq('updated_namespace')
       end
     end
+
+    context 'when activating JIRA service from a template' do
+      let(:template_service) { create(:jira_service, project: project, template: true) }
+
+      it 'activate JIRA service from template' do
+        put :update, params: { namespace_id: project.namespace, project_id: project, id: service.to_param, service: { active: true } }
+
+        expect(flash[:notice]).to eq 'JIRA activated.'
+      end
+    end
   end
 
   describe "GET #edit" do