Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 2 deletions

diff --git a/spec/frontend/mr_popover/mr_popover_spec.js b/spec/frontend/mr_popover/mr_popover_spec.js
index 909824be92b..0c0d4c73d91 100644
--- a/spec/frontend/mr_popover/mr_popover_spec.js
+++ b/spec/frontend/mr_popover/mr_popover_spec.js
@@ -1,5 +1,6 @@
 import { shallowMount } from '@vue/test-utils';
 import MRPopover from '~/mr_popover/components/mr_popover';
+import CiIcon from '~/vue_shared/components/ci_icon.vue';
 
 describe('MR Popover', () => {
   let wrapper;
@@ -23,7 +24,9 @@ describe('MR Popover', () => {
   it('shows skeleton-loader while apollo is loading', () => {
     wrapper.vm.$apollo.loading = true;
 
-    expect(wrapper.element).toMatchSnapshot();
+    return wrapper.vm.$nextTick().then(() => {
+      expect(wrapper.element).toMatchSnapshot();
+    });
   });
 
   describe('loaded state', () => {
@@ -58,7 +61,7 @@ describe('MR Popover', () => {
       });
 
       return wrapper.vm.$nextTick().then(() => {
-        expect(wrapper.contains('ciicon-stub')).toBe(false);
+        expect(wrapper.contains(CiIcon)).toBe(false);
       });
     });
   });