From d83e11a85db68bdaf0ae99c438fe064dd845398f Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 6 Jun 2018 07:21:30 +0300 Subject: [PATCH] Remove unused methods --- app/models/domain.rb | 15 --------------- app/models/domain_cron.rb | 2 +- spec/models/domain_spec.rb | 32 -------------------------------- 3 files changed, 1 insertion(+), 48 deletions(-) diff --git a/app/models/domain.rb b/app/models/domain.rb index 55596aedf..1486bf5e5 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -199,21 +199,6 @@ class Domain < ActiveRecord::Base statuses.include? DomainStatus::SERVER_TECH_CHANGE_PROHIBITED end - def self.clean_expired_pendings - 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__) - end - - def self.destroy_delete_candidates - ActiveSupport::Deprecation.instance.deprecation_warning(DomainCron, __method__) - DomainCron.send(__method__) - end - class << self def nameserver_required? Setting.nameserver_required diff --git a/app/models/domain_cron.rb b/app/models/domain_cron.rb index fb3b7644d..80bf32c5a 100644 --- a/app/models/domain_cron.rb +++ b/app/models/domain_cron.rb @@ -92,7 +92,7 @@ class DomainCron if domain.save(validate: false) ::PaperTrail.whodunnit = "cron - #{__method__}" DomainDeleteJob.enqueue(domain.id, run_at: rand(((24*60) - (DateTime.now.hour * 60 + DateTime.now.minute))).minutes.from_now) - STDOUT << "#{Time.zone.now.utc} Domain.destroy_delete_candidates: job added by deleteCandidate status ##{domain.id} (#{domain.name})\n" unless Rails.env.test? + STDOUT << "#{Time.zone.now.utc} DomainCron.destroy_delete_candidates: job added by deleteCandidate status ##{domain.id} (#{domain.name})\n" unless Rails.env.test? c += 1 end end diff --git a/spec/models/domain_spec.rb b/spec/models/domain_spec.rb index cc1fe52a2..6b282d651 100644 --- a/spec/models/domain_spec.rb +++ b/spec/models/domain_spec.rb @@ -108,30 +108,6 @@ RSpec.describe Domain do @domain.registrant_update_confirmable?('123').should == false end - it 'should not find any domain pendings to clean' do - Domain.clean_expired_pendings.should == 0 - end - - it 'should not find any domains with wrong pendings' do - domain = create(:domain) - domain.registrant_verification_asked!('frame-str', '1') - domain.registrant_verification_asked_at = 30.days.ago - domain.save - - Domain.clean_expired_pendings.should == 0 - end - - it 'should clean domain pendings' do - domain = create(:domain) - domain.registrant_verification_asked!('frame-str', '1') - domain.registrant_verification_asked_at = 30.days.ago - domain.pending_delete! - - DomainCron.clean_expired_pendings.should == 1 - domain.reload.pending_delete?.should == false - domain.pending_json.should == {} - end - it 'should expire domains' do Setting.expire_warning_period = 1 Setting.redemption_grace_period = 1 @@ -164,14 +140,6 @@ RSpec.describe Domain do @domain.statuses.include?(DomainStatus::EXPIRED).should == true end - it 'should start redemption grace period' do - domain = create(:domain) - - DomainCron.start_redemption_grace_period - domain.reload - domain.statuses.include?(DomainStatus::SERVER_HOLD).should == false - end - context 'with time period settings' do before :example do @save_days_to_renew = Setting.days_to_renew_domain_before_expire