Add latest changes from gitlab-org/gitlab@16-7-stable-eev16.7.0-rc42

1 files changed, 21 insertions, 2 deletions

diff --git a/spec/frontend/vue_merge_request_widget/components/states/mr_widget_merging_spec.js b/spec/frontend/vue_merge_request_widget/components/states/mr_widget_merging_spec.js
index 85acd5f9a9e..328c0134368 100644
--- a/spec/frontend/vue_merge_request_widget/components/states/mr_widget_merging_spec.js
+++ b/spec/frontend/vue_merge_request_widget/components/states/mr_widget_merging_spec.js
@@ -1,8 +1,12 @@
 import { shallowMount } from '@vue/test-utils';
+import { nextTick } from 'vue';
 import simplePoll from '~/lib/utils/simple_poll';
 import MrWidgetMerging from '~/vue_merge_request_widget/components/states/mr_widget_merging.vue';
 import BoldText from '~/vue_merge_request_widget/components/bold_text.vue';
+import { STATUS_MERGED } from '~/issues/constants';
+import { fetchUserCounts } from '~/super_sidebar/user_counts_fetch';
 
+jest.mock('~/super_sidebar/user_counts_fetch');
 jest.mock('~/lib/utils/simple_poll', () =>
   jest.fn().mockImplementation(jest.requireActual('~/lib/utils/simple_poll').default),
 );
@@ -13,7 +17,7 @@ describe('MRWidgetMerging', () => {
   const pollMock = jest.fn().mockResolvedValue();
 
   const GlEmoji = { template: '<img />' };
-  beforeEach(() => {
+  const createComponent = () => {
     wrapper = shallowMount(MrWidgetMerging, {
       propsData: {
         mr: {
@@ -29,14 +33,18 @@ describe('MRWidgetMerging', () => {
         GlEmoji,
       },
     });
-  });
+  };
 
   it('renders information about merge request being merged', () => {
+    createComponent();
+
     const message = wrapper.findComponent(BoldText).props('message');
     expect(message).toContain('Merging!');
   });
 
   describe('initiateMergePolling', () => {
+    beforeEach(createComponent);
+
     it('should call simplePoll', () => {
       expect(simplePoll).toHaveBeenCalledWith(expect.any(Function), { timeout: 0 });
     });
@@ -45,4 +53,15 @@ describe('MRWidgetMerging', () => {
       expect(pollMock).toHaveBeenCalled();
     });
   });
+
+  describe('on successful merge', () => {
+    it('should re-fetch user counts', async () => {
+      pollMock.mockResolvedValueOnce({ data: { state: STATUS_MERGED } });
+      createComponent();
+
+      await nextTick();
+
+      expect(fetchUserCounts).toHaveBeenCalled();
+    });
+  });
 });