Add latest changes from gitlab-org/gitlab@master

2 files changed, 42 insertions, 0 deletions

diff --git a/spec/javascripts/jobs/components/log/duration_badge_spec.js b/spec/javascripts/jobs/components/log/duration_badge_spec.js
new file mode 100644
index 00000000000..2ac34e78909
--- /dev/null
+++ b/spec/javascripts/jobs/components/log/duration_badge_spec.js
@@ -0,0 +1,31 @@
+import { shallowMount } from '@vue/test-utils';
+import DurationBadge from '~/jobs/components/log/duration_badge.vue';
+
+describe('Job Log Duration Badge', () => {
+  let wrapper;
+
+  const data = {
+    duration: '00:30:01',
+  };
+
+  const createComponent = (props = {}) => {
+    wrapper = shallowMount(DurationBadge, {
+      sync: false,
+      propsData: {
+        ...props,
+      },
+    });
+  };
+
+  beforeEach(() => {
+    createComponent(data);
+  });
+
+  afterEach(() => {
+    wrapper.destroy();
+  });
+
+  it('renders provided duration', () => {
+    expect(wrapper.text()).toBe(data.duration);
+  });
+});
diff --git a/spec/javascripts/jobs/components/log/line_header_spec.js b/spec/javascripts/jobs/components/log/line_header_spec.js
index 4efd412a6cd..2d2f92fad9d 100644
--- a/spec/javascripts/jobs/components/log/line_header_spec.js
+++ b/spec/javascripts/jobs/components/log/line_header_spec.js
@@ -1,6 +1,7 @@
 import { mount } from '@vue/test-utils';
 import LineHeader from '~/jobs/components/log/line_header.vue';
 import LineNumber from '~/jobs/components/log/line_number.vue';
+import DurationBadge from '~/jobs/components/log/duration_badge.vue';
 
 describe('Job Log Header Line', () => {
   let wrapper;
@@ -81,4 +82,14 @@ describe('Job Log Header Line', () => {
       expect(wrapper.emitted().toggleLine.length).toBe(1);
     });
   });
+
+  describe('with duration', () => {
+    beforeEach(() => {
+      createComponent(Object.assign({}, data, { duration: '00:10' }));
+    });
+
+    it('renders the duration badge', () => {
+      expect(wrapper.contains(DurationBadge)).toBe(true);
+    });
+  });
 });