From 740df4cbc826f9b3fd85c5df098173f6da97a373 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Fri, 20 Dec 2024 13:04:31 -0800 Subject: [PATCH] Fix Amazon Q not triggering with new issuable https://gitlab.com/gitlab-org/gitlab/-/merge_requests/176221 did not quite work when issuing a `/q` quick action from a new issue or merge request. The `amazon_q_params` is a type `ActionController::Parameters` since it is passed from the controller. Add a test and relax the type check. --- ee/app/services/ee/issuable_base_service.rb | 2 +- ee/spec/services/ee/issues/create_service_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ee/app/services/ee/issuable_base_service.rb b/ee/app/services/ee/issuable_base_service.rb index 97cff009c62356..6d760cc42682af 100644 --- a/ee/app/services/ee/issuable_base_service.rb +++ b/ee/app/services/ee/issuable_base_service.rb @@ -56,7 +56,7 @@ def allowed_update_params(params) override :execute_triggers def execute_triggers - execute_amazon_q_trigger if amazon_q_params.is_a?(Hash) + execute_amazon_q_trigger if amazon_q_params end def execute_amazon_q_trigger diff --git a/ee/spec/services/ee/issues/create_service_spec.rb b/ee/spec/services/ee/issues/create_service_spec.rb index 40245d35f541a2..7cf8896daa7534 100644 --- a/ee/spec/services/ee/issues/create_service_spec.rb +++ b/ee/spec/services/ee/issues/create_service_spec.rb @@ -555,7 +555,7 @@ end context 'with Amazon Q enabled' do - let(:params) { { title: 'Write hello world', description: '/q dev' } } + let(:params) { ActionController::Parameters.new(title: 'Write hello world', description: '/q dev').permit(:title, :description) } before do allow(::Ai::AmazonQ).to receive(:enabled?).and_return(true) -- GitLab