zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-18 18:29:40 +02:00
Code Issues Projects Releases Packages Wiki Activity

Rubocop updates

Browse source
This commit is contained in:
Priit Tark 2015-08-11 10:31:25 +03:00
parent 17eec8e298
commit 7e340415e1
6 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/admin/domain_versions_controller.rb
View file

@ -1,6 +1,7 @@
class Admin::DomainVersionsController < AdminController class Admin::DomainVersionsController < AdminController
load_and_authorize_resource load_and_authorize_resource
# rubocop:disable Style/GuardClause
def index def index
@domain = Domain.find(params[:domain_id]) @domain = Domain.find(params[:domain_id])
@versions = @domain.versions @versions = @domain.versions
@ -11,6 +12,7 @@ class Admin::DomainVersionsController < AdminController
@pending_domain = Epp::Domain.new_from_epp(frame, @pending_user) @pending_domain = Epp::Domain.new_from_epp(frame, @pending_user)
end end
end end
# rubocop:enable Style/GuardClause
# def index # def index
# # @q = DomainVersion.deleted.search(params[:q]) # # @q = DomainVersion.deleted.search(params[:q])

1
app/controllers/admin/pricelists_controller.rb
View file

@ -51,5 +51,4 @@ class Admin::PricelistsController < AdminController
params.require(:pricelist).permit(:operation_category, :category, :price_category, params.require(:pricelist).permit(:operation_category, :category, :price_category,
:duration, :price, :valid_from, :valid_to) :duration, :price, :valid_from, :valid_to)
end end
end end

2
app/helpers/application_helper.rb
View file

@ -48,7 +48,7 @@ module ApplicationHelper
def currency(amount) def currency(amount)
amount ||= 0 amount ||= 0
("%01.2f" % amount.round(2)).sub(/\./, ',') format("%01.2f", amount.round(2)).sub(/\./, ',')
end end
def plain_username(username) def plain_username(username)

2
app/models/domain.rb
View file

@ -546,6 +546,7 @@ class Domain < ActiveRecord::Base
self.delete_at = outzone_at + Setting.redemption_grace_period.days self.delete_at = outzone_at + Setting.redemption_grace_period.days
end end
# rubocop:disable Metrics/AbcSize
def set_force_delete def set_force_delete
self.statuses_backup = statuses self.statuses_backup = statuses
statuses.delete(DomainStatus::CLIENT_DELETE_PROHIBITED) 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 self.force_delete_at = Time.zone.now + Setting.redemption_grace_period.days unless force_delete_at
save(validate: false) save(validate: false)
end end
# rubocop:enable Metrics/AbcSize
def unset_force_delete def unset_force_delete
s = [] s = []

2
spec/models/domain_spec.rb
View file

@ -239,7 +239,7 @@ describe Domain do
DomainStatus::CLIENT_HOLD, DomainStatus::CLIENT_HOLD,
DomainStatus::EXPIRED, DomainStatus::EXPIRED,
DomainStatus::SERVER_HOLD, DomainStatus::SERVER_HOLD,
DomainStatus::DELETE_CANDIDATE, DomainStatus::DELETE_CANDIDATE
] ]
@domain.save @domain.save

4
spec/models/zonefile_setting_spec.rb
View file

@ -41,7 +41,9 @@ describe ZonefileSetting do
it 'should not place serverHold nor clientHold domains into zonefile' do it 'should not place serverHold nor clientHold domains into zonefile' do
Fabricate(:zonefile_setting) 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({ d.nameservers << Nameserver.new({
hostname: "ns.#{d.name}", hostname: "ns.#{d.name}",
ipv4: '123.123.123.123', ipv4: '123.123.123.123',