diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-09 21:07:53 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-09 21:07:53 +0000 |
| commit | b558e1ad8f1d2d52e0c88ad712cd3d567cf52e10 (patch) | |
| tree | 5fc6b81818c0af3aefd85816aa3026b26515615e /spec/features/merge_request/user_merges_merge_request_spec.rb | |
| parent | b031a57ae71b1fc61782b891d2a31852ab87e7f3 (diff) | |
| download | gitlab-ce-b558e1ad8f1d2d52e0c88ad712cd3d567cf52e10.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features/merge_request/user_merges_merge_request_spec.rb')
| -rw-r--r-- | spec/features/merge_request/user_merges_merge_request_spec.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/spec/features/merge_request/user_merges_merge_request_spec.rb b/spec/features/merge_request/user_merges_merge_request_spec.rb index 12518d634ec..6a9a30953df 100644 --- a/spec/features/merge_request/user_merges_merge_request_spec.rb +++ b/spec/features/merge_request/user_merges_merge_request_spec.rb @@ -17,9 +17,7 @@ RSpec.describe "User merges a merge request", :js do click_button("Merge") end - page.within(".status-box") do - expect(page).to have_content("Merged") - end + expect(page).to have_selector('.gl-badge', text: 'Merged') end end |