From 78874519db2ca2f18a2fbca5fe070292e521d0c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Mon, 9 Jan 2017 21:47:15 +0100
Subject: Add Presentable concern
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 app/controllers/projects/builds_controller.rb |  2 +-
 app/models/ci/build.rb                        |  1 +
 app/models/concerns/presentable.rb            |  7 +++++++
 app/views/projects/builds/show.html.haml      |  6 ++++--
 spec/models/concerns/presentable_spec.rb      | 15 +++++++++++++++
 5 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 app/models/concerns/presentable.rb
 create mode 100644 spec/models/concerns/presentable_spec.rb

diff --git a/app/controllers/projects/builds_controller.rb b/app/controllers/projects/builds_controller.rb
index fbe391fc58c..0096ea77a12 100644
--- a/app/controllers/projects/builds_controller.rb
+++ b/app/controllers/projects/builds_controller.rb
@@ -94,7 +94,7 @@ class Projects::BuildsController < Projects::ApplicationController
   private
 
   def build
-    @build ||= project.builds.find_by!(id: params[:id])
+    @build ||= project.builds.find_by!(id: params[:id]).present(current_user)
   end
 
   def build_path(build)
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 48ffe40abc6..ce23c2d1088 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -2,6 +2,7 @@ module Ci
   class Build < CommitStatus
     include TokenAuthenticatable
     include AfterCommitQueue
+    include Presentable
 
     belongs_to :runner
     belongs_to :trigger_request
diff --git a/app/models/concerns/presentable.rb b/app/models/concerns/presentable.rb
new file mode 100644
index 00000000000..7b33b837004
--- /dev/null
+++ b/app/models/concerns/presentable.rb
@@ -0,0 +1,7 @@
+module Presentable
+  def present(**attributes)
+    Gitlab::View::Presenter::Factory
+      .new(self, attributes)
+      .fabricate!
+  end
+end
diff --git a/app/views/projects/builds/show.html.haml b/app/views/projects/builds/show.html.haml
index 54724ef5cab..c613e473e4c 100644
--- a/app/views/projects/builds/show.html.haml
+++ b/app/views/projects/builds/show.html.haml
@@ -51,8 +51,10 @@
     .prepend-top-default
       - if @build.erased?
         .erased.alert.alert-warning
-          - erased_by = "by #{link_to @build.erased_by.name, user_path(@build.erased_by)}" if @build.erased_by
-          Build has been erased #{erased_by.html_safe} #{time_ago_with_tooltip(@build.erased_at)}
+          - if @build.erased_by_user?
+            Build has been erased by #{link_to(@build.erased_by_name, user_path(@build.erased_by))} #{time_ago_with_tooltip(@build.erased_at)}
+          - else
+            Build has been erased #{time_ago_with_tooltip(@build.erased_at)}
       - else
         #js-build-scroll.scroll-controls
           .scroll-step
diff --git a/spec/models/concerns/presentable_spec.rb b/spec/models/concerns/presentable_spec.rb
new file mode 100644
index 00000000000..6640a5e1377
--- /dev/null
+++ b/spec/models/concerns/presentable_spec.rb
@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe Presentable do
+  let(:build) { create(:ci_build) }
+
+  describe '#present' do
+    it 'returns a presenter' do
+      expect(build.present).to be_a(Ci::Build::Presenter)
+    end
+
+    it 'takes optional attributes' do
+      expect(build.present(foo: 'bar').foo).to eq('bar')
+    end
+  end
+end
-- 
cgit v1.2.1