From 3dd17f83f36fd2813304e69dc4a2a473b302a7f6 Mon Sep 17 00:00:00 2001
From: Artur Beljajev <artur.beljajev@internet.ee>
Date: Sun, 8 Apr 2018 22:55:53 +0300
Subject: [PATCH] Remove unneeded attribute alias

#791
---
 app/models/concerns/domain/force_delete.rb         | 4 ----
 app/presenters/domain_presenter.rb                 | 2 +-
 app/views/admin/domains/partials/_general.html.erb | 4 ++--
 config/locales/admin/domains.en.yml                | 1 -
 spec/models/concerns/domain/force_delete_spec.rb   | 2 --
 spec/presenters/domain_presenter_spec.rb           | 4 ++--
 6 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/app/models/concerns/domain/force_delete.rb b/app/models/concerns/domain/force_delete.rb
index 96f1a94b3..30dc1b1ec 100644
--- a/app/models/concerns/domain/force_delete.rb
+++ b/app/models/concerns/domain/force_delete.rb
@@ -1,10 +1,6 @@
 module Concerns::Domain::ForceDelete
   extend ActiveSupport::Concern
 
-  included do
-    alias_attribute :force_delete_time, :force_delete_at
-  end
-
   def force_delete_scheduled?
     statuses.include?(DomainStatus::FORCE_DELETE)
   end
diff --git a/app/presenters/domain_presenter.rb b/app/presenters/domain_presenter.rb
index 9597330b8..cf117a1fb 100644
--- a/app/presenters/domain_presenter.rb
+++ b/app/presenters/domain_presenter.rb
@@ -23,7 +23,7 @@ class DomainPresenter
   end
 
   def force_delete_date
-    view.l(domain.force_delete_time, format: :date) if domain.force_delete_time
+    view.l(domain.force_delete_at, format: :date) if domain.force_delete_at
   end
 
   def admin_contact_names
diff --git a/app/views/admin/domains/partials/_general.html.erb b/app/views/admin/domains/partials/_general.html.erb
index eeeef6eb5..0c2da7bbd 100644
--- a/app/views/admin/domains/partials/_general.html.erb
+++ b/app/views/admin/domains/partials/_general.html.erb
@@ -34,8 +34,8 @@
             <dt><%= t('.delete_time') %></dt>
             <dd><%= l(@domain.delete_at) %></dd>
 
-            <dt><%= t('.force_delete_time') %></dt>
-            <dd><%= l(@domain.force_delete_at) %></dd>
+            <dt><%= Domain.human_attribute_name :force_delete_at %></dt>
+            <dd><%= l @domain.force_delete_at %></dd>
         </dl>
     </div>
 </div>
diff --git a/config/locales/admin/domains.en.yml b/config/locales/admin/domains.en.yml
index 200657d01..8d66347ae 100644
--- a/config/locales/admin/domains.en.yml
+++ b/config/locales/admin/domains.en.yml
@@ -29,7 +29,6 @@ en:
         general:
           outzone_time: Outzone time
           delete_time: Delete time
-          force_delete_time: Force delete time
 
         admin_contacts:
           title: Admin. contacts
diff --git a/spec/models/concerns/domain/force_delete_spec.rb b/spec/models/concerns/domain/force_delete_spec.rb
index cc022a6d7..8a82faa8e 100644
--- a/spec/models/concerns/domain/force_delete_spec.rb
+++ b/spec/models/concerns/domain/force_delete_spec.rb
@@ -1,8 +1,6 @@
 require 'rails_helper'
 
 RSpec.describe Domain do
-  it { is_expected.to alias_attribute(:force_delete_time, :force_delete_at) }
-
   before :example do
     create(:zone, origin: 'ee')
   end
diff --git a/spec/presenters/domain_presenter_spec.rb b/spec/presenters/domain_presenter_spec.rb
index 3726960b4..c83ca58ca 100644
--- a/spec/presenters/domain_presenter_spec.rb
+++ b/spec/presenters/domain_presenter_spec.rb
@@ -63,7 +63,7 @@ RSpec.describe DomainPresenter do
     subject(:force_delete_date) { presenter.force_delete_date }
 
     context 'when present' do
-      let(:domain) { instance_double(Domain, force_delete_time: '05.07.2010') }
+      let(:domain) { instance_double(Domain, force_delete_at: '05.07.2010') }
 
       it 'returns localized date' do
         expect(view).to receive(:l).with('05.07.2010', format: :date).and_return('delete date')
@@ -72,7 +72,7 @@ RSpec.describe DomainPresenter do
     end
 
     context 'when absent' do
-      let(:domain) { instance_double(Domain, force_delete_time: nil) }
+      let(:domain) { instance_double(Domain, force_delete_at: nil) }
 
       specify { expect(force_delete_date).to be_nil }
     end