Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42

1 files changed, 27 insertions, 1 deletions

diff --git a/spec/frontend/pipelines/pipeline_url_spec.js b/spec/frontend/pipelines/pipeline_url_spec.js
index 47315bd42e6..44c9def99cc 100644
--- a/spec/frontend/pipelines/pipeline_url_spec.js
+++ b/spec/frontend/pipelines/pipeline_url_spec.js
@@ -1,6 +1,6 @@
+import { shallowMount } from '@vue/test-utils';
 import $ from 'jquery';
 import { trimText } from 'helpers/text_helper';
-import { shallowMount } from '@vue/test-utils';
 import PipelineUrlComponent from '~/pipelines/components/pipelines_list/pipeline_url.vue';
 
 $.fn.popover = () => {};
@@ -17,6 +17,7 @@ describe('Pipeline Url Component', () => {
   const findStuckTag = () => wrapper.find('[data-testid="pipeline-url-stuck"]');
   const findDetachedTag = () => wrapper.find('[data-testid="pipeline-url-detached"]');
   const findForkTag = () => wrapper.find('[data-testid="pipeline-url-fork"]');
+  const findTrainTag = () => wrapper.find('[data-testid="pipeline-url-train"]');
 
   const defaultProps = {
     pipeline: {
@@ -141,6 +142,7 @@ describe('Pipeline Url Component', () => {
     expect(findScheduledTag().exists()).toBe(true);
     expect(findScheduledTag().text()).toContain('Scheduled');
   });
+
   it('should render the fork badge when the pipeline was run in a fork', () => {
     createComponent({
       pipeline: {
@@ -152,4 +154,28 @@ describe('Pipeline Url Component', () => {
     expect(findForkTag().exists()).toBe(true);
     expect(findForkTag().text()).toBe('fork');
   });
+
+  it('should render the train badge when the pipeline is a merge train pipeline', () => {
+    createComponent({
+      pipeline: {
+        flags: {
+          merge_train_pipeline: true,
+        },
+      },
+    });
+
+    expect(findTrainTag().text()).toContain('train');
+  });
+
+  it('should not render the train badge when the pipeline is not a merge train pipeline', () => {
+    createComponent({
+      pipeline: {
+        flags: {
+          merge_train_pipeline: false,
+        },
+      },
+    });
+
+    expect(findTrainTag().exists()).toBe(false);
+  });
 });