Add latest changes from gitlab-org/gitlab@master

4 files changed, 76 insertions, 3 deletions

diff --git a/spec/frontend/vue_mr_widget/components/mr_widget_header_spec.js b/spec/frontend/vue_mr_widget/components/mr_widget_header_spec.js
index 266c906ba60..f9b6ac721d2 100644
--- a/spec/frontend/vue_mr_widget/components/mr_widget_header_spec.js
+++ b/spec/frontend/vue_mr_widget/components/mr_widget_header_spec.js
@@ -164,9 +164,7 @@ describe('MRWidgetHeader', () => {
       it('renders checkout branch button with modal trigger', () => {
         const button = vm.$el.querySelector('.js-check-out-branch');
 
-        expect(button.textContent.trim()).toEqual('Check out branch');
-        expect(button.getAttribute('data-target')).toEqual('#modal_merge_info');
-        expect(button.getAttribute('data-toggle')).toEqual('modal');
+        expect(button.textContent.trim()).toBe('Check out branch');
       });
 
       it('renders web ide button', () => {
diff --git a/spec/frontend/vue_mr_widget/mock_data.js b/spec/frontend/vue_mr_widget/mock_data.js
index 144283dc507..9ac6ef06371 100644
--- a/spec/frontend/vue_mr_widget/mock_data.js
+++ b/spec/frontend/vue_mr_widget/mock_data.js
@@ -41,6 +41,7 @@ export default {
   user_callouts_path: 'some/callout/path',
   suggest_pipeline_feature_id: 'suggest_pipeline',
   new_project_pipeline_path: '/group2/project2/pipelines/new',
+  source_project_default_url: '/gitlab-org/html5-boilerplate.git',
   metrics: {
     merged_by: {
       name: 'Administrator',
diff --git a/spec/frontend/vue_mr_widget/mr_widget_how_to_merge_modal_spec.js b/spec/frontend/vue_mr_widget/mr_widget_how_to_merge_modal_spec.js
new file mode 100644
index 00000000000..aaaee3327a8
--- /dev/null
+++ b/spec/frontend/vue_mr_widget/mr_widget_how_to_merge_modal_spec.js
@@ -0,0 +1,68 @@
+import { GlModal, GlSprintf } from '@gitlab/ui';
+import { shallowMount } from '@vue/test-utils';
+import MrWidgetHowToMergeModal from '~/vue_merge_request_widget/components/mr_widget_how_to_merge_modal.vue';
+
+describe('MRWidgetHowToMerge', () => {
+  let wrapper;
+
+  function mountComponent({ data = {}, props = {} } = {}) {
+    wrapper = shallowMount(MrWidgetHowToMergeModal, {
+      data() {
+        return { ...data };
+      },
+      propsData: {
+        ...props,
+      },
+      stubs: {},
+    });
+  }
+
+  afterEach(() => {
+    wrapper.destroy();
+    wrapper = null;
+  });
+
+  beforeEach(() => {
+    mountComponent();
+  });
+
+  const findModal = () => wrapper.find(GlModal);
+  const findInstructionsFields = () =>
+    wrapper.findAll('[ data-testid="how-to-merge-instructions"]');
+  const findTipLink = () => wrapper.find(GlSprintf);
+
+  it('renders a modal', () => {
+    expect(findModal().exists()).toBe(true);
+  });
+
+  it('renders a selection of markdown fields', () => {
+    expect(findInstructionsFields().length).toBe(3);
+  });
+
+  it('renders a tip including a link to docs when a valid link is present', () => {
+    mountComponent({ props: { reviewingDocsPath: '/gitlab-org/help' } });
+    expect(findTipLink().exists()).toBe(true);
+  });
+
+  it('should not render a tip including a link to docs when a valid link is not present', () => {
+    expect(findTipLink().exists()).toBe(false);
+  });
+
+  it('should render different instructions based on if the user can merge', () => {
+    mountComponent({ props: { canMerge: true } });
+    expect(
+      findInstructionsFields()
+        .at(2)
+        .text(),
+    ).toContain('git push origin');
+  });
+
+  it('should render different instructions based on if the merge is based off a fork', () => {
+    mountComponent({ props: { isFork: true } });
+    expect(
+      findInstructionsFields()
+        .at(0)
+        .text(),
+    ).toContain('FETCH_HEAD');
+  });
+});
diff --git a/spec/frontend/vue_mr_widget/stores/mr_widget_store_spec.js b/spec/frontend/vue_mr_widget/stores/mr_widget_store_spec.js
index f73f78d6f6e..cac6ed1fba4 100644
--- a/spec/frontend/vue_mr_widget/stores/mr_widget_store_spec.js
+++ b/spec/frontend/vue_mr_widget/stores/mr_widget_store_spec.js
@@ -141,6 +141,12 @@ describe('MergeRequestStore', () => {
       expect(store.newPipelinePath).toBe('/group2/project2/pipelines/new');
     });
 
+    it('should set sourceProjectDefaultUrl', () => {
+      store.setPaths({ ...mockData });
+
+      expect(store.sourceProjectDefaultUrl).toBe('/gitlab-org/html5-boilerplate.git');
+    });
+
     it('should set securityReportsDocsPath', () => {
       store.setPaths({ ...mockData });