1 files changed, 66 insertions, 116 deletions

diff --git a/spec/frontend/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled_spec.js b/spec/frontend/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled_spec.js
index 28182793683..5b9f30dfb86 100644
--- a/spec/frontend/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled_spec.js
+++ b/spec/frontend/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled_spec.js
@@ -9,7 +9,6 @@ import eventHub from '~/vue_merge_request_widget/event_hub';
 import MRWidgetService from '~/vue_merge_request_widget/services/mr_widget_service';
 
 let wrapper;
-let mergeRequestWidgetGraphqlEnabled = false;
 
 function convertPropsToGraphqlState(props) {
   return {
@@ -30,12 +29,6 @@ function convertPropsToGraphqlState(props) {
 }
 
 function factory(propsData, stateOverride = {}) {
-  let state = {};
-
-  if (mergeRequestWidgetGraphqlEnabled) {
-    state = { ...convertPropsToGraphqlState(propsData), ...stateOverride };
-  }
-
   wrapper = extendedWrapper(
     mount(autoMergeEnabledComponent, {
       propsData: {
@@ -43,9 +36,8 @@ function factory(propsData, stateOverride = {}) {
         service: new MRWidgetService({}),
       },
       data() {
-        return { state };
+        return { ...convertPropsToGraphqlState(propsData), ...stateOverride };
       },
-      provide: { glFeatures: { mergeRequestWidgetGraphql: mergeRequestWidgetGraphqlEnabled } },
       mocks: {
         $apollo: {
           queries: {
@@ -95,130 +87,88 @@ describe('MRWidgetAutoMergeEnabled', () => {
     wrapper = null;
   });
 
-  [true, false].forEach((mergeRequestWidgetGraphql) => {
-    describe(`when graphql is ${mergeRequestWidgetGraphql ? 'enabled' : 'disabled'}`, () => {
-      beforeEach(() => {
-        mergeRequestWidgetGraphqlEnabled = mergeRequestWidgetGraphql;
+  describe('computed', () => {
+    describe('cancelButtonText', () => {
+      it('should return "Cancel" if MWPS is selected', () => {
+        factory({
+          ...defaultMrProps(),
+          autoMergeStrategy: MWPS_MERGE_STRATEGY,
+        });
+
+        expect(wrapper.findByTestId('cancelAutomaticMergeButton').text()).toBe('Cancel auto-merge');
       });
+    });
+  });
 
-      describe('computed', () => {
-        describe('cancelButtonText', () => {
-          it('should return "Cancel" if MWPS is selected', () => {
-            factory({
-              ...defaultMrProps(),
-              autoMergeStrategy: MWPS_MERGE_STRATEGY,
+  describe('methods', () => {
+    describe('cancelAutomaticMerge', () => {
+      it('should set flag and call service then tell main component to update the widget with data', async () => {
+        factory({
+          ...defaultMrProps(),
+        });
+        const mrObj = {
+          is_new_mr_data: true,
+        };
+        jest.spyOn(wrapper.vm.service, 'cancelAutomaticMerge').mockReturnValue(
+          new Promise((resolve) => {
+            resolve({
+              data: mrObj,
             });
+          }),
+        );
 
-            expect(wrapper.findByTestId('cancelAutomaticMergeButton').text()).toBe(
-              'Cancel auto-merge',
-            );
-          });
-        });
-      });
+        wrapper.vm.cancelAutomaticMerge();
 
-      describe('methods', () => {
-        describe('cancelAutomaticMerge', () => {
-          it('should set flag and call service then tell main component to update the widget with data', async () => {
-            factory({
-              ...defaultMrProps(),
-            });
-            const mrObj = {
-              is_new_mr_data: true,
-            };
-            jest.spyOn(wrapper.vm.service, 'cancelAutomaticMerge').mockReturnValue(
-              new Promise((resolve) => {
-                resolve({
-                  data: mrObj,
-                });
-              }),
-            );
-
-            wrapper.vm.cancelAutomaticMerge();
-
-            await waitForPromises();
-
-            expect(wrapper.vm.isCancellingAutoMerge).toBe(true);
-            if (mergeRequestWidgetGraphql) {
-              expect(eventHub.$emit).toHaveBeenCalledWith('MRWidgetUpdateRequested');
-            } else {
-              expect(eventHub.$emit).toHaveBeenCalledWith('UpdateWidgetData', mrObj);
-            }
-          });
-        });
+        await waitForPromises();
 
-        describe('removeSourceBranch', () => {
-          it('should set flag and call service then request main component to update the widget', async () => {
-            factory({
-              ...defaultMrProps(),
-            });
-            jest.spyOn(wrapper.vm.service, 'merge').mockReturnValue(
-              Promise.resolve({
-                data: {
-                  status: MWPS_MERGE_STRATEGY,
-                },
-              }),
-            );
-
-            wrapper.vm.removeSourceBranch();
-
-            await waitForPromises();
-
-            expect(eventHub.$emit).toHaveBeenCalledWith('MRWidgetUpdateRequested');
-            expect(wrapper.vm.service.merge).toHaveBeenCalledWith({
-              sha,
-              auto_merge_strategy: MWPS_MERGE_STRATEGY,
-              should_remove_source_branch: true,
-            });
-          });
-        });
+        expect(wrapper.vm.isCancellingAutoMerge).toBe(true);
+        expect(eventHub.$emit).toHaveBeenCalledWith('MRWidgetUpdateRequested');
       });
+    });
+  });
 
-      describe('template', () => {
-        it('should have correct elements', () => {
-          factory({
-            ...defaultMrProps(),
-          });
+  describe('template', () => {
+    it('should have correct elements', () => {
+      factory({
+        ...defaultMrProps(),
+      });
 
-          expect(wrapper.element).toMatchSnapshot();
-        });
+      expect(wrapper.element).toMatchSnapshot();
+    });
 
-        it('should disable cancel auto merge button when the action is in progress', async () => {
-          factory({
-            ...defaultMrProps(),
-          });
-          // setData usage is discouraged. See https://gitlab.com/groups/gitlab-org/-/epics/7330 for details
-          // eslint-disable-next-line no-restricted-syntax
-          wrapper.setData({
-            isCancellingAutoMerge: true,
-          });
+    it('should disable cancel auto merge button when the action is in progress', async () => {
+      factory({
+        ...defaultMrProps(),
+      });
+      // setData usage is discouraged. See https://gitlab.com/groups/gitlab-org/-/epics/7330 for details
+      // eslint-disable-next-line no-restricted-syntax
+      wrapper.setData({
+        isCancellingAutoMerge: true,
+      });
 
-          await nextTick();
+      await nextTick();
 
-          expect(wrapper.find('.js-cancel-auto-merge').props('loading')).toBe(true);
-        });
+      expect(wrapper.find('.js-cancel-auto-merge').props('loading')).toBe(true);
+    });
 
-        it('should render the status text as "...to merged automatically" if MWPS is selected', () => {
-          factory({
-            ...defaultMrProps(),
-            autoMergeStrategy: MWPS_MERGE_STRATEGY,
-          });
+    it('should render the status text as "...to merged automatically" if MWPS is selected', () => {
+      factory({
+        ...defaultMrProps(),
+        autoMergeStrategy: MWPS_MERGE_STRATEGY,
+      });
 
-          expect(getStatusText()).toContain(
-            'to be merged automatically when the pipeline succeeds',
-          );
-        });
+      expect(getStatusText()).toContain('to be merged automatically when the pipeline succeeds');
+    });
 
-        it('should render the cancel button as "Cancel" if MWPS is selected', () => {
-          factory({
-            ...defaultMrProps(),
-            autoMergeStrategy: MWPS_MERGE_STRATEGY,
-          });
+    it('should render the cancel button as "Cancel" if MWPS is selected', () => {
+      factory({
+        ...defaultMrProps(),
+        autoMergeStrategy: MWPS_MERGE_STRATEGY,
+      });
 
-          const cancelButtonText = trimText(wrapper.find('.js-cancel-auto-merge').text());
+      const cancelButtonText = trimText(wrapper.find('.js-cancel-auto-merge').text());
 
-          expect(cancelButtonText).toBe('Cancel auto-merge');
-        });
-      });
+      expect(cancelButtonText).toBe('Cancel auto-merge');
     });
   });
 });