Modify Page::Component::Select2 to work with search and remove Select2Search

qa/qa.rb

@@ -276,7 +276,6 @@ module QA
       autoload :GroupsFilter, 'qa/page/component/groups_filter'
       autoload :Select2, 'qa/page/component/select2'
       autoload :DropdownFilter, 'qa/page/component/dropdown_filter'
-      autoload :Select2Search, 'qa/page/component/select2_search'
       autoload :UsersSelect, 'qa/page/component/users_select'
 
       module Issuable

qa/qa/ee/page/group/settings/ldap_sync.rb

@@ -6,7 +6,7 @@ module QA
       module Group
         module Settings
           class LDAPSync < ::QA::Page::Base
-            include QA::Page::Component::Select2Search
+            include QA::Page::Component::Select2
 
             view 'ee/app/views/ldap_group_links/_form.html.haml' do
               element :ldap_group_cn_select

qa/qa/page/component/select2.rb

@@ -3,7 +3,12 @@ module QA
     module Component
       module Select2
         def select_item(item_text)
-          find('ul.select2-result-sub > li', text: item_text).click
+          find('.select2-result-label', text: item_text).click
+        end
+
+        def search_and_select(item_text)
+          find('.select2-input').set(item_text)
+          select_item(item_text)
         end
       end
     end

qa/qa/page/component/select2_search.rb

-# frozen_string_literal: true
-
-module QA
-  module Page
-    module Component
-      module Select2Search
-        def search_and_select(item)
-          wait(reload: false) do
-            page.has_css?('.select2-input')
-          end
-
-          find('.select2-input').set(item)
-          find('.select2-result-label', text: item).click
-        end
-      end
-    end
-  end
-end