diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-19 10:33:21 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-19 10:33:21 +0300 |
commit | 36a59d088eca61b834191dacea009677a96c052f (patch) | |
tree | e4f33972dab5d8ef79e3944a9f403035fceea43f /spec/features/merge_request/user_merges_immediately_spec.rb | |
parent | a1761f15ec2cae7c7f7bbda39a75494add0dfd6f (diff) |
Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.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 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/spec/features/merge_request/user_merges_immediately_spec.rb b/spec/features/merge_request/user_merges_immediately_spec.rb index 3a05f35a671..91327059e0f 100644 --- a/spec/features/merge_request/user_merges_immediately_spec.rb +++ b/spec/features/merge_request/user_merges_immediately_spec.rb @@ -30,17 +30,17 @@ RSpec.describe 'Merge requests > User merges immediately', :js do it 'enables merge immediately' do wait_for_requests - page.within '.mr-widget-body' do + page.within '[data-testid="ready_to_merge_state"]' do find('.dropdown-toggle').click Sidekiq::Testing.fake! do click_button 'Merge immediately' - - expect(find('.media-body h4')).to have_content('Merging!') - - wait_for_requests end end + + expect(find('.media-body h4')).to have_content('Merging!') + + wait_for_requests end end end |