zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-06-11 07:04:47 +02:00
Code Issues Projects Releases Packages Wiki Activity

Remove unneeded attribute alias

Browse source 
#791
This commit is contained in:
Artur Beljajev 2018-04-08 22:55:53 +03:00
parent f7c2b25a66
commit 3dd17f83f3
6 changed files with 5 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/concerns/domain/force_delete.rb
View file

@ -1,10 +1,6 @@
module Concerns::Domain::ForceDelete module Concerns::Domain::ForceDelete
extend ActiveSupport::Concern extend ActiveSupport::Concern
included do
alias_attribute :force_delete_time, :force_delete_at
end
def force_delete_scheduled? def force_delete_scheduled?
statuses.include?(DomainStatus::FORCE_DELETE) statuses.include?(DomainStatus::FORCE_DELETE)
end end

2
app/presenters/domain_presenter.rb
View file

@ -23,7 +23,7 @@ class DomainPresenter
end end
def force_delete_date 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 end
def admin_contact_names def admin_contact_names

4
app/views/admin/domains/partials/_general.html.erb
View file

@ -34,8 +34,8 @@
<dt><%= t('.delete_time') %></dt> <dt><%= t('.delete_time') %></dt>
<dd><%= l(@domain.delete_at) %></dd> <dd><%= l(@domain.delete_at) %></dd>
<dt><%= t('.force_delete_time') %></dt> <dt><%= Domain.human_attribute_name :force_delete_at %></dt>
<dd><%= l(@domain.force_delete_at) %></dd> <dd><%= l @domain.force_delete_at %></dd>
</dl> </dl>
</div> </div>
</div> </div>

1
config/locales/admin/domains.en.yml
View file

@ -29,7 +29,6 @@ en:
general: general:
outzone_time: Outzone time outzone_time: Outzone time
delete_time: Delete time delete_time: Delete time
force_delete_time: Force delete time
admin_contacts: admin_contacts:
title: Admin. contacts title: Admin. contacts

2
spec/models/concerns/domain/force_delete_spec.rb
View file

@ -1,8 +1,6 @@
require 'rails_helper' require 'rails_helper'
RSpec.describe Domain do RSpec.describe Domain do
it { is_expected.to alias_attribute(:force_delete_time, :force_delete_at) }
before :example do before :example do
create(:zone, origin: 'ee') create(:zone, origin: 'ee')
end end

4
spec/presenters/domain_presenter_spec.rb
View file

@ -63,7 +63,7 @@ RSpec.describe DomainPresenter do
subject(:force_delete_date) { presenter.force_delete_date } subject(:force_delete_date) { presenter.force_delete_date }
context 'when present' do 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 it 'returns localized date' do
expect(view).to receive(:l).with('05.07.2010', format: :date).and_return('delete date') expect(view).to receive(:l).with('05.07.2010', format: :date).and_return('delete date')
@ -72,7 +72,7 @@ RSpec.describe DomainPresenter do
end end
context 'when absent' do 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 } specify { expect(force_delete_date).to be_nil }
end end