diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-03 18:12:58 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-03 18:12:58 +0300 |
commit | 27a5080c34c64a84219d855d652b994c5e344a0a (patch) | |
tree | 1f6bcb68378e4965b4e93a846d8a939af18aeec6 /spec/frontend/vue_merge_request_widget | |
parent | 2c01907a1ab4b328e2f20ddf9e10dfe6dc17105a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/vue_merge_request_widget')
-rw-r--r-- | spec/frontend/vue_merge_request_widget/components/artifacts_list_app_spec.js | 4 | ||||
-rw-r--r-- | spec/frontend/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed_spec.js | 2 |
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); }); }); |