Add latest changes from gitlab-org/gitlab@master

2 files changed, 18 insertions, 11 deletions

diff --git a/spec/frontend/pipelines/graph/action_component_spec.js b/spec/frontend/pipelines/graph/action_component_spec.js
index 38ffe98c79b..a8fddd5fff2 100644
--- a/spec/frontend/pipelines/graph/action_component_spec.js
+++ b/spec/frontend/pipelines/graph/action_component_spec.js
@@ -20,6 +20,7 @@ describe('pipeline graph action component', () => {
         actionIcon: 'cancel',
       },
       sync: false,
+      attachToDocument: true,
     });
   });
 
diff --git a/spec/frontend/pipelines/pipeline_triggerer_spec.js b/spec/frontend/pipelines/pipeline_triggerer_spec.js
index 45ac278dd38..e211852f74b 100644
--- a/spec/frontend/pipelines/pipeline_triggerer_spec.js
+++ b/spec/frontend/pipelines/pipeline_triggerer_spec.js
@@ -1,9 +1,16 @@
-import { mount } from '@vue/test-utils';
+import { shallowMount } from '@vue/test-utils';
+import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue';
 import pipelineTriggerer from '~/pipelines/components/pipeline_triggerer.vue';
 
 describe('Pipelines Triggerer', () => {
   let wrapper;
 
+  const expectComponentWithProps = (Component, props = {}) => {
+    const componentWrapper = wrapper.find(Component);
+    expect(componentWrapper.isVisible()).toBe(true);
+    expect(componentWrapper.props()).toEqual(expect.objectContaining(props));
+  };
+
   const mockData = {
     pipeline: {
       user: {
@@ -15,9 +22,10 @@ describe('Pipelines Triggerer', () => {
   };
 
   const createComponent = () => {
-    wrapper = mount(pipelineTriggerer, {
+    wrapper = shallowMount(pipelineTriggerer, {
       propsData: mockData,
       sync: false,
+      attachToDocument: true,
     });
   };
 
@@ -33,14 +41,12 @@ describe('Pipelines Triggerer', () => {
     expect(wrapper.contains('.table-section')).toBe(true);
   });
 
-  it('should render triggerer information when triggerer is provided', () => {
-    const link = wrapper.find('.js-pipeline-url-user');
-
-    expect(link.attributes('href')).toEqual(mockData.pipeline.user.path);
-    expect(link.find('.js-user-avatar-image-toolip').text()).toEqual(mockData.pipeline.user.name);
-    expect(link.find('img.avatar').attributes('src')).toEqual(
-      `${mockData.pipeline.user.avatar_url}?width=26`,
-    );
+  it('should pass triggerer information when triggerer is provided', () => {
+    expectComponentWithProps(UserAvatarLink, {
+      linkHref: mockData.pipeline.user.path,
+      tooltipText: mockData.pipeline.user.name,
+      imgSrc: mockData.pipeline.user.avatar_url,
+    });
   });
 
   it('should render "API" when no triggerer is provided', () => {
@@ -50,7 +56,7 @@ describe('Pipelines Triggerer', () => {
       },
     });
 
-    wrapper.vm.$nextTick(() => {
+    return wrapper.vm.$nextTick(() => {
       expect(wrapper.find('.js-pipeline-url-api').text()).toEqual('API');
     });
   });