Add latest changes from gitlab-org/gitlab@master

2 files changed, 7 insertions, 17 deletions

diff --git a/spec/frontend/vue_merge_request_widget/components/approvals/approvals_spec.js b/spec/frontend/vue_merge_request_widget/components/approvals/approvals_spec.js
index 724f9ea0346..2aed037be6f 100644
--- a/spec/frontend/vue_merge_request_widget/components/approvals/approvals_spec.js
+++ b/spec/frontend/vue_merge_request_widget/components/approvals/approvals_spec.js
@@ -243,10 +243,6 @@ describe('MRWidget approvals', () => {
           it('calls service approve', () => {
             expect(service.approveMergeRequest).toHaveBeenCalled();
           });
-
-          it('emits to eventHub', () => {
-            expect(eventHub.$emit).toHaveBeenCalledWith('MRWidgetUpdateRequested');
-          });
         });
 
         describe('and error', () => {
@@ -297,10 +293,6 @@ describe('MRWidget approvals', () => {
           it('calls service unapprove', () => {
             expect(service.unapproveMergeRequest).toHaveBeenCalled();
           });
-
-          it('emits to eventHub', () => {
-            expect(eventHub.$emit).toHaveBeenCalledWith('MRWidgetUpdateRequested');
-          });
         });
 
         describe('and error', () => {
diff --git a/spec/frontend/vue_merge_request_widget/mr_widget_options_spec.js b/spec/frontend/vue_merge_request_widget/mr_widget_options_spec.js
index 4161d51526f..0533471bece 100644
--- a/spec/frontend/vue_merge_request_widget/mr_widget_options_spec.js
+++ b/spec/frontend/vue_merge_request_widget/mr_widget_options_spec.js
@@ -31,6 +31,7 @@ import WidgetContainer from '~/vue_merge_request_widget/components/widget/app.vu
 import StatusIcon from '~/vue_merge_request_widget/components/extensions/status_icon.vue';
 import getStateQuery from '~/vue_merge_request_widget/queries/get_state.query.graphql';
 import getStateSubscription from '~/vue_merge_request_widget/queries/get_state.subscription.graphql';
+import readyToMergeSubscription from '~/vue_merge_request_widget/queries/states/ready_to_merge.subscription.graphql';
 import readyToMergeQuery from 'ee_else_ce/vue_merge_request_widget/queries/states/ready_to_merge.query.graphql';
 import approvalsQuery from 'ee_else_ce/vue_merge_request_widget/components/approvals/queries/approvals.query.graphql';
 import approvedBySubscription from 'ee_else_ce/vue_merge_request_widget/components/approvals/queries/approvals.subscription.graphql';
@@ -70,6 +71,7 @@ describe('MrWidgetOptions', () => {
   let queryResponse;
   let wrapper;
   let mock;
+  let stateSubscription;
 
   const COLLABORATION_MESSAGE = 'Members who can merge are allowed to add commits';
   const findApprovalsWidget = () => wrapper.findComponent(Approvals);
@@ -110,6 +112,7 @@ describe('MrWidgetOptions', () => {
       },
     };
     stateQueryHandler = jest.fn().mockResolvedValue(queryResponse);
+    stateSubscription = createMockApolloSubscription();
 
     const mounting = fullMount ? mount : shallowMount;
     const queryHandlers = [
@@ -130,6 +133,8 @@ describe('MrWidgetOptions', () => {
     ];
     const subscriptionHandlers = [
       [approvedBySubscription, () => mockedApprovalsSubscription],
+      [getStateSubscription, () => stateSubscription],
+      [readyToMergeSubscription, () => createMockApolloSubscription()],
       ...(options.apolloSubscriptions || []),
     ];
     const apolloProvider = createMockApollo(queryHandlers);
@@ -1262,11 +1267,8 @@ describe('MrWidgetOptions', () => {
     });
 
     describe('when the MR is updated by observing its status', () => {
-      let stateSubscription;
-
       beforeEach(() => {
         window.gon.features.realtimeMrStatusChange = true;
-        stateSubscription = createMockApolloSubscription();
       });
 
       it("shows the Preparing widget when the MR reports it's not ready yet", async () => {
@@ -1276,9 +1278,7 @@ describe('MrWidgetOptions', () => {
             state: 'opened',
             detailedMergeStatus: 'PREPARING',
           },
-          {
-            apolloSubscriptions: [[getStateSubscription, () => stateSubscription]],
-          },
+          {},
           {},
           false,
         );
@@ -1293,9 +1293,7 @@ describe('MrWidgetOptions', () => {
             state: 'opened',
             detailedMergeStatus: 'PREPARING',
           },
-          {
-            apolloSubscriptions: [[getStateSubscription, () => stateSubscription]],
-          },
+          {},
           {},
           false,
         );