Add latest changes from gitlab-org/gitlab@master

1 files changed, 220 insertions, 182 deletions

diff --git a/spec/frontend/vue_mr_widget/components/states/mr_widget_conflicts_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_conflicts_spec.js
index b8cd1469179..ad21e6e6f4f 100644
--- a/spec/frontend/vue_mr_widget/components/states/mr_widget_conflicts_spec.js
+++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_conflicts_spec.js
@@ -6,6 +6,7 @@ import ConflictsComponent from '~/vue_merge_request_widget/components/states/mr_
 
 describe('MRWidgetConflicts', () => {
   let vm;
+  let mergeRequestWidgetGraphql = null;
   const path = '/conflicts';
 
   function createComponent(propsData = {}) {
@@ -13,7 +14,35 @@ describe('MRWidgetConflicts', () => {
 
     vm = shallowMount(localVue.extend(ConflictsComponent), {
       propsData,
+      provide: {
+        glFeatures: {
+          mergeRequestWidgetGraphql,
+        },
+      },
+      mocks: {
+        $apollo: {
+          queries: {
+            userPermissions: { loading: false },
+            stateData: { loading: false },
+          },
+        },
+      },
     });
+
+    if (mergeRequestWidgetGraphql) {
+      vm.setData({
+        userPermissions: {
+          canMerge: propsData.mr.canMerge,
+          pushToSourceBranch: propsData.mr.canPushToSourceBranch,
+        },
+        stateData: {
+          shouldBeRebased: propsData.mr.shouldBeRebased,
+          sourceBranchProtected: propsData.mr.sourceBranchProtected,
+        },
+      });
+    }
+
+    return vm.vm.$nextTick();
   }
 
   beforeEach(() => {
@@ -21,206 +50,215 @@ describe('MRWidgetConflicts', () => {
   });
 
   afterEach(() => {
+    mergeRequestWidgetGraphql = null;
     vm.destroy();
   });
 
-  // There are two permissions we need to consider:
-  //
-  // 1. Is the user allowed to merge to the target branch?
-  // 2. Is the user allowed to push to the source branch?
-  //
-  // This yields 4 possible permutations that we need to test, and
-  // we test them below. A user who can push to the source
-  // branch should be allowed to resolve conflicts. This is
-  // consistent with what the backend does.
-  describe('when allowed to merge but not allowed to push to source branch', () => {
-    beforeEach(() => {
-      createComponent({
-        mr: {
-          canMerge: true,
-          canPushToSourceBranch: false,
-          conflictResolutionPath: path,
-          conflictsDocsPath: '',
-        },
+  [false, true].forEach(featureEnabled => {
+    describe(`with GraphQL feature flag ${featureEnabled ? 'enabled' : 'disabled'}`, () => {
+      beforeEach(() => {
+        mergeRequestWidgetGraphql = featureEnabled;
       });
-    });
-
-    it('should tell you about conflicts without bothering other people', () => {
-      expect(vm.text()).toContain('There are merge conflicts');
-      expect(vm.text()).not.toContain('ask someone with write access');
-    });
-
-    it('should not allow you to resolve the conflicts', () => {
-      expect(vm.text()).not.toContain('Resolve conflicts');
-    });
-
-    it('should have merge buttons', () => {
-      const mergeLocallyButton = vm.find('.js-merge-locally-button');
-
-      expect(mergeLocallyButton.text()).toContain('Merge locally');
-    });
-  });
 
-  describe('when not allowed to merge but allowed to push to source branch', () => {
-    beforeEach(() => {
-      createComponent({
-        mr: {
-          canMerge: false,
-          canPushToSourceBranch: true,
-          conflictResolutionPath: path,
-          conflictsDocsPath: '',
-        },
-      });
-    });
-
-    it('should tell you about conflicts', () => {
-      expect(vm.text()).toContain('There are merge conflicts');
-      expect(vm.text()).toContain('ask someone with write access');
-    });
-
-    it('should allow you to resolve the conflicts', () => {
-      const resolveButton = vm.find('.js-resolve-conflicts-button');
-
-      expect(resolveButton.text()).toContain('Resolve conflicts');
-      expect(resolveButton.attributes('href')).toEqual(path);
-    });
-
-    it('should not have merge buttons', () => {
-      expect(vm.text()).not.toContain('Merge locally');
-    });
-  });
-
-  describe('when allowed to merge and push to source branch', () => {
-    beforeEach(() => {
-      createComponent({
-        mr: {
-          canMerge: true,
-          canPushToSourceBranch: true,
-          conflictResolutionPath: path,
-          conflictsDocsPath: '',
-        },
+      // There are two permissions we need to consider:
+      //
+      // 1. Is the user allowed to merge to the target branch?
+      // 2. Is the user allowed to push to the source branch?
+      //
+      // This yields 4 possible permutations that we need to test, and
+      // we test them below. A user who can push to the source
+      // branch should be allowed to resolve conflicts. This is
+      // consistent with what the backend does.
+      describe('when allowed to merge but not allowed to push to source branch', () => {
+        beforeEach(async () => {
+          await createComponent({
+            mr: {
+              canMerge: true,
+              canPushToSourceBranch: false,
+              conflictResolutionPath: path,
+              conflictsDocsPath: '',
+            },
+          });
+        });
+
+        it('should tell you about conflicts without bothering other people', () => {
+          expect(vm.text()).toContain('There are merge conflicts');
+          expect(vm.text()).not.toContain('ask someone with write access');
+        });
+
+        it('should not allow you to resolve the conflicts', () => {
+          expect(vm.text()).not.toContain('Resolve conflicts');
+        });
+
+        it('should have merge buttons', () => {
+          const mergeLocallyButton = vm.find('.js-merge-locally-button');
+
+          expect(mergeLocallyButton.text()).toContain('Merge locally');
+        });
       });
-    });
-
-    it('should tell you about conflicts without bothering other people', () => {
-      expect(vm.text()).toContain('There are merge conflicts');
-      expect(vm.text()).not.toContain('ask someone with write access');
-    });
 
-    it('should allow you to resolve the conflicts', () => {
-      const resolveButton = vm.find('.js-resolve-conflicts-button');
-
-      expect(resolveButton.text()).toContain('Resolve conflicts');
-      expect(resolveButton.attributes('href')).toEqual(path);
-    });
-
-    it('should have merge buttons', () => {
-      const mergeLocallyButton = vm.find('.js-merge-locally-button');
-
-      expect(mergeLocallyButton.text()).toContain('Merge locally');
-    });
-  });
-
-  describe('when user does not have permission to push to source branch', () => {
-    it('should show proper message', () => {
-      createComponent({
-        mr: {
-          canMerge: false,
-          canPushToSourceBranch: false,
-          conflictsDocsPath: '',
-        },
+      describe('when not allowed to merge but allowed to push to source branch', () => {
+        beforeEach(async () => {
+          await createComponent({
+            mr: {
+              canMerge: false,
+              canPushToSourceBranch: true,
+              conflictResolutionPath: path,
+              conflictsDocsPath: '',
+            },
+          });
+        });
+
+        it('should tell you about conflicts', () => {
+          expect(vm.text()).toContain('There are merge conflicts');
+          expect(vm.text()).toContain('ask someone with write access');
+        });
+
+        it('should allow you to resolve the conflicts', () => {
+          const resolveButton = vm.find('.js-resolve-conflicts-button');
+
+          expect(resolveButton.text()).toContain('Resolve conflicts');
+          expect(resolveButton.attributes('href')).toEqual(path);
+        });
+
+        it('should not have merge buttons', () => {
+          expect(vm.text()).not.toContain('Merge locally');
+        });
       });
 
-      expect(
-        vm
-          .text()
-          .trim()
-          .replace(/\s\s+/g, ' '),
-      ).toContain('ask someone with write access');
-    });
-
-    it('should not have action buttons', () => {
-      createComponent({
-        mr: {
-          canMerge: false,
-          canPushToSourceBranch: false,
-          conflictsDocsPath: '',
-        },
+      describe('when allowed to merge and push to source branch', () => {
+        beforeEach(async () => {
+          await createComponent({
+            mr: {
+              canMerge: true,
+              canPushToSourceBranch: true,
+              conflictResolutionPath: path,
+              conflictsDocsPath: '',
+            },
+          });
+        });
+
+        it('should tell you about conflicts without bothering other people', () => {
+          expect(vm.text()).toContain('There are merge conflicts');
+          expect(vm.text()).not.toContain('ask someone with write access');
+        });
+
+        it('should allow you to resolve the conflicts', () => {
+          const resolveButton = vm.find('.js-resolve-conflicts-button');
+
+          expect(resolveButton.text()).toContain('Resolve conflicts');
+          expect(resolveButton.attributes('href')).toEqual(path);
+        });
+
+        it('should have merge buttons', () => {
+          const mergeLocallyButton = vm.find('.js-merge-locally-button');
+
+          expect(mergeLocallyButton.text()).toContain('Merge locally');
+        });
       });
 
-      expect(vm.find('.js-resolve-conflicts-button').exists()).toBe(false);
-      expect(vm.find('.js-merge-locally-button').exists()).toBe(false);
-    });
-
-    it('should not have resolve button when no conflict resolution path', () => {
-      createComponent({
-        mr: {
-          canMerge: true,
-          conflictResolutionPath: null,
-          conflictsDocsPath: '',
-        },
+      describe('when user does not have permission to push to source branch', () => {
+        it('should show proper message', async () => {
+          await createComponent({
+            mr: {
+              canMerge: false,
+              canPushToSourceBranch: false,
+              conflictsDocsPath: '',
+            },
+          });
+
+          expect(
+            vm
+              .text()
+              .trim()
+              .replace(/\s\s+/g, ' '),
+          ).toContain('ask someone with write access');
+        });
+
+        it('should not have action buttons', async () => {
+          await createComponent({
+            mr: {
+              canMerge: false,
+              canPushToSourceBranch: false,
+              conflictsDocsPath: '',
+            },
+          });
+
+          expect(vm.find('.js-resolve-conflicts-button').exists()).toBe(false);
+          expect(vm.find('.js-merge-locally-button').exists()).toBe(false);
+        });
+
+        it('should not have resolve button when no conflict resolution path', async () => {
+          await createComponent({
+            mr: {
+              canMerge: true,
+              conflictResolutionPath: null,
+              conflictsDocsPath: '',
+            },
+          });
+
+          expect(vm.find('.js-resolve-conflicts-button').exists()).toBe(false);
+        });
       });
 
-      expect(vm.find('.js-resolve-conflicts-button').exists()).toBe(false);
-    });
-  });
-
-  describe('when fast-forward or semi-linear merge enabled', () => {
-    it('should tell you to rebase locally', () => {
-      createComponent({
-        mr: {
-          shouldBeRebased: true,
-          conflictsDocsPath: '',
-        },
+      describe('when fast-forward or semi-linear merge enabled', () => {
+        it('should tell you to rebase locally', async () => {
+          await createComponent({
+            mr: {
+              shouldBeRebased: true,
+              conflictsDocsPath: '',
+            },
+          });
+
+          expect(removeBreakLine(vm.text()).trim()).toContain(
+            'Fast-forward merge is not possible. To merge this request, first rebase locally.',
+          );
+        });
       });
 
-      expect(removeBreakLine(vm.text()).trim()).toContain(
-        'Fast-forward merge is not possible. To merge this request, first rebase locally.',
-      );
-    });
-  });
-
-  describe('when source branch protected', () => {
-    beforeEach(() => {
-      createComponent({
-        mr: {
-          canMerge: true,
-          canPushToSourceBranch: true,
-          conflictResolutionPath: TEST_HOST,
-          sourceBranchProtected: true,
-          conflictsDocsPath: '',
-        },
+      describe('when source branch protected', () => {
+        beforeEach(async () => {
+          await createComponent({
+            mr: {
+              canMerge: true,
+              canPushToSourceBranch: true,
+              conflictResolutionPath: TEST_HOST,
+              sourceBranchProtected: true,
+              conflictsDocsPath: '',
+            },
+          });
+        });
+
+        it('sets resolve button as disabled', () => {
+          expect(vm.find('.js-resolve-conflicts-button').attributes('disabled')).toBe('true');
+        });
+
+        it('renders popover', () => {
+          expect($.fn.popover).toHaveBeenCalled();
+        });
       });
-    });
-
-    it('sets resolve button as disabled', () => {
-      expect(vm.find('.js-resolve-conflicts-button').attributes('disabled')).toBe('true');
-    });
 
-    it('renders popover', () => {
-      expect($.fn.popover).toHaveBeenCalled();
-    });
-  });
-
-  describe('when source branch not protected', () => {
-    beforeEach(() => {
-      createComponent({
-        mr: {
-          canMerge: true,
-          canPushToSourceBranch: true,
-          conflictResolutionPath: TEST_HOST,
-          sourceBranchProtected: false,
-          conflictsDocsPath: '',
-        },
+      describe('when source branch not protected', () => {
+        beforeEach(async () => {
+          await createComponent({
+            mr: {
+              canMerge: true,
+              canPushToSourceBranch: true,
+              conflictResolutionPath: TEST_HOST,
+              sourceBranchProtected: false,
+              conflictsDocsPath: '',
+            },
+          });
+        });
+
+        it('sets resolve button as disabled', () => {
+          expect(vm.find('.js-resolve-conflicts-button').attributes('disabled')).toBe(undefined);
+        });
+
+        it('renders popover', () => {
+          expect($.fn.popover).not.toHaveBeenCalled();
+        });
       });
     });
-
-    it('sets resolve button as disabled', () => {
-      expect(vm.find('.js-resolve-conflicts-button').attributes('disabled')).toBe(undefined);
-    });
-
-    it('renders popover', () => {
-      expect($.fn.popover).not.toHaveBeenCalled();
-    });
   });
 });