mirror of
https://github.com/internetee/registry.git
synced 2025-05-17 09:57:23 +02:00
Rubocop style fixes
This commit is contained in:
parent
b8584de4d6
commit
ea2b64bc69
3 changed files with 15 additions and 18 deletions
|
@ -21,7 +21,7 @@ module Epp::ContactsHelper
|
||||||
# rubocop:disable Metrics/CyclomaticComplexity
|
# rubocop:disable Metrics/CyclomaticComplexity
|
||||||
def delete_contact
|
def delete_contact
|
||||||
@contact = find_contact
|
@contact = find_contact
|
||||||
handle_errors(@contact) and return unless rights? #owner?
|
handle_errors(@contact) and return unless rights? # owner?
|
||||||
handle_errors(@contact) and return unless @contact
|
handle_errors(@contact) and return unless @contact
|
||||||
handle_errors(@contact) and return unless @contact.destroy_and_clean
|
handle_errors(@contact) and return unless @contact.destroy_and_clean
|
||||||
|
|
||||||
|
@ -54,15 +54,14 @@ module Epp::ContactsHelper
|
||||||
def validate_contact_create_request
|
def validate_contact_create_request
|
||||||
@ph = params_hash['epp']['command']['create']['create']
|
@ph = params_hash['epp']['command']['create']['create']
|
||||||
return false unless validate_params
|
return false unless validate_params
|
||||||
#xml_attrs_present?(@ph, [%w(postalInfo)])
|
# xml_attrs_present?(@ph, [%w(postalInfo)])
|
||||||
xml_attrs_present?(@ph, [%w(postalInfo name), %w(postalInfo addr city), %w(postalInfo addr cc),
|
xml_attrs_present?(@ph, [%w(postalInfo name), %w(postalInfo addr city), %w(postalInfo addr cc),
|
||||||
%w(ident), %w(voice), %w(email)])
|
%w(ident), %w(voice), %w(email)])
|
||||||
|
|
||||||
|
epp_errors.empty? # unless @ph['postalInfo'].is_a?(Hash) || @ph['postalInfo'].is_a?(Array)
|
||||||
return epp_errors.empty? #unless @ph['postalInfo'].is_a?(Hash) || @ph['postalInfo'].is_a?(Array)
|
|
||||||
|
|
||||||
# (epp_errors << Address.validate_postal_info_types(parsed_frame)).flatten!
|
# (epp_errors << Address.validate_postal_info_types(parsed_frame)).flatten!
|
||||||
#xml_attrs_array_present?(@ph['postalInfo'], [%w(name), %w(addr city), %w(addr cc)])
|
# xml_attrs_array_present?(@ph['postalInfo'], [%w(name), %w(addr city), %w(addr cc)])
|
||||||
end
|
end
|
||||||
|
|
||||||
## UPDATE
|
## UPDATE
|
||||||
|
|
|
@ -102,7 +102,7 @@ describe 'EPP Contact', epp: true do
|
||||||
context 'update command' do
|
context 'update command' do
|
||||||
it 'fails if request is invalid' do
|
it 'fails if request is invalid' do
|
||||||
xml = EppXml::Contact.update
|
xml = EppXml::Contact.update
|
||||||
response = epp_request(xml, :xml) #epp_request('contacts/update_missing_attr.xml')
|
response = epp_request(xml, :xml) # epp_request('contacts/update_missing_attr.xml')
|
||||||
|
|
||||||
expect(response[:results][0][:result_code]).to eq('2003')
|
expect(response[:results][0][:result_code]).to eq('2003')
|
||||||
expect(response[:results][0][:msg]).to eq('Required parameter missing: add, rem or chg')
|
expect(response[:results][0][:msg]).to eq('Required parameter missing: add, rem or chg')
|
||||||
|
@ -116,7 +116,7 @@ describe 'EPP Contact', epp: true do
|
||||||
it 'fails with wrong authentication info' do
|
it 'fails with wrong authentication info' do
|
||||||
Fabricate(:contact, code: 'sh8013', auth_info: 'password_wrong')
|
Fabricate(:contact, code: 'sh8013', auth_info: 'password_wrong')
|
||||||
|
|
||||||
response = epp_request(update_contact_xml({id: { value: 'sh8013'}}), :xml, :elkdata ) #('contacts/update.xml')
|
response = epp_request(update_contact_xml({ id: { value: 'sh8013' } }), :xml, :elkdata)
|
||||||
|
|
||||||
expect(response[:msg]).to eq('Authorization error')
|
expect(response[:msg]).to eq('Authorization error')
|
||||||
expect(response[:result_code]).to eq('2201')
|
expect(response[:result_code]).to eq('2201')
|
||||||
|
@ -131,7 +131,7 @@ describe 'EPP Contact', epp: true do
|
||||||
code: 'sh8013',
|
code: 'sh8013',
|
||||||
auth_info: 'password'
|
auth_info: 'password'
|
||||||
)
|
)
|
||||||
response = epp_request(update_contact_xml({id: { value: 'sh8013' }}), :xml)
|
response = epp_request(update_contact_xml({ id: { value: 'sh8013' } }), :xml)
|
||||||
|
|
||||||
expect(response[:msg]).to eq('Command completed successfully')
|
expect(response[:msg]).to eq('Command completed successfully')
|
||||||
expect(Contact.first.name).to eq('John Doe Edited')
|
expect(Contact.first.name).to eq('John Doe Edited')
|
||||||
|
@ -226,7 +226,7 @@ describe 'EPP Contact', epp: true do
|
||||||
|
|
||||||
context 'check command' do
|
context 'check command' do
|
||||||
it 'fails if request is invalid' do
|
it 'fails if request is invalid' do
|
||||||
xml = EppXml::Contact.check( { uid: { value: '123asde' } } )
|
xml = EppXml::Contact.check({ uid: { value: '123asde' } })
|
||||||
response = epp_request(xml, :xml)
|
response = epp_request(xml, :xml)
|
||||||
|
|
||||||
expect(response[:results][0][:result_code]).to eq('2003')
|
expect(response[:results][0][:result_code]).to eq('2003')
|
||||||
|
@ -253,7 +253,7 @@ describe 'EPP Contact', epp: true do
|
||||||
|
|
||||||
context 'info command' do
|
context 'info command' do
|
||||||
it 'fails if request invalid' do
|
it 'fails if request invalid' do
|
||||||
response = epp_request(EppXml::Contact.info({ uid: { value: '123123' }}), :xml )
|
response = epp_request(EppXml::Contact.info({ uid: { value: '123123' } }), :xml)
|
||||||
|
|
||||||
expect(response[:results][0][:result_code]).to eq('2003')
|
expect(response[:results][0][:result_code]).to eq('2003')
|
||||||
expect(response[:results][0][:msg]).to eq('Required parameter missing: id')
|
expect(response[:results][0][:msg]).to eq('Required parameter missing: id')
|
||||||
|
@ -285,7 +285,7 @@ describe 'EPP Contact', epp: true do
|
||||||
pending 'Disclosure needs to have some of the details worked out'
|
pending 'Disclosure needs to have some of the details worked out'
|
||||||
Fabricate(:contact, code: 'info-4444', auth_info: '2fooBAR',
|
Fabricate(:contact, code: 'info-4444', auth_info: '2fooBAR',
|
||||||
disclosure: Fabricate(:contact_disclosure, email: false, phone: false))
|
disclosure: Fabricate(:contact_disclosure, email: false, phone: false))
|
||||||
response = epp_request(info_contact_xml( id: { value: 'info-4444' } ), :xml)
|
response = epp_request(info_contact_xml(id: { value: 'info-4444' }), :xml)
|
||||||
contact = response[:parsed].css('resData chkData')
|
contact = response[:parsed].css('resData chkData')
|
||||||
|
|
||||||
expect(response[:result_code]).to eq('1000')
|
expect(response[:result_code]).to eq('1000')
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
module EppContactXmlHelper
|
module EppContactXmlHelper
|
||||||
def create_contact_xml(xml_params={})
|
def create_contact_xml(xml_params = {})
|
||||||
defaults = {
|
defaults = {
|
||||||
postalInfo: {
|
postalInfo: {
|
||||||
name: { value: 'John Doe' },
|
name: { value: 'John Doe' },
|
||||||
|
@ -18,7 +18,7 @@ module EppContactXmlHelper
|
||||||
EppXml::Contact.create(xml_params)
|
EppXml::Contact.create(xml_params)
|
||||||
end
|
end
|
||||||
|
|
||||||
def update_contact_xml(xml_params={})
|
def update_contact_xml(xml_params = {})
|
||||||
defaults = {
|
defaults = {
|
||||||
id: { value: 'asd123123er' },
|
id: { value: 'asd123123er' },
|
||||||
authInfo: { pw: { value: 'password' } },
|
authInfo: { pw: { value: 'password' } },
|
||||||
|
@ -34,19 +34,19 @@ module EppContactXmlHelper
|
||||||
EppXml::Contact.update(xml_params)
|
EppXml::Contact.update(xml_params)
|
||||||
end
|
end
|
||||||
|
|
||||||
def delete_contact_xml(xml_params={})
|
def delete_contact_xml(xml_params = {})
|
||||||
defaults = { id: { value: 'sh8012' } }
|
defaults = { id: { value: 'sh8012' } }
|
||||||
xml_params = defaults.deep_merge(xml_params)
|
xml_params = defaults.deep_merge(xml_params)
|
||||||
EppXml::Contact.delete(xml_params)
|
EppXml::Contact.delete(xml_params)
|
||||||
end
|
end
|
||||||
|
|
||||||
def info_contact_xml(xml_params={})
|
def info_contact_xml(xml_params = {})
|
||||||
defaults = { id: { value: 'sh8012' }, authInfo: { pw: { value: 'password' } } }
|
defaults = { id: { value: 'sh8012' }, authInfo: { pw: { value: 'password' } } }
|
||||||
xml_params = defaults.deep_merge(xml_params)
|
xml_params = defaults.deep_merge(xml_params)
|
||||||
EppXml::Contact.info(xml_params)
|
EppXml::Contact.info(xml_params)
|
||||||
end
|
end
|
||||||
|
|
||||||
def check_contact_xml(xml_params={})
|
def check_contact_xml(xml_params = {})
|
||||||
defaults = {
|
defaults = {
|
||||||
id: { value: 'ad123c3' }
|
id: { value: 'ad123c3' }
|
||||||
}
|
}
|
||||||
|
@ -69,10 +69,8 @@ module EppContactXmlHelper
|
||||||
</command>
|
</command>
|
||||||
</epp>'
|
</epp>'
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
RSpec.configure do |c|
|
RSpec.configure do |c|
|
||||||
c.include EppContactXmlHelper
|
c.include EppContactXmlHelper
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue