Add latest changes from gitlab-org/gitlab@master

4 files changed, 8 insertions, 14 deletions

diff --git a/spec/frontend/pipelines/graph/action_component_spec.js b/spec/frontend/pipelines/graph/action_component_spec.js
index a8fddd5fff2..a7e504af231 100644
--- a/spec/frontend/pipelines/graph/action_component_spec.js
+++ b/spec/frontend/pipelines/graph/action_component_spec.js
@@ -30,7 +30,7 @@ describe('pipeline graph action component', () => {
   });
 
   it('should render the provided title as a bootstrap tooltip', () => {
-    expect(wrapper.attributes('data-original-title')).toBe('bar');
+    expect(wrapper.attributes('title')).toBe('bar');
   });
 
   it('should update bootstrap tooltip when title changes', done => {
@@ -39,7 +39,7 @@ describe('pipeline graph action component', () => {
     wrapper.vm
       .$nextTick()
       .then(() => {
-        expect(wrapper.attributes('data-original-title')).toBe('changed');
+        expect(wrapper.attributes('title')).toBe('changed');
       })
       .then(done)
       .catch(done.fail);
diff --git a/spec/frontend/pipelines/graph/job_item_spec.js b/spec/frontend/pipelines/graph/job_item_spec.js
index c79af95b3f3..22e1881ead4 100644
--- a/spec/frontend/pipelines/graph/job_item_spec.js
+++ b/spec/frontend/pipelines/graph/job_item_spec.js
@@ -43,9 +43,7 @@ describe('pipeline graph job item', () => {
 
         expect(link.attributes('href')).toBe(mockJob.status.details_path);
 
-        expect(link.attributes('data-original-title')).toEqual(
-          `${mockJob.name} - ${mockJob.status.label}`,
-        );
+        expect(link.attributes('title')).toEqual(`${mockJob.name} - ${mockJob.status.label}`);
 
         expect(wrapper.find('.js-status-icon-success')).toBeDefined();
 
@@ -110,9 +108,7 @@ describe('pipeline graph job item', () => {
         },
       });
 
-      expect(wrapper.find('.js-job-component-tooltip').attributes('data-original-title')).toBe(
-        'test',
-      );
+      expect(wrapper.find('.js-job-component-tooltip').attributes('title')).toBe('test');
     });
 
     it('should not render status label when it is  provided', () => {
@@ -128,7 +124,7 @@ describe('pipeline graph job item', () => {
         },
       });
 
-      expect(wrapper.find('.js-job-component-tooltip').attributes('data-original-title')).toEqual(
+      expect(wrapper.find('.js-job-component-tooltip').attributes('title')).toEqual(
         'test - success',
       );
     });
@@ -140,7 +136,7 @@ describe('pipeline graph job item', () => {
         job: delayedJobFixture,
       });
 
-      expect(wrapper.find('.js-pipeline-graph-job-link').attributes('data-original-title')).toEqual(
+      expect(wrapper.find('.js-pipeline-graph-job-link').attributes('title')).toEqual(
         `delayed job - delayed manual action (${wrapper.vm.remainingTime})`,
       );
     });
diff --git a/spec/frontend/pipelines/graph/linked_pipeline_spec.js b/spec/frontend/pipelines/graph/linked_pipeline_spec.js
index c355d653203..b5fb1a94ebd 100644
--- a/spec/frontend/pipelines/graph/linked_pipeline_spec.js
+++ b/spec/frontend/pipelines/graph/linked_pipeline_spec.js
@@ -65,7 +65,7 @@ describe('Linked pipeline', () => {
 
     it('should render the tooltip text as the title attribute', () => {
       const tooltipRef = wrapper.find('.js-linked-pipeline-content');
-      const titleAttr = tooltipRef.attributes('data-original-title');
+      const titleAttr = tooltipRef.attributes('title');
 
       expect(titleAttr).toContain(mockPipeline.project.name);
       expect(titleAttr).toContain(mockPipeline.details.status.label);
diff --git a/spec/frontend/pipelines/pipeline_url_spec.js b/spec/frontend/pipelines/pipeline_url_spec.js
index 3c0c35e1f0f..0bb5ff159c5 100644
--- a/spec/frontend/pipelines/pipeline_url_spec.js
+++ b/spec/frontend/pipelines/pipeline_url_spec.js
@@ -105,8 +105,6 @@ describe('Pipeline Url Component', () => {
     });
 
     expect(wrapper.find('.js-pipeline-url-failure').text()).toContain('error');
-    expect(wrapper.find('.js-pipeline-url-failure').attributes('data-original-title')).toContain(
-      'some reason',
-    );
+    expect(wrapper.find('.js-pipeline-url-failure').attributes('title')).toContain('some reason');
   });
 });