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

Merge branch 'master' of github.com:internetee/registry

Browse source
This commit is contained in:
Martin Lensment 2014-08-28 18:10:13 +03:00
commit c1b24d6b71
6 changed files with 148 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.rubocop.yml
View file

@ -35,3 +35,6 @@ Style/IndentHash:
Style/SingleLineBlockParams: Style/SingleLineBlockParams:
Enabled: false Enabled: false
# No need for nested module/class definition as far as I know
Style/ClassAndModuleChildren:
Enabled: false

2
Gemfile
View file

@ -71,7 +71,7 @@ group :development, :test do
gem 'capybara', '~> 2.4.1' gem 'capybara', '~> 2.4.1'
# For feature testing # For feature testing
# gem 'capybara-webkit', '1.2.0' # Webkit driver didn't work with turbolinks # gem 'capybara-webkit', '1.2.0' # Webkit driver didn't work with turbolinks
gem 'phantomjs', :require => 'phantomjs/poltergeist' gem 'phantomjs', require: 'phantomjs/poltergeist'
gem 'poltergeist', '~> 1.5.1' # We are using PhantomJS instead gem 'poltergeist', '~> 1.5.1' # We are using PhantomJS instead
# For cleaning db in feature and epp tests # For cleaning db in feature and epp tests

4
app/helpers/epp/contacts_helper.rb
View file

@ -1,5 +1,4 @@
module Epp module Epp::ContactsHelper
module ContactsHelper
def create_contact def create_contact
@contact = Contact.new(contact_and_address_attributes) @contact = Contact.new(contact_and_address_attributes)
render '/epp/contacts/create' and return if stamp(@contact) && @contact.save render '/epp/contacts/create' and return if stamp(@contact) && @contact.save
@ -147,5 +146,4 @@ module Epp
Contact::IDENT_TYPES.any? { |type| return type if result.include?(type) } Contact::IDENT_TYPES.any? { |type| return type if result.include?(type) }
nil nil
end end
end
end end

6
app/models/address.rb
View file

@ -20,9 +20,9 @@ class Address < ActiveRecord::Base
parsed_frame.css('postalInfo').each do |pi| parsed_frame.css('postalInfo').each do |pi|
attr = pi.attributes['type'].try(:value) attr = pi.attributes['type'].try(:value)
errors << { code: 2003, msg: I18n.t('errors.messages.attr_missing', key: 'type')} and next unless attr errors << { code: 2003, msg: I18n.t('errors.messages.attr_missing', key: 'type') } and next unless attr
if !TYPES.include?(attr) unless TYPES.include?(attr)
errors << { code: 2005, msg: I18n.t('errors.messages.invalid_type'), value: { obj: 'type', val: attr }} errors << { code: 2005, msg: I18n.t('errors.messages.invalid_type'), value: { obj: 'type', val: attr } }
next next
end end
errors << { code: 2005, msg: I18n.t('errors.messages.repeating_postal_info') } and next if used.include?(attr) errors << { code: 2005, msg: I18n.t('errors.messages.repeating_postal_info') } and next if used.include?(attr)

2
app/models/contact.rb
View file

@ -97,7 +97,7 @@ class Contact < ActiveRecord::Base
destroy destroy
end end
def epp_code_map def epp_code_map # rubocop:disable Metrics/MethodLength
{ {
'2302' => [ # Object exists '2302' => [ # Object exists
[:code, :epp_id_taken] [:code, :epp_id_taken]

2
app/models/domain.rb
View file

@ -285,7 +285,7 @@ class Domain < ActiveRecord::Base
add_epp_error('2306', 'curExpDate', cur_exp_date, I18n.t('errors.messages.epp_exp_dates_do_not_match')) add_epp_error('2306', 'curExpDate', cur_exp_date, I18n.t('errors.messages.epp_exp_dates_do_not_match'))
end end
def epp_code_map def epp_code_map # rubocop:disable Metrics/MethodLength
domain_validation_sg = SettingGroup.domain_validation domain_validation_sg = SettingGroup.domain_validation
{ {