diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-06 03:08:02 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-06 03:08:02 +0000 |
| commit | ed73d4f207ef6cb8646719baa1188d096c9f3139 (patch) | |
| tree | dea7ab9906154c73204a0361163e30500f929d44 /qa/qa/page/base.rb | |
| parent | 2349eabc1a473bfb70555f0ce6d3d808cecb181d (diff) | |
| download | gitlab-ce-ed73d4f207ef6cb8646719baa1188d096c9f3139.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa/qa/page/base.rb')
| -rw-r--r-- | qa/qa/page/base.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/qa/qa/page/base.rb b/qa/qa/page/base.rb index b28664b2921..b01b4951738 100644 --- a/qa/qa/page/base.rb +++ b/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? |