diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb index a77f01ecb0022382f6420cede7c3a81e17e03281..863c82ece6ad9535b92ba50a314004a82b227807 100644 --- a/spec/factories/ci/builds.rb +++ b/spec/factories/ci/builds.rb @@ -140,6 +140,7 @@ FactoryGirl.define do end trait :erased do + erasable erased_at Time.now erased_by factory: :user end diff --git a/spec/serializers/build_details_entity_spec.rb b/spec/serializers/build_details_entity_spec.rb index e688035cecc98e2793172d4b83a25422a5c253c0..2c981154f0d1a1af1a9673a1b6bea4c8ac37d58e 100644 --- a/spec/serializers/build_details_entity_spec.rb +++ b/spec/serializers/build_details_entity_spec.rb @@ -46,8 +46,8 @@ describe BuildDetailsEntity do expect(subject).to include(:new_issue_path) end - it 'exposes details of the merge request' do - expect(subject[:merge_request]).to include(:iid, :path) + it 'exposes correct details of the merge request' do + expect(subject[:merge_request][:iid]).to eq merge_request.iid end it 'has a correct merge request path' do @@ -78,7 +78,7 @@ describe BuildDetailsEntity do end it 'exposes details of the merge request' do - expect(subject[:merge_request]).to include(:iid, :path) + expect(subject[:merge_request][:iid]).to eq merge_request.iid end it 'has a correct merge request path' do @@ -88,7 +88,7 @@ describe BuildDetailsEntity do end context 'when the build has been erased' do - let(:build) { create(:ci_build, :erasable, project: project) } + let(:build) { create(:ci_build, :erased, project: project) } it 'exposes the user whom erased the build' do expect(subject).to include(:erase_path) @@ -96,7 +96,7 @@ describe BuildDetailsEntity do end context 'when the build has been erased' do - let(:build) { create(:ci_build, erased_at: Time.now, project: project, erased_by: user) } + let(:build) { create(:ci_build, :erased, project: project, erased_by: user) } it 'exposes the user whom erased the build' do expect(subject).to include(:erased_by)