summaryrefslogtreecommitdiff
path: root/qa/spec
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-24 21:09:09 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-24 21:09:09 +0000
commit167894d0e7c98aae1c6d4f5a060ad6d58ea3f382 (patch)
treedd0ce964cf0db395b0b143a079c58bb4aabae591 /qa/spec
parent411cc77938f99b495e0fe802705d275a28e939ef (diff)
downloadgitlab-ce-167894d0e7c98aae1c6d4f5a060ad6d58ea3f382.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa/spec')
-rw-r--r--qa/spec/page/logging_spec.rb18
-rw-r--r--qa/spec/support/retrier_spec.rb12
-rw-r--r--qa/spec/support/waiter_spec.rb4
3 files changed, 8 insertions, 26 deletions
diff --git a/qa/spec/page/logging_spec.rb b/qa/spec/page/logging_spec.rb
index a6b61e9b1ee..f2ce9fb2cf8 100644
--- a/qa/spec/page/logging_spec.rb
+++ b/qa/spec/page/logging_spec.rb
@@ -27,24 +27,6 @@ describe QA::Support::Page::Logging do
.to output(%r{refreshing http://current-url}).to_stdout_from_any_process
end
- it 'logs wait' do
- expect { subject.wait_until(max_duration: 0) {} }
- .to output(/next wait uses reload: true/).to_stdout_from_any_process
- expect { subject.wait_until(max_duration: 0) {} }
- .to output(/with wait_until/).to_stdout_from_any_process
- expect { subject.wait_until(max_duration: 0) {} }
- .to output(/ended wait_until$/).to_stdout_from_any_process
- end
-
- it 'logs wait with reload false' do
- expect { subject.wait_until(max_duration: 0, reload: false) {} }
- .to output(/next wait uses reload: false/).to_stdout_from_any_process
- expect { subject.wait_until(max_duration: 0, reload: false) {} }
- .to output(/with wait_until/).to_stdout_from_any_process
- expect { subject.wait_until(max_duration: 0, reload: false) {} }
- .to output(/ended wait_until$/).to_stdout_from_any_process
- end
-
it 'logs scroll_to' do
expect { subject.scroll_to(:element) }
.to output(/scrolling to :element/).to_stdout_from_any_process
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