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-28 23:36:01 +0300
committerTomasz Maczukin <tomasz@maczukin.pl>2018-03-28 14:57:18 +0300
commit1b0b8b9c02642ac19b9f5019cdd38fcec280c2a7 (patch)
treece4f8eba20d9f3d434cead27abb77e855b3ae237 /spec/models/ci
parent8ffa48098b77e1f35f9c01f6977d9ccf1d166a24 (diff)
Change timeout_source to enum
Diffstat (limited to 'spec/models/ci')
-rw-r--r--spec/models/ci/build_spec.rb16
1 files changed, 7 insertions, 9 deletions
diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb
index 78842bd8a92..c3624158b76 100644
--- a/spec/models/ci/build_spec.rb
+++ b/spec/models/ci/build_spec.rb
@@ -2046,20 +2046,18 @@ describe Ci::Build do
end
shared_examples 'saves data on transition' do
- it 'saves used_timeout and timeout_source on transition' do
- expect(job.used_timeout).to be_nil
- expect(job.timeout_source).to be_nil
-
- job.run!
+ it 'saves used_timeout' do
+ expect { job.run! }.to change { job.reload.used_timeout }.from(nil).to(expected_timeout)
+ end
- expect(job.used_timeout).to eq(expected_timeout)
- expect(job.timeout_source).to eq(expected_timeout_source)
+ it 'saves timeout_source' do
+ expect { job.run! }.to change { job.reload.timeout_source }.from('unknown_timeout_source').to(expected_timeout_source)
end
end
context 'when runner timeout overrides project timeout' do
let(:expected_timeout) { 900 }
- let(:expected_timeout_source) { 'Runner' }
+ let(:expected_timeout_source) { 'runner_timeout_source' }
before do
runner.maximum_job_timeout = 900
@@ -2071,7 +2069,7 @@ describe Ci::Build do
context "when runner timeout doesn't override project timeout" do
let(:expected_timeout) { 1800 }
- let(:expected_timeout_source) { 'Project' }
+ let(:expected_timeout_source) { 'project_timeout_source' }
before do
runner.maximum_job_timeout = 3600