Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 3 deletions

diff --git a/spec/frontend/vue_merge_request_widget/components/artifacts_list_app_spec.js b/spec/frontend/vue_merge_request_widget/components/artifacts_list_app_spec.js
index 332f14a1721..9516aacea0a 100644
--- a/spec/frontend/vue_merge_request_widget/components/artifacts_list_app_spec.js
+++ b/spec/frontend/vue_merge_request_widget/components/artifacts_list_app_spec.js
@@ -70,8 +70,8 @@ describe('Merge Requests Artifacts list app', () => {
 
     it('renders disabled buttons', () => {
       const buttons = findButtons();
-      expect(buttons.at(0).attributes('disabled')).toBe('disabled');
-      expect(buttons.at(1).attributes('disabled')).toBe('disabled');
+      expect(buttons.at(0).attributes('disabled')).toBeDefined();
+      expect(buttons.at(1).attributes('disabled')).toBeDefined();
     });
   });
 
diff --git a/spec/frontend/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed_spec.js b/spec/frontend/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed_spec.js
index 9b043bda72d..e65deb2db3d 100644
--- a/spec/frontend/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed_spec.js
+++ b/spec/frontend/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed_spec.js
@@ -44,7 +44,7 @@ describe('MRWidgetAutoMergeFailed', () => {
 
     await nextTick();
 
-    expect(findButton().attributes('disabled')).toBe('disabled');
+    expect(findButton().attributes('disabled')).toBeDefined();
     expect(wrapper.findComponent(GlLoadingIcon).exists()).toBe(true);
   });
 });