Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 4 deletions

diff --git a/spec/services/quick_actions/interpret_service_spec.rb b/spec/services/quick_actions/interpret_service_spec.rb
index afeb95a3ca3..8000c7efb2b 100644
--- a/spec/services/quick_actions/interpret_service_spec.rb
+++ b/spec/services/quick_actions/interpret_service_spec.rb
@@ -799,10 +799,9 @@ RSpec.describe QuickActions::InterpretService do
         let(:project) { repository_project }
         let(:service) { described_class.new(project, developer, {}) }
 
-        it 'precheck passes and returns merge command' do
-          _, updates, _ = service.execute('/merge', merge_request)
-
-          expect(updates).to eq(merge: nil)
+        it_behaves_like 'failed command', 'Merge request diff sha parameter is required for the merge quick action.' do
+          let(:content) { "/merge" }
+          let(:issuable) { merge_request }
         end
       end