diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-25 00:09:09 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-25 00:09:09 +0300 |
commit | 167894d0e7c98aae1c6d4f5a060ad6d58ea3f382 (patch) | |
tree | dd0ce964cf0db395b0b143a079c58bb4aabae591 /qa/spec/support | |
parent | 411cc77938f99b495e0fe802705d275a28e939ef (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa/spec/support')
-rw-r--r-- | qa/spec/support/retrier_spec.rb | 12 | ||||
-rw-r--r-- | qa/spec/support/waiter_spec.rb | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/qa/spec/support/retrier_spec.rb b/qa/spec/support/retrier_spec.rb index fbe66a680f9..ef1d53e6b65 100644 --- a/qa/spec/support/retrier_spec.rb +++ b/qa/spec/support/retrier_spec.rb @@ -14,12 +14,12 @@ describe QA::Support::Retrier do context 'when the condition is true' do it 'logs max attempts (3 by default)' do expect { subject.retry_until { true } } - .to output(/with retry_until: max_attempts: 3; reload_page: ; sleep_interval: 0; raise_on_failure: false; retry_on_exception: false/).to_stdout_from_any_process + .to output(/with retry_until: max_attempts: 3; reload_page: ; sleep_interval: 0; raise_on_failure: true; retry_on_exception: false/).to_stdout_from_any_process end it 'logs max duration' do expect { subject.retry_until(max_duration: 1) { true } } - .to output(/with retry_until: max_duration: 1; reload_page: ; sleep_interval: 0; raise_on_failure: false; retry_on_exception: false/).to_stdout_from_any_process + .to output(/with retry_until: max_duration: 1; reload_page: ; sleep_interval: 0; raise_on_failure: true; retry_on_exception: false/).to_stdout_from_any_process end it 'logs the end' do @@ -30,12 +30,12 @@ describe QA::Support::Retrier do context 'when the condition is false' do it 'logs the start' do - expect { subject.retry_until(max_duration: 0) { false } } + expect { subject.retry_until(max_duration: 0, raise_on_failure: false) { false } } .to output(/with retry_until: max_duration: 0; reload_page: ; sleep_interval: 0; raise_on_failure: false; retry_on_exception: false/).to_stdout_from_any_process end it 'logs the end' do - expect { subject.retry_until(max_duration: 0) { false } } + expect { subject.retry_until(max_duration: 0, raise_on_failure: false) { false } } .to output(/ended retry_until$/).to_stdout_from_any_process end end @@ -54,8 +54,8 @@ describe QA::Support::Retrier do subject.retry_until end - it 'sets raise_on_failure to false by default' do - expect(subject).to receive(:repeat_until).with(hash_including(raise_on_failure: false)) + it 'sets raise_on_failure to true by default' do + expect(subject).to receive(:repeat_until).with(hash_including(raise_on_failure: true)) subject.retry_until end diff --git a/qa/spec/support/waiter_spec.rb b/qa/spec/support/waiter_spec.rb index 06e404c862a..40abf0d72a2 100644 --- a/qa/spec/support/waiter_spec.rb +++ b/qa/spec/support/waiter_spec.rb @@ -46,8 +46,8 @@ describe QA::Support::Waiter do subject.wait_until end - it 'sets raise_on_failure to false by default' do - expect(subject).to receive(:repeat_until).with(hash_including(raise_on_failure: false)) + it 'sets raise_on_failure to true by default' do + expect(subject).to receive(:repeat_until).with(hash_including(raise_on_failure: true)) subject.wait_until end |