From c9749e22383661c0772addfcf4274ec3a81bd229 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Thu, 20 Jul 2017 09:18:45 +0200
Subject: [PATCH] Improve build details serializable entity specs

---
 spec/factories/ci/builds.rb                   |  1 +
 spec/serializers/build_details_entity_spec.rb | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb
index a77f01ecb00..863c82ece6a 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 e688035cecc..2c981154f0d 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)
-- 
GitLab