From 5f77c633322445ff3d43831182fc3dbd869d2252 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 30 Jan 2017 14:13:21 +0200 Subject: [PATCH] Extract domain's "delete_time" attribute to deletable concern --- app/models/concerns/domain/deletable.rb | 4 ++++ spec/models/concerns/domain/deletable_spec.rb | 2 ++ spec/models/domain_spec.rb | 1 - 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/models/concerns/domain/deletable.rb b/app/models/concerns/domain/deletable.rb index aa4c8d47d..f724162e5 100644 --- a/app/models/concerns/domain/deletable.rb +++ b/app/models/concerns/domain/deletable.rb @@ -1,6 +1,10 @@ module Concerns::Domain::Deletable extend ActiveSupport::Concern + included do + alias_attribute :delete_time, :delete_at + end + def discarded? statuses.include?(DomainStatus::DELETE_CANDIDATE) end diff --git a/spec/models/concerns/domain/deletable_spec.rb b/spec/models/concerns/domain/deletable_spec.rb index 6214368b7..826299b69 100644 --- a/spec/models/concerns/domain/deletable_spec.rb +++ b/spec/models/concerns/domain/deletable_spec.rb @@ -1,6 +1,8 @@ require 'rails_helper' RSpec.describe Domain, db: false do + it { is_expected.to alias_attribute(:delete_time, :delete_at) } + describe '#discarded?' do context 'when :deleteCandidate status is present' do let(:domain) { described_class.new(statuses: [DomainStatus::DELETE_CANDIDATE]) } diff --git a/spec/models/domain_spec.rb b/spec/models/domain_spec.rb index 555cf48e1..74207e077 100644 --- a/spec/models/domain_spec.rb +++ b/spec/models/domain_spec.rb @@ -699,7 +699,6 @@ end RSpec.describe Domain, db: false do it { is_expected.to alias_attribute(:on_hold_time, :outzone_at) } - it { is_expected.to alias_attribute(:delete_time, :delete_at) } it { is_expected.to alias_attribute(:force_delete_time, :force_delete_at) } it { is_expected.to alias_attribute(:outzone_time, :outzone_at) }