Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42

5 files changed, 120 insertions, 3 deletions

diff --git a/spec/frontend/vue_mr_widget/components/states/__snapshots__/new_ready_to_merge_spec.js.snap b/spec/frontend/vue_mr_widget/components/states/__snapshots__/new_ready_to_merge_spec.js.snap
new file mode 100644
index 00000000000..a6c36764c41
--- /dev/null
+++ b/spec/frontend/vue_mr_widget/components/states/__snapshots__/new_ready_to_merge_spec.js.snap
@@ -0,0 +1,37 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`New ready to merge state component renders permission text if canMerge (false) is false 1`] = `
+<div
+  class="mr-widget-body media"
+>
+  <status-icon-stub
+    status="success"
+  />
+   
+  <p
+    class="media-body gl-m-0! gl-font-weight-bold"
+  >
+    
+      Ready to merge by members who can write to the target branch.
+    
+  </p>
+</div>
+`;
+
+exports[`New ready to merge state component renders permission text if canMerge (true) is false 1`] = `
+<div
+  class="mr-widget-body media"
+>
+  <status-icon-stub
+    status="success"
+  />
+   
+  <p
+    class="media-body gl-m-0! gl-font-weight-bold"
+  >
+    
+      Ready to merge!
+    
+  </p>
+</div>
+`;
diff --git a/spec/frontend/vue_mr_widget/components/states/merge_checks_failed_spec.js b/spec/frontend/vue_mr_widget/components/states/merge_checks_failed_spec.js
new file mode 100644
index 00000000000..bdad0bada5f
--- /dev/null
+++ b/spec/frontend/vue_mr_widget/components/states/merge_checks_failed_spec.js
@@ -0,0 +1,49 @@
+import { shallowMount } from '@vue/test-utils';
+import MergeChecksFailed from '~/vue_merge_request_widget/components/states/merge_checks_failed.vue';
+
+let wrapper;
+
+function factory(propsData = {}) {
+  wrapper = shallowMount(MergeChecksFailed, {
+    propsData,
+  });
+}
+
+describe('Merge request widget merge checks failed state component', () => {
+  afterEach(() => {
+    wrapper.destroy();
+  });
+
+  it.each`
+    mrState                                   | displayText
+    ${{ isPipelineFailed: true }}             | ${'pipelineFailed'}
+    ${{ approvals: true, isApproved: false }} | ${'approvalNeeded'}
+    ${{ hasMergeableDiscussionsState: true }} | ${'unresolvedDiscussions'}
+  `('display $displayText text for $mrState', ({ mrState, displayText }) => {
+    factory({ mr: mrState });
+
+    expect(wrapper.text()).toContain(MergeChecksFailed.i18n[displayText]);
+  });
+
+  describe('unresolved discussions', () => {
+    it('renders jump to button', () => {
+      factory({ mr: { hasMergeableDiscussionsState: true } });
+
+      expect(wrapper.find('[data-testid="jumpToUnresolved"]').exists()).toBe(true);
+    });
+
+    it('renders resolve thread button', () => {
+      factory({
+        mr: {
+          hasMergeableDiscussionsState: true,
+          createIssueToResolveDiscussionsPath: 'https://gitlab.com',
+        },
+      });
+
+      expect(wrapper.find('[data-testid="resolveIssue"]').exists()).toBe(true);
+      expect(wrapper.find('[data-testid="resolveIssue"]').attributes('href')).toBe(
+        'https://gitlab.com',
+      );
+    });
+  });
+});
diff --git a/spec/frontend/vue_mr_widget/components/states/mr_widget_unresolved_discussions_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_unresolved_discussions_spec.js
index c6bfca4516f..e2d79c61b9b 100644
--- a/spec/frontend/vue_mr_widget/components/states/mr_widget_unresolved_discussions_spec.js
+++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_unresolved_discussions_spec.js
@@ -45,7 +45,7 @@ describe('UnresolvedDiscussions', () => {
       expect(wrapper.element.innerText).toContain(`Merge blocked: all threads must be resolved.`);
 
       expect(wrapper.element.innerText).toContain('Jump to first unresolved thread');
-      expect(wrapper.element.innerText).toContain('Resolve all threads in new issue');
+      expect(wrapper.element.innerText).toContain('Create issue to resolve all threads');
       expect(wrapper.element.querySelector('.js-create-issue').getAttribute('href')).toEqual(
         TEST_HOST,
       );
@@ -57,7 +57,7 @@ describe('UnresolvedDiscussions', () => {
       expect(wrapper.element.innerText).toContain(`Merge blocked: all threads must be resolved.`);
 
       expect(wrapper.element.innerText).toContain('Jump to first unresolved thread');
-      expect(wrapper.element.innerText).not.toContain('Resolve all threads in new issue');
+      expect(wrapper.element.innerText).not.toContain('Create issue to resolve all threads');
       expect(wrapper.element.querySelector('.js-create-issue')).toEqual(null);
     });
   });
diff --git a/spec/frontend/vue_mr_widget/components/states/mr_widget_wip_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_wip_spec.js
index 0609086997b..61e44140efc 100644
--- a/spec/frontend/vue_mr_widget/components/states/mr_widget_wip_spec.js
+++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_wip_spec.js
@@ -64,7 +64,7 @@ describe('Wip', () => {
           expect(vm.isMakingRequest).toBeTruthy();
           expect(eventHub.$emit).toHaveBeenCalledWith('UpdateWidgetData', mrObj);
           expect(createFlash).toHaveBeenCalledWith({
-            message: 'The merge request can now be merged.',
+            message: 'Marked as ready. Merging is now allowed.',
             type: 'notice',
           });
           done();
diff --git a/spec/frontend/vue_mr_widget/components/states/new_ready_to_merge_spec.js b/spec/frontend/vue_mr_widget/components/states/new_ready_to_merge_spec.js
new file mode 100644
index 00000000000..5ec9654a4af
--- /dev/null
+++ b/spec/frontend/vue_mr_widget/components/states/new_ready_to_merge_spec.js
@@ -0,0 +1,31 @@
+import { shallowMount } from '@vue/test-utils';
+import ReadyToMerge from '~/vue_merge_request_widget/components/states/new_ready_to_merge.vue';
+
+let wrapper;
+
+function factory({ canMerge }) {
+  wrapper = shallowMount(ReadyToMerge, {
+    propsData: {
+      mr: {},
+    },
+    data() {
+      return { canMerge };
+    },
+  });
+}
+
+describe('New ready to merge state component', () => {
+  afterEach(() => {
+    wrapper.destroy();
+  });
+
+  it.each`
+    canMerge
+    ${true}
+    ${false}
+  `('renders permission text if canMerge ($canMerge) is false', ({ canMerge }) => {
+    factory({ canMerge });
+
+    expect(wrapper.element).toMatchSnapshot();
+  });
+});