diff --git a/app/models/domain.rb b/app/models/domain.rb index 7f2380abf..db0f15d2c 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -210,11 +210,6 @@ class Domain < ActiveRecord::Base DomainCron.send(__method__) end - def self.start_expire_period - ActiveSupport::Deprecation.instance.deprecation_warning(DomainCron, __method__) - DomainCron.send(__method__) - end - def self.start_redemption_grace_period ActiveSupport::Deprecation.instance.deprecation_warning(DomainCron, __method__) DomainCron.send(__method__) diff --git a/spec/models/domain_cron_spec.rb b/spec/models/domain_cron_spec.rb new file mode 100644 index 000000000..505b3dc1d --- /dev/null +++ b/spec/models/domain_cron_spec.rb @@ -0,0 +1,41 @@ +require 'rails_helper' + +RSpec.describe DomainCron do + before :example do + Fabricate(:zonefile_setting, origin: 'ee') + + @domain = Fabricate(:domain) + end + + it 'should expire domains' do + Setting.expire_warning_period = 1 + Setting.redemption_grace_period = 1 + + described_class.start_expire_period + @domain.statuses.include?(DomainStatus::EXPIRED).should == false + + old_valid_to = Time.zone.now - 10.days + @domain.valid_to = old_valid_to + @domain.save + + described_class.start_expire_period + @domain.reload + @domain.statuses.include?(DomainStatus::EXPIRED).should == true + + described_class.start_expire_period + @domain.reload + @domain.statuses.include?(DomainStatus::EXPIRED).should == true + end + + it 'should start redemption grace period' 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.save + + described_class.start_expire_period + @domain.reload + @domain.statuses.include?(DomainStatus::EXPIRED).should == true + end +end diff --git a/spec/models/domain_spec.rb b/spec/models/domain_spec.rb index a8384372c..f47128759 100644 --- a/spec/models/domain_spec.rb +++ b/spec/models/domain_spec.rb @@ -148,38 +148,6 @@ RSpec.describe Domain do domain.pending_json.should == {} end - it 'should expire domains' do - Setting.expire_warning_period = 1 - Setting.redemption_grace_period = 1 - - DomainCron.start_expire_period - @domain.statuses.include?(DomainStatus::EXPIRED).should == false - - old_valid_to = Time.zone.now - 10.days - @domain.valid_to = old_valid_to - @domain.save - - DomainCron.start_expire_period - @domain.reload - @domain.statuses.include?(DomainStatus::EXPIRED).should == true - - DomainCron.start_expire_period - @domain.reload - @domain.statuses.include?(DomainStatus::EXPIRED).should == true - end - - it 'should start redemption grace period' 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.save - - DomainCron.start_expire_period - @domain.reload - @domain.statuses.include?(DomainStatus::EXPIRED).should == true - end - it 'should start redemption grace period' do DomainCron.start_redemption_grace_period @domain.reload