diff --git a/app/controllers/admin/domain_versions_controller.rb b/app/controllers/admin/domain_versions_controller.rb index 9700e26c1..ffb6b50e2 100644 --- a/app/controllers/admin/domain_versions_controller.rb +++ b/app/controllers/admin/domain_versions_controller.rb @@ -1,6 +1,7 @@ class Admin::DomainVersionsController < AdminController load_and_authorize_resource + # rubocop:disable Style/GuardClause def index @domain = Domain.find(params[:domain_id]) @versions = @domain.versions @@ -11,6 +12,7 @@ class Admin::DomainVersionsController < AdminController @pending_domain = Epp::Domain.new_from_epp(frame, @pending_user) end end + # rubocop:enable Style/GuardClause # def index # # @q = DomainVersion.deleted.search(params[:q]) diff --git a/app/controllers/admin/pricelists_controller.rb b/app/controllers/admin/pricelists_controller.rb index ce1431ab0..4de35c2c9 100644 --- a/app/controllers/admin/pricelists_controller.rb +++ b/app/controllers/admin/pricelists_controller.rb @@ -51,5 +51,4 @@ class Admin::PricelistsController < AdminController params.require(:pricelist).permit(:operation_category, :category, :price_category, :duration, :price, :valid_from, :valid_to) end - end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 6ab5fe4e8..7a75ff78f 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -48,7 +48,7 @@ module ApplicationHelper def currency(amount) amount ||= 0 - ("%01.2f" % amount.round(2)).sub(/\./, ',') + format("%01.2f", amount.round(2)).sub(/\./, ',') end def plain_username(username) diff --git a/app/models/domain.rb b/app/models/domain.rb index 3f06fe15b..af1a7240a 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -546,6 +546,7 @@ class Domain < ActiveRecord::Base self.delete_at = outzone_at + Setting.redemption_grace_period.days end + # rubocop:disable Metrics/AbcSize def set_force_delete self.statuses_backup = statuses statuses.delete(DomainStatus::CLIENT_DELETE_PROHIBITED) @@ -572,6 +573,7 @@ class Domain < ActiveRecord::Base self.force_delete_at = Time.zone.now + Setting.redemption_grace_period.days unless force_delete_at save(validate: false) end + # rubocop:enable Metrics/AbcSize def unset_force_delete s = [] diff --git a/spec/models/domain_spec.rb b/spec/models/domain_spec.rb index 1b9f7568f..a5a48ddb6 100644 --- a/spec/models/domain_spec.rb +++ b/spec/models/domain_spec.rb @@ -239,7 +239,7 @@ describe Domain do DomainStatus::CLIENT_HOLD, DomainStatus::EXPIRED, DomainStatus::SERVER_HOLD, - DomainStatus::DELETE_CANDIDATE, + DomainStatus::DELETE_CANDIDATE ] @domain.save diff --git a/spec/models/zonefile_setting_spec.rb b/spec/models/zonefile_setting_spec.rb index 9386c3b1d..9405aa063 100644 --- a/spec/models/zonefile_setting_spec.rb +++ b/spec/models/zonefile_setting_spec.rb @@ -41,7 +41,9 @@ describe ZonefileSetting do it 'should not place serverHold nor clientHold domains into zonefile' do Fabricate(:zonefile_setting) - d = Fabricate(:domain_with_dnskeys, name: 'testzone.ee', statuses: ['serverHold', 'serverDeleteProhibited', 'clientHold']) + d = Fabricate(:domain_with_dnskeys, + name: 'testzone.ee', + statuses: ['serverHold', 'serverDeleteProhibited', 'clientHold']) d.nameservers << Nameserver.new({ hostname: "ns.#{d.name}", ipv4: '123.123.123.123',