Merge branch '327452-execute-hooks-and-integrations-at-end-of-MRAfterCreate' into 'master'

Fix AfterCreateService to trigger hooks after MR state changes

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/143447



Merged-by: Fabio Pitino <fpitino@gitlab.com>
Approved-by: Sincheol (David) Kim <dkim@gitlab.com>
Approved-by: Fabio Pitino <fpitino@gitlab.com>
Reviewed-by: Sincheol (David) Kim <dkim@gitlab.com>
Co-authored-by: Luke Duncalfe <lduncalfe@eml.cc>

app/services/merge_requests/after_create_service.rb

@@ -7,13 +7,14 @@ class AfterCreateService < MergeRequests::BaseService
     def execute(merge_request)
       merge_request.ensure_merge_request_diff
 
-      logger.info(**log_payload(merge_request, 'Executing hooks'))
-      execute_hooks(merge_request)
-      logger.info(**log_payload(merge_request, 'Executed hooks'))
       prepare_for_mergeability(merge_request)
       prepare_merge_request(merge_request)
 
       mark_merge_request_as_prepared(merge_request)
+
+      logger.info(**log_payload(merge_request, 'Executing hooks'))
+      execute_hooks(merge_request)
+      logger.info(**log_payload(merge_request, 'Executed hooks'))
     end
 
     private

spec/services/merge_requests/after_create_service_spec.rb

@@ -69,8 +69,15 @@
       execute_service
     end
 
-    it 'executes hooks with default action' do
-      expect(project).to receive(:execute_hooks)
+    it 'executes hooks and integrations' do
+      expected_payload = hash_including(
+        object_kind: 'merge_request',
+        event_type: 'merge_request',
+        object_attributes: be_present
+      )
+
+      expect(project).to receive(:execute_hooks).with(expected_payload, :merge_request_hooks)
+      expect(project).to receive(:execute_integrations).with(expected_payload, :merge_request_hooks)
 
       execute_service
     end
@@ -108,6 +115,19 @@
         execute_service
       end
 
+      it 'executes hooks and integrations with correct merge_status' do
+        expected_payload = hash_including(
+          object_attributes: hash_including(
+            merge_status: 'checking'
+          )
+        )
+
+        expect(project).to receive(:execute_hooks).with(expected_payload, :merge_request_hooks)
+        expect(project).to receive(:execute_integrations).with(expected_payload, :merge_request_hooks)
+
+        execute_service
+      end
+
       context 'when preparing for mergeability fails' do
         before do
           # This is only one of the possible cases that can fail. This is to