Merge branch 'qa-fix-license-compliance-spec-loading-issue' into 'master'

Fix license compliance spec loading issue

Closes #37980

See merge request gitlab-org/gitlab!21147

qa/qa/page/base.rb

@@ -146,7 +146,10 @@ module QA
       end
 
       def finished_loading?
-        has_no_css?('.fa-spinner', wait: Capybara.default_max_wait_time)
+        # The number of selectors should be able to be reduced after
+        # migration to the new spinner is complete.
+        # https://gitlab.com/groups/gitlab-org/-/epics/956
+        has_no_css?('.gl-spinner, .fa-spinner, .spinner', wait: Capybara.default_max_wait_time)
       end
 
       def finished_loading_block?

qa/qa/page/component/select2.rb

@@ -31,7 +31,7 @@ module QA
         end
 
         def wait_for_search_to_complete
-          has_css?('.select2-active')
+          has_css?('.select2-active', wait: 1)
           has_no_css?('.select2-active', wait: 30)
         end
       end

qa/qa/page/settings/common.rb

@@ -6,7 +6,7 @@ module QA
       module Common
         # Click the Expand button present in the specified section
         #
-        # @param [Symbol] and `element` name defined in a `view` block
+        # @param [Symbol] element_name `element` name defined in a `view` block
         def expand_section(element_name)
           within_element(element_name) do
             # Because it is possible to click the button before the JS toggle code is bound
@@ -14,6 +14,7 @@ module QA
               click_button 'Expand' unless has_css?('button', text: 'Collapse', wait: 1)
 
               has_content?('Collapse')
+              finished_loading?
             end
 
             yield if block_given?