Add latest changes from gitlab-org/gitlab@15-9-stable-eev15.9.0-rc42

1 files changed, 4 insertions, 5 deletions

diff --git a/spec/features/merge_request/user_sees_merge_widget_spec.rb b/spec/features/merge_request/user_sees_merge_widget_spec.rb
index 0297bb5b935..acf2893b513 100644
--- a/spec/features/merge_request/user_sees_merge_widget_spec.rb
+++ b/spec/features/merge_request/user_sees_merge_widget_spec.rb
@@ -18,7 +18,6 @@ RSpec.describe 'Merge request > User sees merge widget', :js, feature_category:
   end
 
   before do
-    stub_feature_flags(refactor_security_extension: false)
     project.add_maintainer(user)
     project_only_mwps.add_maintainer(user)
     sign_in(user)
@@ -90,12 +89,12 @@ RSpec.describe 'Merge request > User sees merge widget', :js, feature_category:
         click_button 'master'
       end
 
-      page.within("#{modal_selector} .dropdown-menu") do
-        find('[data-testid="dropdown-search-box"]').set('')
+      page.within("#{modal_selector} [data-testid=\"base-dropdown-menu\"]") do
+        fill_in 'Search branches', with: ''
 
         wait_for_requests
 
-        expect(page.all('[data-testid="dropdown-item"]').size).to be > 1
+        expect(page).to have_selector('[data-testid="listbox-item-master"]', visible: true)
       end
     end
   end
@@ -149,7 +148,7 @@ RSpec.describe 'Merge request > User sees merge widget', :js, feature_category:
         click_button 'Merge unverified changes'
       end
 
-      expect(find('.media-body h4')).to have_content('Merging!')
+      expect(find('[data-testid="merging-state"]')).to have_content('Merging!')
     end
   end