Commit 0a0cf985 authored by Desiree Chevalier's avatar Desiree Chevalier

Fix license compliance spec loading issue

parent bfd6f3db
...@@ -146,7 +146,10 @@ module QA ...@@ -146,7 +146,10 @@ module QA
end end
def finished_loading? 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 end
def finished_loading_block? def finished_loading_block?
......
...@@ -31,7 +31,7 @@ module QA ...@@ -31,7 +31,7 @@ module QA
end end
def wait_for_search_to_complete def wait_for_search_to_complete
has_css?('.select2-active') has_css?('.select2-active', wait: 1)
has_no_css?('.select2-active', wait: 30) has_no_css?('.select2-active', wait: 30)
end end
end end
......
...@@ -6,7 +6,7 @@ module QA ...@@ -6,7 +6,7 @@ module QA
module Common module Common
# Click the Expand button present in the specified section # 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) def expand_section(element_name)
within_element(element_name) do within_element(element_name) do
# Because it is possible to click the button before the JS toggle code is bound # Because it is possible to click the button before the JS toggle code is bound
...@@ -14,6 +14,7 @@ module QA ...@@ -14,6 +14,7 @@ module QA
click_button 'Expand' unless has_css?('button', text: 'Collapse', wait: 1) click_button 'Expand' unless has_css?('button', text: 'Collapse', wait: 1)
has_content?('Collapse') has_content?('Collapse')
finished_loading?
end end
yield if block_given? yield if block_given?
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment