1 files changed, 72 insertions, 40 deletions

diff --git a/spec/services/merge_requests/approval_service_spec.rb b/spec/services/merge_requests/approval_service_spec.rb
index e1fbb945ee3..ab98fad5d73 100644
--- a/spec/services/merge_requests/approval_service_spec.rb
+++ b/spec/services/merge_requests/approval_service_spec.rb
@@ -20,79 +20,111 @@ RSpec.describe MergeRequests::ApprovalService do
         allow(merge_request.approvals).to receive(:new).and_return(double(save: false))
       end
 
-      it 'does not create an approval note' do
-        expect(SystemNoteService).not_to receive(:approve_mr)
+      it 'does not reset approvals' do
+        expect(merge_request.approvals).not_to receive(:reset)
 
         service.execute(merge_request)
       end
 
-      it 'does not mark pending todos as done' do
-        service.execute(merge_request)
-
-        expect(todo.reload).to be_pending
-      end
-
       it 'does not track merge request approve action' do
         expect(Gitlab::UsageDataCounters::MergeRequestActivityUniqueCounter)
           .not_to receive(:track_approve_mr_action).with(user: user)
 
         service.execute(merge_request)
       end
-    end
-
-    context 'with valid approval' do
-      let(:notification_service) { NotificationService.new }
 
-      before do
-        allow(service).to receive(:notification_service).and_return(notification_service)
+      it 'does not publish MergeRequests::ApprovedEvent' do
+        expect { service.execute(merge_request) }.not_to publish_event(MergeRequests::ApprovedEvent)
       end
 
-      it 'creates an approval note and marks pending todos as done' do
-        expect(SystemNoteService).to receive(:approve_mr).with(merge_request, user)
-        expect(merge_request.approvals).to receive(:reset)
+      context 'async_after_approval feature flag is disabled' do
+        before do
+          stub_feature_flags(async_after_approval: false)
+        end
 
-        service.execute(merge_request)
+        it 'does not create approve MR event' do
+          expect(EventCreateService).not_to receive(:new)
 
-        expect(todo.reload).to be_done
-      end
+          service.execute(merge_request)
+        end
 
-      it 'creates approve MR event' do
-        expect_next_instance_of(EventCreateService) do |instance|
-          expect(instance).to receive(:approve_mr)
-            .with(merge_request, user)
+        it 'does not create an approval note' do
+          expect(SystemNoteService).not_to receive(:approve_mr)
+
+          service.execute(merge_request)
         end
 
-        service.execute(merge_request)
+        it 'does not mark pending todos as done' do
+          service.execute(merge_request)
+
+          expect(todo.reload).to be_pending
+        end
       end
+    end
 
-      it 'sends a notification when approving' do
-        expect(notification_service).to receive_message_chain(:async, :approve_mr)
-          .with(merge_request, user)
+    context 'with valid approval' do
+      it 'resets approvals' do
+        expect(merge_request.approvals).to receive(:reset)
 
         service.execute(merge_request)
       end
 
-      it 'removes attention requested state' do
-        expect(MergeRequests::RemoveAttentionRequestedService).to receive(:new)
-          .with(project: project, current_user: user, merge_request: merge_request, user: user)
-          .and_call_original
+      it 'tracks merge request approve action' do
+        expect(Gitlab::UsageDataCounters::MergeRequestActivityUniqueCounter)
+          .to receive(:track_approve_mr_action).with(user: user, merge_request: merge_request)
 
         service.execute(merge_request)
       end
 
-      context 'with remaining approvals' do
-        it 'fires an approval webhook' do
-          expect(service).to receive(:execute_hooks).with(merge_request, 'approved')
+      it 'publishes MergeRequests::ApprovedEvent' do
+        expect { service.execute(merge_request) }
+          .to publish_event(MergeRequests::ApprovedEvent)
+          .with(current_user_id: user.id, merge_request_id: merge_request.id)
+      end
+
+      context 'async_after_approval feature flag is disabled' do
+        let(:notification_service) { NotificationService.new }
+
+        before do
+          stub_feature_flags(async_after_approval: false)
+          allow(service).to receive(:notification_service).and_return(notification_service)
+        end
+
+        it 'creates approve MR event' do
+          expect_next_instance_of(EventCreateService) do |instance|
+            expect(instance).to receive(:approve_mr)
+              .with(merge_request, user)
+          end
 
           service.execute(merge_request)
         end
-      end
 
-      it 'tracks merge request approve action' do
-        expect(Gitlab::UsageDataCounters::MergeRequestActivityUniqueCounter)
-          .to receive(:track_approve_mr_action).with(user: user, merge_request: merge_request)
+        it 'creates an approval note' do
+          expect(SystemNoteService).to receive(:approve_mr).with(merge_request, user)
 
-        service.execute(merge_request)
+          service.execute(merge_request)
+        end
+
+        it 'marks pending todos as done' do
+          service.execute(merge_request)
+
+          expect(todo.reload).to be_done
+        end
+
+        it 'sends a notification when approving' do
+          expect(notification_service).to receive_message_chain(:async, :approve_mr)
+            .with(merge_request, user)
+
+          service.execute(merge_request)
+        end
+
+        context 'with remaining approvals' do
+          it 'fires an approval webhook' do
+            expect(service).to receive(:execute_hooks).with(merge_request, 'approved')
+
+            service.execute(merge_request)
+          end
+        end
       end
     end