Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomasz Maczukin <tomasz@maczukin.pl>2018-02-21 03:21:59 +0300
committerTomasz Maczukin <tomasz@maczukin.pl>2018-03-28 14:55:46 +0300
commitd633bc8134fe472137fb668c1eb78de45dc9bb57 (patch)
treed50c6d3a4bceb0bda5a20b05820bf9efb37b5b40 /spec/requests/api/runner_spec.rb
parenta4ea9a93db98461479dcb8e1d7b8425a77018f1e (diff)
Rename job_upper_timeout to maximum_job_timeout
Diffstat (limited to 'spec/requests/api/runner_spec.rb')
-rw-r--r--spec/requests/api/runner_spec.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/spec/requests/api/runner_spec.rb b/spec/requests/api/runner_spec.rb
index 3eb0e88d095..a6a4f510406 100644
--- a/spec/requests/api/runner_spec.rb
+++ b/spec/requests/api/runner_spec.rb
@@ -109,13 +109,13 @@ describe API::Runner do
end
end
- context 'when job upper timeout is specified' do
+ context 'when maximum job timeout is specified' do
it 'creates runner' do
post api('/runners'), token: registration_token,
- job_upper_timeout: 7200
+ maximum_job_timeout: 7200
expect(response).to have_gitlab_http_status 201
- expect(Ci::Runner.first.job_upper_timeout).to eq(7200)
+ expect(Ci::Runner.first.maximum_job_timeout).to eq(7200)
end
end
@@ -671,7 +671,7 @@ describe API::Runner do
end
context 'when runner specifies lower timeout' do
- let(:runner) { create(:ci_runner, job_upper_timeout: 1000) }
+ let(:runner) { create(:ci_runner, maximum_job_timeout: 1000) }
it 'contains info about timeout overridden by runner' do
request_job
@@ -682,7 +682,7 @@ describe API::Runner do
end
context 'when runner specifies bigger timeout' do
- let(:runner) { create(:ci_runner, job_upper_timeout: 2000) }
+ let(:runner) { create(:ci_runner, maximum_job_timeout: 2000) }
it 'contains info about timeout not overridden by runner' do
request_job