Change domains.delete_at database column type to date, rename to

`delete_date`

Closes #1125
This commit is contained in:
Artur Beljajev 2019-03-28 17:36:38 +02:00
parent ab9c5c45de
commit cea834d5b7
31 changed files with 159 additions and 71 deletions

View file

@ -31,7 +31,7 @@ RSpec.describe DomainCron do
old_valid_to = Time.zone.now - 10.days
@domain.valid_to = old_valid_to
@domain.statuses = [DomainStatus::EXPIRED]
@domain.outzone_at, @domain.delete_at = nil, nil
@domain.outzone_at, @domain.delete_date = nil, nil
@domain.save
described_class.start_expire_period

View file

@ -132,7 +132,7 @@ RSpec.describe Domain do
old_valid_to = Time.zone.now - 10.days
@domain.valid_to = old_valid_to
@domain.statuses = [DomainStatus::EXPIRED]
@domain.outzone_at, @domain.delete_at = nil, nil
@domain.outzone_at, @domain.delete_date = nil, nil
@domain.save
DomainCron.start_expire_period
@ -711,8 +711,8 @@ RSpec.describe Domain do
expect(domain.outzone_at).to eq(Time.zone.parse('06.07.2010 10:30'))
end
it 'sets :delete_at to :outzone_at + redemption grace period' do
expect(domain.delete_at).to eq(Time.zone.parse('08.07.2010 10:30'))
it 'sets :delete_date to :outzone_at + redemption grace period' do
expect(domain.delete_date).to eq(Date.parse('08.07.2010'))
end
end

View file

@ -44,16 +44,16 @@ RSpec.describe DomainPresenter do
subject(:delete_date) { presenter.delete_date }
context 'when present' do
let(:domain) { instance_double(Domain, delete_at: '05.07.2010') }
let(:domain) { instance_double(Domain, delete_date: '05.07.2010') }
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').and_return('delete date')
expect(delete_date).to eq('delete date')
end
end
context 'when absent' do
let(:domain) { instance_double(Domain, delete_at: nil) }
let(:domain) { instance_double(Domain, delete_date: nil) }
specify { expect(delete_date).to be_nil }
end