Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 3 deletions

diff --git a/spec/frontend/pipelines/graph/job_item_spec.js b/spec/frontend/pipelines/graph/job_item_spec.js
index 5cc2c76f3dd..2a5dfd7e0ee 100644
--- a/spec/frontend/pipelines/graph/job_item_spec.js
+++ b/spec/frontend/pipelines/graph/job_item_spec.js
@@ -121,7 +121,7 @@ describe('pipeline graph job item', () => {
 
       expect(actionComponent.exists()).toBe(true);
       expect(actionComponent.props('actionIcon')).toBe('retry');
-      expect(actionComponent.attributes('disabled')).not.toBe('disabled');
+      expect(actionComponent.attributes('disabled')).toBeUndefined();
     });
 
     it('should render disabled action icon when user cannot run the action', () => {
@@ -135,7 +135,7 @@ describe('pipeline graph job item', () => {
 
       expect(actionComponent.exists()).toBe(true);
       expect(actionComponent.props('actionIcon')).toBe('stop');
-      expect(actionComponent.attributes('disabled')).toBe('disabled');
+      expect(actionComponent.attributes('disabled')).toBeDefined();
     });
 
     it('action icon tooltip text when job has passed but can be ran again', () => {
diff --git a/spec/frontend/pipelines/pipelines_manual_actions_spec.js b/spec/frontend/pipelines/pipelines_manual_actions_spec.js
index e47e57db887..82cab88c9eb 100644
--- a/spec/frontend/pipelines/pipelines_manual_actions_spec.js
+++ b/spec/frontend/pipelines/pipelines_manual_actions_spec.js
@@ -101,7 +101,7 @@ describe('Pipeline manual actions', () => {
     });
 
     it("displays a disabled action when it's not playable", () => {
-      expect(findAllDropdownItems().at(0).attributes('disabled')).toBe('true');
+      expect(findAllDropdownItems().at(0).attributes('disabled')).toBeDefined();
     });
 
     describe('on action click', () => {