Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 5 deletions

diff --git a/spec/frontend/vue_shared/components/modal_copy_button_spec.js b/spec/frontend/vue_shared/components/modal_copy_button_spec.js
index e5a8860f42e..ca9f8ff54d4 100644
--- a/spec/frontend/vue_shared/components/modal_copy_button_spec.js
+++ b/spec/frontend/vue_shared/components/modal_copy_button_spec.js
@@ -1,9 +1,7 @@
-import Vue from 'vue';
-import { shallowMount } from '@vue/test-utils';
-import modalCopyButton from '~/vue_shared/components/modal_copy_button.vue';
+import { shallowMount, createWrapper } from '@vue/test-utils';
+import ModalCopyButton from '~/vue_shared/components/modal_copy_button.vue';
 
 describe('modal copy button', () => {
-  const Component = Vue.extend(modalCopyButton);
   let wrapper;
 
   afterEach(() => {
@@ -11,16 +9,18 @@ describe('modal copy button', () => {
   });
 
   beforeEach(() => {
-    wrapper = shallowMount(Component, {
+    wrapper = shallowMount(ModalCopyButton, {
       propsData: {
         text: 'copy me',
         title: 'Copy this value',
+        id: 'test-id',
       },
     });
   });
 
   describe('clipboard', () => {
     it('should fire a `success` event on click', () => {
+      const root = createWrapper(wrapper.vm.$root);
       document.execCommand = jest.fn(() => true);
       window.getSelection = jest.fn(() => ({
         toString: jest.fn(() => 'test'),
@@ -31,6 +31,7 @@ describe('modal copy button', () => {
       return wrapper.vm.$nextTick().then(() => {
         expect(wrapper.emitted().success).not.toBeEmpty();
         expect(document.execCommand).toHaveBeenCalledWith('copy');
+        expect(root.emitted('bv::hide::tooltip')).toEqual([['test-id']]);
       });
     });
     it("should propagate the clipboard error event if execCommand doesn't work", () => {