diff options
author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-05-29 08:13:37 +0000 |
---|---|---|
committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-05-29 08:13:37 +0000 |
commit | 6b7a70d2018eae437c86fea6795ed97ba1e599bc (patch) | |
tree | f891de64c233286aebb11838ca7c587c9f6904b2 /spec/requests/api | |
parent | 43ec52ab36069faa060f227fb73d6efeff5b96a5 (diff) | |
parent | 4131a49bb72ab62c9384050d90ec268b4f3d76aa (diff) | |
download | gitlab-ce-6b7a70d2018eae437c86fea6795ed97ba1e599bc.tar.gz |
Merge branch 'add-artifacts_expire_at-to-api' into 'master'
Expose artifacts_expire_at field for job entity in api
See merge request gitlab-org/gitlab-ce!18872
Diffstat (limited to 'spec/requests/api')
-rw-r--r-- | spec/requests/api/jobs_spec.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/spec/requests/api/jobs_spec.rb b/spec/requests/api/jobs_spec.rb index 0a2963452e4..45082e644ca 100644 --- a/spec/requests/api/jobs_spec.rb +++ b/spec/requests/api/jobs_spec.rb @@ -13,7 +13,10 @@ describe API::Jobs do ref: project.default_branch) end - let!(:job) { create(:ci_build, :success, pipeline: pipeline) } + let!(:job) do + create(:ci_build, :success, pipeline: pipeline, + artifacts_expire_at: 1.day.since) + end let(:user) { create(:user) } let(:api_user) { user } @@ -43,6 +46,7 @@ describe API::Jobs do it 'returns correct values' do expect(json_response).not_to be_empty expect(json_response.first['commit']['id']).to eq project.commit.id + expect(Time.parse(json_response.first['artifacts_expire_at'])).to be_like_time(job.artifacts_expire_at) end it 'returns pipeline data' do @@ -128,6 +132,7 @@ describe API::Jobs do it 'returns correct values' do expect(json_response).not_to be_empty expect(json_response.first['commit']['id']).to eq project.commit.id + expect(Time.parse(json_response.first['artifacts_expire_at'])).to be_like_time(job.artifacts_expire_at) end it 'returns pipeline data' do @@ -201,6 +206,7 @@ describe API::Jobs do expect(Time.parse(json_response['created_at'])).to be_like_time(job.created_at) expect(Time.parse(json_response['started_at'])).to be_like_time(job.started_at) expect(Time.parse(json_response['finished_at'])).to be_like_time(job.finished_at) + expect(Time.parse(json_response['artifacts_expire_at'])).to be_like_time(job.artifacts_expire_at) expect(json_response['duration']).to eq(job.duration) end |