Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42

1 files changed, 22 insertions, 0 deletions

diff --git a/spec/frontend/notes/components/note_form_spec.js b/spec/frontend/notes/components/note_form_spec.js
index a5b5204509e..cc434d6c952 100644
--- a/spec/frontend/notes/components/note_form_spec.js
+++ b/spec/frontend/notes/components/note_form_spec.js
@@ -272,6 +272,7 @@ describe('issue_note_form component', () => {
       wrapper = createComponentWrapper();
       wrapper.setProps({
         ...props,
+        isDraft: true,
         noteId: '',
         discussion: { ...discussionMock, for_commit: false },
       });
@@ -292,6 +293,27 @@ describe('issue_note_form component', () => {
       expect(wrapper.find('.js-resolve-checkbox').exists()).toBe(true);
     });
 
+    it('hides resolve checkbox', async () => {
+      wrapper.setProps({
+        isDraft: false,
+        discussion: {
+          ...discussionMock,
+          notes: [
+            ...discussionMock.notes.map(n => ({
+              ...n,
+              resolvable: true,
+              current_user: { ...n.current_user, can_resolve_discussion: false },
+            })),
+          ],
+          for_commit: false,
+        },
+      });
+
+      await wrapper.vm.$nextTick();
+
+      expect(wrapper.find('.js-resolve-checkbox').exists()).toBe(false);
+    });
+
     it('hides actions for commits', () => {
       wrapper.setProps({ discussion: { for_commit: true } });