Merge branch 'winh-draft_note_spec-vue-test-utils-ee' into 'master'

Refactor draft_note_spec.js to Vue test utils

See merge request gitlab-org/gitlab-ee!9486

app/assets/javascripts/notes/components/note_actions.vue

@@ -140,6 +140,7 @@ export default {
     <span v-if="accessLevel" class="note-role user-access-role">{{ accessLevel }}</span>
     <div v-if="canResolve" class="note-actions-item">
       <button
+        ref="resolveButton"
         v-gl-tooltip
         :class="{ 'is-disabled': !resolvable, 'is-active': isResolved }"
         :title="resolveButtonTitle"

ee/app/assets/javascripts/batch_comments/components/draft_note.vue

@@ -91,6 +91,7 @@ export default {
           class="btn btn-success btn-inverted append-right-8"
         />
         <loading-button
+          ref="publishNowButton"
           :loading="isPublishingDraft(draft.id) || isPublishing"
           :label="__('Add comment now')"
           container-class="btn btn-inverted"

ee/spec/javascripts/batch_comments/components/draft_note_spec.js

-import Vue from 'vue';
+import { shallowMount, createLocalVue } from '@vue/test-utils';
 import DraftNote from 'ee/batch_comments/components/draft_note.vue';
-import { mountComponentWithStore } from 'spec/helpers/vue_mount_component_helper';
+import NoteableNote from '~/notes/components/noteable_note.vue';
 import { createStore } from '~/mr_notes/stores';
 import '~/behaviors/markdown/render_gfm';
 import { createDraft } from '../mock_data';
 
 describe('Batch comments draft note component', () => {
-  let vm;
-  let Component;
+  let wrapper;
   let draft;
 
-  beforeAll(() => {
-    Component = Vue.extend(DraftNote);
-  });
-
   beforeEach(() => {
     const store = createStore();
 
     draft = createDraft();
 
-    vm = mountComponentWithStore(Component, { store, props: { draft } });
+    const localVue = createLocalVue();
+    wrapper = shallowMount(DraftNote, {
+      store,
+      propsData: { draft },
+      sync: false,
+      localVue,
+    });
 
-    spyOn(vm.$store, 'dispatch').and.stub();
+    spyOn(wrapper.vm.$store, 'dispatch').and.stub();
   });
 
   afterEach(() => {
-    vm.$destroy();
+    wrapper.destroy();
   });
 
   it('renders template', () => {
-    expect(vm.$el.querySelector('.draft-pending-label')).not.toBe(null);
-    expect(vm.$el.querySelector('.draft-notes').textContent).toContain('Test');
-  });
+    expect(wrapper.find('.draft-pending-label').exists()).toBe(true);
 
-  describe('in discussion', () => {
-    beforeEach(done => {
-      vm.draft.discussion_id = '123';
+    const note = wrapper.find(NoteableNote);
 
-      vm.$nextTick(done);
-    });
-
-    it('renders resolution status', () => {
-      expect(vm.$el.querySelector('.line-resolve-btn')).not.toBe(null);
-    });
+    expect(note.exists()).toBe(true);
+    expect(note.props().note).toEqual(draft);
   });
 
   describe('add comment now', () => {
     it('dispatches publishSingleDraft when clicking', () => {
-      vm.$el.querySelectorAll('.btn-inverted')[1].click();
+      const publishNowButton = wrapper.find({ ref: 'publishNowButton' });
+      publishNowButton.vm.$emit('click');
 
-      expect(vm.$store.dispatch).toHaveBeenCalledWith('batchComments/publishSingleDraft', 1);
+      expect(wrapper.vm.$store.dispatch).toHaveBeenCalledWith(
+        'batchComments/publishSingleDraft',
+        1,
+      );
     });
 
     it('sets as loading when draft is publishing', done => {
-      vm.$store.state.batchComments.currentlyPublishingDrafts.push(1);
+      wrapper.vm.$store.state.batchComments.currentlyPublishingDrafts.push(1);
+
+      wrapper.vm.$nextTick(() => {
+        const publishNowButton = wrapper.find({ ref: 'publishNowButton' });
 
-      vm.$nextTick(() => {
-        expect(vm.$el.querySelectorAll('.btn-inverted')[1].getAttribute('disabled')).toBe(
-          'disabled',
-        );
+        expect(publishNowButton.props().loading).toBe(true);
 
         done();
       });
@@ -67,18 +64,25 @@ describe('Batch comments draft note component', () => {
 
   describe('update', () => {
     it('dispatches updateDraft', done => {
-      vm.$el.querySelector('.js-note-edit').click();
+      const note = wrapper.find(NoteableNote);
 
-      vm.$nextTick()
-        .then(() => {
-          vm.$el.querySelector('.js-vue-issue-save').click();
+      note.vm.$emit('handleEdit');
 
-          expect(vm.$store.dispatch).toHaveBeenCalledWith('batchComments/updateDraft', {
+      wrapper.vm
+        .$nextTick()
+        .then(() => {
+          const formData = {
             note: draft,
             noteText: 'a',
             resolveDiscussion: false,
-            callback: jasmine.any(Function),
-          });
+          };
+
+          note.vm.$emit('handleUpdateNote', formData);
+
+          expect(wrapper.vm.$store.dispatch).toHaveBeenCalledWith(
+            'batchComments/updateDraft',
+            formData,
+          );
         })
         .then(done)
         .catch(done.fail);
@@ -89,19 +93,30 @@ describe('Batch comments draft note component', () => {
     it('dispatches deleteDraft', () => {
       spyOn(window, 'confirm').and.callFake(() => true);
 
-      vm.$el.querySelector('.js-note-delete').click();
+      const note = wrapper.find(NoteableNote);
 
-      expect(vm.$store.dispatch).toHaveBeenCalledWith('batchComments/deleteDraft', draft);
+      note.vm.$emit('handleDeleteNote', draft);
+
+      expect(wrapper.vm.$store.dispatch).toHaveBeenCalledWith('batchComments/deleteDraft', draft);
     });
   });
 
   describe('quick actions', () => {
     it('renders referenced commands', done => {
-      vm.draft.references.commands = 'test command';
+      wrapper.setProps({
+        draft: {
+          ...draft,
+          references: {
+            commands: 'test command',
+          },
+        },
+      });
+
+      wrapper.vm.$nextTick(() => {
+        const referencedCommands = wrapper.find('.referenced-commands');
 
-      vm.$nextTick(() => {
-        expect(vm.$el.querySelector('.referenced-commands')).not.toBe(null);
-        expect(vm.$el.querySelector('.referenced-commands').textContent).toContain('test command');
+        expect(referencedCommands.exists()).toBe(true);
+        expect(referencedCommands.text()).toContain('test command');
 
         done();
       });

ee/spec/javascripts/notes/components/note_actions_spec.js

@@ -28,6 +28,7 @@ describe('noteActions', () => {
       canEdit: true,
       canAwardEmoji: true,
       canReportAsAbuse: true,
+      canResolve: true,
       noteId: '539',
       noteUrl: `${TEST_HOST}/group/project/merge_requests/1#note_1`,
       reportAbusePath: `${TEST_HOST}/abuse_reports/new?ref_url=http%3A%2F%2Flocalhost%3A3000%2Fgitlab-org%2Fgitlab-ce%2Fissues%2F7%23note_539&user_id=26`,
@@ -48,7 +49,12 @@ describe('noteActions', () => {
     });
 
     it('should render the right resolve button title', () => {
-      expect(wrapper.vm.resolveButtonTitle).toEqual('Discussion stays unresolved');
+      const resolveButton = wrapper.find({ ref: 'resolveButton' });
+
+      expect(resolveButton.exists()).toBe(true);
+      expect(resolveButton.attributes('data-original-title')).toEqual(
+        'Discussion stays unresolved',
+      );
     });
   });
 });