diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 08:27:35 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 08:27:35 +0000 |
commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
tree | c8f718a08e110ad7e1894510980d2155a6549197 /qa/qa/page/base.rb | |
parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) | |
download | gitlab-ce-7e9c479f7de77702622631cff2628a9c8dcbc627.tar.gz |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'qa/qa/page/base.rb')
-rw-r--r-- | qa/qa/page/base.rb | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/qa/qa/page/base.rb b/qa/qa/page/base.rb index abd9332ced0..ce4eac7fbc4 100644 --- a/qa/qa/page/base.rb +++ b/qa/qa/page/base.rb @@ -34,19 +34,26 @@ module QA @retry_later_backoff = QA::Support::Repeater::DEFAULT_MAX_WAIT_TIME end + def inspect + # For prettier failure messages + # Eg.: "expected QA::Page::File::Show not to have file "QA Test - File name" + # Instead of "expected #<QA::Page::File::Show:0x000055c6511e07b8 @retry_later_backoff=60> not to have file "QA Test - File name" + self.class.to_s + end + def assert_no_element(name) assert_no_selector(element_selector_css(name)) end - def refresh + def refresh(skip_finished_loading_check: false) page.refresh - wait_for_requests + wait_for_requests(skip_finished_loading_check: skip_finished_loading_check) end - def wait_until(max_duration: 60, sleep_interval: 0.1, reload: true, raise_on_failure: true) + def wait_until(max_duration: 60, sleep_interval: 0.1, reload: true, raise_on_failure: true, skip_finished_loading_check_on_refresh: false) Support::Waiter.wait_until(max_duration: max_duration, sleep_interval: sleep_interval, raise_on_failure: raise_on_failure) do - yield || (reload && refresh && false) + yield || (reload && refresh(skip_finished_loading_check: skip_finished_loading_check_on_refresh) && false) end end |