diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-21 21:08:15 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-21 21:08:15 +0300 |
| commit | 10c562403c5e2b842e1e833db80f890295fc2b40 (patch) | |
| tree | 01392740fe1f126e5c91acc557f3b2269a8e2f9c /spec/frontend/vue_merge_request_widget | |
| parent | 68dc19adb749288e0e5cd2469437be1093a8654c (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/states/mr_widget_ready_to_merge_spec.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/frontend/vue_merge_request_widget/components/states/mr_widget_ready_to_merge_spec.js b/spec/frontend/vue_merge_request_widget/components/states/mr_widget_ready_to_merge_spec.js index 1e4e089e7c1..307e849e7ef 100644 --- a/spec/frontend/vue_merge_request_widget/components/states/mr_widget_ready_to_merge_spec.js +++ b/spec/frontend/vue_merge_request_widget/components/states/mr_widget_ready_to_merge_spec.js @@ -256,7 +256,7 @@ describe('ReadyToMerge', () => { it('should be disabled if merge is not allowed', () => { createComponent({ mr: { preventMerge: true } }); - expect(findMergeButton().props('disabled')).toBe(true); + expect(findMergeButton().exists()).toBe(false); }); it('should be disabled when making request', async () => { |