Commit 04229ece authored by Grzegorz Bizon's avatar Grzegorz Bizon

Merge branch 'feature/expose-timestimes-in-build-entity' into 'master'

Expose timestamps in build entity

## What does this MR do?

This MR exposes timestamps for build entity that is being used by serializers in `app/serializers`. 

## Does this MR meet the acceptance criteria?

- Tests
  - [x] Added for this feature/bug
  - [ ] All builds are passing

## What are the relevant issue numbers?

See https://gitlab.com/gitlab-org/gitlab-ce/issues/24844#note_19145053

See merge request !7818
parents 25e6e2fc 651eccda
...@@ -16,6 +16,9 @@ class BuildEntity < Grape::Entity ...@@ -16,6 +16,9 @@ class BuildEntity < Grape::Entity
path_to(:play_namespace_project_build, build) path_to(:play_namespace_project_build, build)
end end
expose :created_at
expose :updated_at
private private
def path_to(route, build) def path_to(route, build)
......
require 'spec_helper' require 'spec_helper'
describe BuildEntity do describe BuildEntity do
let(:build) { create(:ci_build) }
let(:entity) do let(:entity) do
described_class.new(build, request: double) described_class.new(build, request: double)
end end
subject { entity.as_json } subject { entity.as_json }
context 'when build is a regular job' do it 'contains paths to build page and retry action' do
let(:build) { create(:ci_build) } expect(subject).to include(:build_path, :retry_path)
end
it 'contains paths to build page and retry action' do it 'does not contain sensitive information' do
expect(subject).to include(:build_path, :retry_path) expect(subject).not_to include(/token/)
expect(subject).not_to include(:play_path) expect(subject).not_to include(/variables/)
end end
it 'contains timestamps' do
expect(subject).to include(:created_at, :updated_at)
end
it 'does not contain sensitive information' do context 'when build is a regular job' do
expect(subject).not_to include(/token/) it 'does not contain path to play action' do
expect(subject).not_to include(/variables/) expect(subject).not_to include(:play_path)
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment