From f2697963827043e0cd7d3659d111144ec7b693d3 Mon Sep 17 00:00:00 2001
From: Artur Beljajev <artur.beljajev@internet.ee>
Date: Tue, 3 Apr 2018 15:12:43 +0300
Subject: [PATCH] Show label in UI if a domain is discarded

#792
---
 app/models/concerns/domain/deletable.rb        |  2 +-
 app/presenters/domain_presenter.rb             | 11 +++++++++++
 app/views/admin/domains/show.html.erb          |  4 +++-
 test/integration/admin/domains/details_test.rb | 16 ++++++++++++++++
 4 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 test/integration/admin/domains/details_test.rb

diff --git a/app/models/concerns/domain/deletable.rb b/app/models/concerns/domain/deletable.rb
index a0d49decb..86c296d88 100644
--- a/app/models/concerns/domain/deletable.rb
+++ b/app/models/concerns/domain/deletable.rb
@@ -6,7 +6,7 @@ module Concerns::Domain::Deletable
   end
 
   def discard
-    self.statuses << DomainStatus::DELETE_CANDIDATE
+    statuses << DomainStatus::DELETE_CANDIDATE
     save
   end
 
diff --git a/app/presenters/domain_presenter.rb b/app/presenters/domain_presenter.rb
index 9597330b8..aac3c1527 100644
--- a/app/presenters/domain_presenter.rb
+++ b/app/presenters/domain_presenter.rb
@@ -6,6 +6,17 @@ class DomainPresenter
     @view = view
   end
 
+  def name_with_status
+    html = domain.name
+
+    if domain.discarded?
+      label = view.content_tag(:span, 'deleteCandidate', class: 'label label-warning')
+      html += " #{label}"
+    end
+
+    html.html_safe
+  end
+
   def expire_time
     view.l(domain.expire_time)
   end
diff --git a/app/views/admin/domains/show.html.erb b/app/views/admin/domains/show.html.erb
index 9bfb4b9b5..1501b35bb 100644
--- a/app/views/admin/domains/show.html.erb
+++ b/app/views/admin/domains/show.html.erb
@@ -1,3 +1,5 @@
+<% domain = DomainPresenter.new(domain: @domain, view: self) %>
+
 <ol class="breadcrumb">
     <li><%= link_to t('admin.domains.index.header'), admin_domains_path %></li>
 </ol>
@@ -5,7 +7,7 @@
 <div class="page-header">
     <div class="row">
         <div class="col-sm-8">
-            <h1><%= @domain %></h1>
+            <h1><%= domain.name_with_status %></h1>
         </div>
 
         <div class="col-sm-4 text-right">
diff --git a/test/integration/admin/domains/details_test.rb b/test/integration/admin/domains/details_test.rb
new file mode 100644
index 000000000..afb62b6ea
--- /dev/null
+++ b/test/integration/admin/domains/details_test.rb
@@ -0,0 +1,16 @@
+require 'test_helper'
+
+class AdminAreaDomainDetailsTest < ActionDispatch::IntegrationTest
+  def setup
+    login_as users(:admin)
+    @domain = domains(:shop)
+  end
+
+  def test_discarded_domain_has_corresponding_label
+    visit admin_domain_url(@domain)
+    assert_no_css 'span.label.label-warning', text: 'deleteCandidate'
+    @domain.discard
+    visit admin_domain_url(@domain)
+    assert_css 'span.label.label-warning', text: 'deleteCandidate'
+  end
+end