diff options
| author | Daniel Juarez <daniel.juarez.gonzalez@cern.ch> | 2019-02-05 12:30:06 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-02-05 12:30:06 +0000 |
| commit | 72b59d6e3ba1e19045071ada494cc8e7c71a32c9 (patch) | |
| tree | 3a3cf832a9d69e9a8a1020917d02bb0e98839dd6 | |
| parent | 55cb4bc9cafca0c838192b54f9daa4b2bc0b86b0 (diff) | |
| download | gitlab-ce-72b59d6e3ba1e19045071ada494cc8e7c71a32c9.tar.gz | |
Fix comparing equality between `ActionController::Parameters` and a `Hash`....
| -rw-r--r-- | app/controllers/concerns/service_params.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/fix_jira_integration_VCS1019.yml | 5 | ||||
| -rw-r--r-- | spec/controllers/projects/services_controller_spec.rb | 10 |
3 files changed, 16 insertions, 1 deletions
diff --git a/app/controllers/concerns/service_params.rb b/app/controllers/concerns/service_params.rb index c6ae4fe15bf..48451bedcc2 100644 --- a/app/controllers/concerns/service_params.rb +++ b/app/controllers/concerns/service_params.rb @@ -72,7 +72,7 @@ module ServiceParams dynamic_params = @service.event_channel_names + @service.event_names # rubocop:disable Gitlab/ModuleWithInstanceVariables service_params = params.permit(:id, service: allowed_service_params + dynamic_params) - if service_params[:service].is_a?(Hash) + if service_params[:service].is_a?(ActionController::Parameters) FILTER_BLANK_PARAMS.each do |param| service_params[:service].delete(param) if service_params[:service][param].blank? end diff --git a/changelogs/unreleased/fix_jira_integration_VCS1019.yml b/changelogs/unreleased/fix_jira_integration_VCS1019.yml new file mode 100644 index 00000000000..3582ec1fe0f --- /dev/null +++ b/changelogs/unreleased/fix_jira_integration_VCS1019.yml @@ -0,0 +1,5 @@ +--- +title: Fix Jira Service password validation on project integration services. +merge_request: 24896 +author: Daniel Juarez +type: fixed 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 |