diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-20 13:49:51 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-20 13:49:51 +0000 |
| commit | 71786ddc8e28fbd3cb3fcc4b3ff15e5962a1c82e (patch) | |
| tree | 6a2d93ef3fb2d353bb7739e4b57e6541f51cdd71 /spec/features/merge_request/user_merges_immediately_spec.rb | |
| parent | a7253423e3403b8c08f8a161e5937e1488f5f407 (diff) | |
| download | gitlab-ce-15.9.0-rc42.tar.gz | |
Add latest changes from gitlab-org/gitlab@15-9-stable-eev15.9.0-rc42
Diffstat (limited to 'spec/features/merge_request/user_merges_immediately_spec.rb')
| -rw-r--r-- | spec/features/merge_request/user_merges_immediately_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/merge_request/user_merges_immediately_spec.rb b/spec/features/merge_request/user_merges_immediately_spec.rb index 79c166434aa..d47968ebc6b 100644 --- a/spec/features/merge_request/user_merges_immediately_spec.rb +++ b/spec/features/merge_request/user_merges_immediately_spec.rb @@ -38,7 +38,7 @@ RSpec.describe 'Merge requests > User merges immediately', :js, feature_category end end - expect(find('.media-body h4')).to have_content('Merging!') + expect(find('[data-testid="merging-state"]')).to have_content('Merging!') wait_for_requests end |