diff --git a/.travis.yml b/.travis.yml index bb74deecc..01373f29d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ language: ruby cache: bundler env: - DB=postgresql +bundler_args: --without development staging production before_install: - "wget -N http://chromedriver.storage.googleapis.com/2.43/chromedriver_linux64.zip -P ~/" - "unzip ~/chromedriver_linux64.zip -d ~/" @@ -9,8 +10,6 @@ before_install: - "sudo mv -f ~/chromedriver /usr/local/share/" - "sudo chmod +x /usr/local/share/chromedriver" - "sudo ln -s /usr/local/share/chromedriver /usr/local/bin/chromedriver" - - "bundle config set without 'development staging production'" - - "bundle config set deployment '[secure]'" before_script: - "cp config/application.yml.sample config/application.yml" - "echo \"openssl_config_path: 'test/fixtures/files/test_ca/openssl.cnf'\" >> config/application.yml" diff --git a/Gemfile b/Gemfile index 99091f556..f6c8a6397 100644 --- a/Gemfile +++ b/Gemfile @@ -11,12 +11,10 @@ gem 'uglifier' gem 'figaro', '1.1.1' # model related -gem 'activerecord-import' gem 'paper_trail', '~> 10.3' gem 'pg', '1.2.2' # 1.8 is for Rails < 5.0 gem 'ransack', '~> 2.3' -gem 'truemail', '~> 1.7' # validates email by regexp, mail server existence and address existence gem 'validates_email_format_of', '1.6.3' # validates email against RFC 2822 and RFC 3696 # 0.7.3 is the latest for Rails 4.2, however, it is absent on Rubygems server @@ -41,7 +39,7 @@ gem 'grape' # registry specfic gem 'data_migrate', '~> 6.1' gem 'isikukood' # for EE-id validation -gem 'simpleidn', '0.1.1' # For punycode +gem 'simpleidn', '0.0.9' # For punycode gem 'money-rails' gem 'whenever', '0.9.4', require: false @@ -69,7 +67,7 @@ gem 'e_invoice', github: 'internetee/e_invoice', branch: :master gem 'lhv', github: 'internetee/lhv', branch: :master gem 'domain_name' gem 'haml', '~> 5.0' -gem 'wkhtmltopdf-binary', '~> 0.12.5.1' +gem 'wkhtmltopdf-binary' gem 'directo', github: 'internetee/directo', branch: 'master' diff --git a/Gemfile.lock b/Gemfile.lock index e4ad26396..effb7ff38 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,7 +9,7 @@ GIT GIT remote: https://github.com/internetee/directo.git - revision: 8ff8a382d004ffb85722a6a7a68a020bd4d7159b + revision: bdfab4be20803c666dcefc9a9c607f915a056ac5 branch: master specs: directo (1.0.1) @@ -112,8 +112,6 @@ GEM activerecord (6.0.3.2) activemodel (= 6.0.3.2) activesupport (= 6.0.3.2) - activerecord-import (1.0.5) - activerecord (>= 3.2) activestorage (6.0.3.2) actionpack (= 6.0.3.2) activejob (= 6.0.3.2) @@ -127,18 +125,18 @@ GEM zeitwerk (~> 2.2, >= 2.2.2) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) - airbrake (10.0.5) + airbrake (10.0.1) airbrake-ruby (~> 4.13) - airbrake-ruby (4.15.0) + airbrake-ruby (4.13.0) rbtree3 (~> 0.5) akami (1.3.1) gyoku (>= 0.4.0) nokogiri - autodoc (0.7.4) + autodoc (0.7.3) actionpack activesupport (>= 3.0.0) rspec - autoprefixer-rails (9.8.4) + autoprefixer-rails (9.7.4) execjs bcrypt (3.1.13) bootsnap (1.4.6) @@ -147,8 +145,8 @@ GEM autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) builder (3.2.4) - cancancan (3.1.0) - capybara (3.33.0) + cancancan (3.0.2) + capybara (3.31.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) @@ -167,8 +165,8 @@ GEM execjs coffee-script-source (1.12.2) concurrent-ruby (1.1.6) - countries (3.0.1) - i18n_data (~> 0.10.0) + countries (3.0.0) + i18n_data (~> 0.8.0) sixarm_ruby_unaccent (~> 1.1) unicode_utils (~> 1.4) crack (0.4.3) @@ -178,23 +176,22 @@ GEM daemons-rails (1.2.1) daemons multi_json (~> 1.0) - data_migrate (6.3.0) + data_migrate (6.2.0) rails (>= 5.0) - database_cleaner (1.8.5) - devise (4.7.2) + database_cleaner (1.8.2) + devise (4.7.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) responders warden (~> 1.2.3) - diff-lcs (1.4.4) + diff-lcs (1.3) docile (1.3.2) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - dry-configurable (0.11.6) + dry-configurable (0.9.0) concurrent-ruby (~> 1.0) dry-core (~> 0.4, >= 0.4.7) - dry-equalizer (~> 0.2) dry-container (0.7.2) concurrent-ruby (~> 1.0) dry-configurable (~> 0.1, >= 0.1.3) @@ -202,11 +199,11 @@ GEM concurrent-ruby (~> 1.0) dry-equalizer (0.3.0) dry-inflector (0.2.0) - dry-logic (1.0.6) + dry-logic (1.0.5) concurrent-ruby (~> 1.0) dry-core (~> 0.2) dry-equalizer (~> 0.2) - dry-types (1.4.0) + dry-types (1.2.2) concurrent-ruby (~> 1.0) dry-container (~> 0.3) dry-core (~> 0.4, >= 0.4.4) @@ -216,12 +213,12 @@ GEM erubi (1.9.0) erubis (2.7.0) execjs (2.7.0) - ffi (1.13.1) + ffi (1.12.2) figaro (1.1.1) thor (~> 0.14) globalid (0.4.2) activesupport (>= 4.2.0) - grape (1.3.3) + grape (1.3.0) activesupport builder dry-types (>= 1.1) @@ -233,7 +230,7 @@ GEM haml (5.1.2) temple (>= 0.8.0) tilt - hashdiff (1.0.1) + hashdiff (1.0.0) hpricot (0.8.6) http-accept (1.7.0) http-cookie (1.0.3) @@ -244,10 +241,10 @@ GEM socksify i18n (1.8.3) concurrent-ruby (~> 1.0) - i18n_data (0.10.0) + i18n_data (0.8.0) isikukood (0.1.2) iso8601 (0.12.1) - jquery-rails (4.4.0) + jquery-rails (4.3.5) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -267,7 +264,7 @@ GEM kaminari-core (= 1.2.1) kaminari-core (1.2.1) keystores (0.4.0) - libxml-ruby (3.2.0) + libxml-ruby (3.1.0) listen (3.2.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) @@ -282,7 +279,7 @@ GEM method_source (0.8.2) mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2020.0512) + mime-types-data (3.2019.1009) mimemagic (0.3.5) mina (0.3.1) open4 (~> 1.3.4) @@ -292,7 +289,7 @@ GEM minitest (5.14.1) monetize (1.9.4) money (~> 6.12) - money (6.13.8) + money (6.13.7) i18n (>= 0.6.4, <= 2) money-rails (1.13.3) activesupport (>= 3.0) @@ -307,7 +304,7 @@ GEM mustermann (>= 1.0.0) netrc (0.11.0) nio4r (2.5.2) - nokogiri (1.10.10) + nokogiri (1.10.9) mini_portile2 (~> 2.4.0) nori (2.6.0) open4 (1.3.4) @@ -315,7 +312,7 @@ GEM paper_trail (10.3.1) activerecord (>= 4.2) request_store (~> 1.1) - pdfkit (0.8.4.3.1) + pdfkit (0.8.4.1) pg (1.2.2) polyamorous (2.3.2) activerecord (>= 5.2.1) @@ -323,7 +320,7 @@ GEM coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) - public_suffix (4.0.5) + public_suffix (4.0.3) puma (4.3.5) nio4r (~> 2.0) que (0.14.3) @@ -378,10 +375,10 @@ GEM ffi (~> 1.0) rbtree3 (0.6.0) rdoc (4.3.0) - regexp_parser (1.7.1) + regexp_parser (1.6.0) request_store (1.5.0) rack (>= 1.4) - responders (3.0.1) + responders (3.0.0) actionpack (>= 5.0) railties (>= 5.0) rest-client (2.1.0) @@ -393,21 +390,21 @@ GEM rspec-core (~> 3.9.0) rspec-expectations (~> 3.9.0) rspec-mocks (~> 3.9.0) - rspec-core (3.9.2) - rspec-support (~> 3.9.3) - rspec-expectations (3.9.2) + rspec-core (3.9.1) + rspec-support (~> 3.9.1) + rspec-expectations (3.9.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-mocks (3.9.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) - rspec-support (3.9.3) + rspec-support (3.9.2) ruby2_keywords (0.0.2) - rubyzip (2.3.0) + rubyzip (2.2.0) safe_yaml (1.0.5) sass-rails (6.0.0) sassc-rails (~> 2.1, >= 2.1.1) - sassc (2.4.0) + sassc (2.2.1) ffi (~> 1.9) sassc-rails (2.1.2) railties (>= 4.0.0) @@ -415,7 +412,7 @@ GEM sprockets (> 3.0) sprockets-rails tilt - savon (2.12.1) + savon (2.12.0) akami (~> 1.2) builder (>= 2.1.2) gyoku (~> 1.2) @@ -437,8 +434,7 @@ GEM json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) - simpleidn (0.1.1) - unf (~> 0.1.4) + simpleidn (0.0.9) sinatra (2.0.8.1) mustermann (~> 1.0) rack (~> 2.0) @@ -458,15 +454,13 @@ GEM thor (0.20.3) thread_safe (0.3.6) tilt (2.0.10) - truemail (1.8.0) - simpleidn (~> 0.1.1) tzinfo (1.2.7) thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext - unf_ext (0.0.7.7) + unf_ext (0.0.7.6) unicode_utils (1.4.0) validates_email_format_of (1.6.3) i18n @@ -475,11 +469,11 @@ GEM wasabi (3.5.0) httpi (~> 2.0) nokogiri (>= 1.4.2) - webdrivers (4.4.1) + webdrivers (4.2.0) nokogiri (~> 1.6) rubyzip (>= 1.3.0) selenium-webdriver (>= 3.0, < 4.0) - webmock (3.8.3) + webmock (3.8.0) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -488,7 +482,7 @@ GEM websocket-extensions (0.1.5) whenever (0.9.4) chronic (>= 0.6.3) - wkhtmltopdf-binary (0.12.5.4) + wkhtmltopdf-binary (0.12.5.1) xpath (3.2.0) nokogiri (~> 1.8) zeitwerk (2.3.1) @@ -497,7 +491,6 @@ PLATFORMS ruby DEPENDENCIES - activerecord-import airbrake autodoc bootsnap (>= 1.1.0) @@ -549,14 +542,13 @@ DEPENDENCIES select2-rails (= 3.5.9.3) selectize-rails (= 0.12.1) simplecov (= 0.17.1) - simpleidn (= 0.1.1) - truemail (~> 1.7) + simpleidn (= 0.0.9) uglifier validates_email_format_of (= 1.6.3) webdrivers webmock whenever (= 0.9.4) - wkhtmltopdf-binary (~> 0.12.5.1) + wkhtmltopdf-binary BUNDLED WITH 2.1.4 diff --git a/app/controllers/admin/contacts_controller.rb b/app/controllers/admin/contacts_controller.rb index 793fa1209..4eea4faad 100644 --- a/app/controllers/admin/contacts_controller.rb +++ b/app/controllers/admin/contacts_controller.rb @@ -13,10 +13,10 @@ module Admin search_params[:registrant_domains_id_not_null] = 1 end - contacts = Contact.includes(:registrar).joins(:registrar) - .select('contacts.*, registrars.name') + contacts = Contact.includes(:registrar).joins(:registrar).select('contacts.*, registrars.name') contacts = contacts.filter_by_states(params[:statuses_contains].join(',')) if params[:statuses_contains] - contacts = filter_by_flags(contacts) + contacts = contacts.where("ident_country_code is null or ident_country_code=''") if params[:only_no_country_code].eql?('1') + normalize_search_parameters do @q = contacts.search(search_params) @@ -26,14 +26,6 @@ module Admin @contacts = @contacts.per(params[:results_per_page]) if params[:results_per_page].to_i.positive? end - def filter_by_flags(contacts) - if params[:only_no_country_code].eql?('1') - contacts = contacts.where("ident_country_code is null or ident_country_code=''") - end - contacts = contacts.email_verification_failed if params[:email_verification_failed].eql?('1') - contacts - end - def search render json: Contact.search_by_query(params[:q]) end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 5c742afce..8de3fdc70 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -108,14 +108,4 @@ module ApplicationHelper def body_css_class [controller_path.split('/').map!(&:dasherize), action_name.dasherize, 'page'].join('-') end - - def verified_email_span(verification) - content_tag(:span, verification.email, class: verified_email_class(verification)) - end - - def verified_email_class(verification) - return 'text-danger' if verification.failed? - return 'text-primary' if verification.not_verified? - return 'text-success' if verification.verified? - end end diff --git a/app/jobs/verify_emails_job.rb b/app/jobs/verify_emails_job.rb deleted file mode 100644 index 75f4b7d91..000000000 --- a/app/jobs/verify_emails_job.rb +++ /dev/null @@ -1,45 +0,0 @@ -class VerifyEmailsJob < Que::Job - def run(verification_id) - email_address_verification = run_condition(EmailAddressVerification.find(verification_id)) - - return if email_address_verification.recently_verified? - - ActiveRecord::Base.transaction do - email_address_verification.verify - log_success(email_address_verification) - destroy - end - rescue StandardError => e - log_error(verification: email_address_verification, error: e) - raise e - end - - private - - def run_condition(email_address_verification) - destroy unless email_address_verification - destroy if email_address_verification.recently_verified? - - email_address_verification - end - - def logger - @logger ||= Logger.new(Rails.root.join('log', 'email_verification.log')) - end - - def log_success(verification) - email = verification.try(:email) || verification - message = "Email address #{email} verification done" - logger.info message - end - - def log_error(verification:, error:) - email = verification.try(:email) || verification - message = <<~TEXT.squish - There was an error verifying email #{email}. - The error message was the following: #{error} - This job will retry. - TEXT - logger.error message - end -end diff --git a/app/models/concerns/email_verifable.rb b/app/models/concerns/email_verifable.rb deleted file mode 100644 index b4fbf74e3..000000000 --- a/app/models/concerns/email_verifable.rb +++ /dev/null @@ -1,89 +0,0 @@ -module Concerns - module EmailVerifable - extend ActiveSupport::Concern - - def email_verification - @email_verification ||= EmailAddressVerification.find_or_create_by(email: unicode_email, - domain: domain(email)) - end - - def billing_email_verification - return unless attribute_names.include?('billing_email') - - @billing_email_verification ||= EmailAddressVerification - .find_or_create_by(email: unicode_billing_email, - domain: domain(billing_email)) - end - - class_methods do - def domain(email) - Mail::Address.new(email).domain&.downcase || 'not_found' - rescue Mail::Field::IncompleteParseError - 'not_found' - end - - def local(email) - Mail::Address.new(email).local&.downcase || email - rescue Mail::Field::IncompleteParseError - email - end - - def punycode_to_unicode(email) - return email if domain(email) == 'not_found' - - local = local(email) - domain = SimpleIDN.to_unicode(domain(email)) - "#{local}@#{domain}"&.downcase - end - - def unicode_to_punycode(email) - return email if domain(email) == 'not_found' - - local = local(email) - domain = SimpleIDN.to_ascii(domain(email)) - "#{local}@#{domain}"&.downcase - end - end - - def unicode_billing_email - self.class.punycode_to_unicode(billing_email) - end - - def unicode_email - self.class.punycode_to_unicode(email) - end - - def domain(email) - SimpleIDN.to_unicode(self.class.domain(email)) - end - - def punycode_to_unicode(email) - self.class.punycode_to_unicode(email) - end - - def correct_email_format - return if email.blank? - - result = email_verification.verify - process_result(result: result, field: :email) - end - - def correct_billing_email_format - return if email.blank? - - result = billing_email_verification.verify - process_result(result: result, field: :billing_email) - end - - def process_result(result:, field:) - case result[:errors].keys.first - when :smtp - errors.add(field, I18n.t('email_verifable.email_smtp_check_error')) - when :mx - errors.add(field, I18n.t('email_verifable.email_mx_check_error')) - when :regex - errors.add(field, I18n.t('email_verifable.email_regex_check_error')) - end - end - end -end diff --git a/app/models/contact.rb b/app/models/contact.rb index ac64b059f..f07c0c114 100644 --- a/app/models/contact.rb +++ b/app/models/contact.rb @@ -7,7 +7,6 @@ class Contact < ApplicationRecord include Concerns::Contact::Transferable include Concerns::Contact::Identical include Concerns::Contact::Disclosable - include Concerns::EmailVerifable belongs_to :original, class_name: self.name belongs_to :registrar, required: true @@ -23,11 +22,6 @@ class Contact < ApplicationRecord accepts_nested_attributes_for :legal_documents - scope :email_verification_failed, lambda { - joins('LEFT JOIN email_address_verifications emv ON contacts.email = emv.email') - .where('success = false and verified_at IS NOT NULL') - } - validates :name, :email, presence: true validates :street, :city, :zip, :country_code, presence: true, if: lambda { self.class.address_processing? @@ -35,7 +29,8 @@ class Contact < ApplicationRecord validates :phone, presence: true, e164: true, phone: true - validate :correct_email_format, if: proc { |c| c.will_save_change_to_email? } + validates :email, format: /@/ + validates :email, email_format: { message: :invalid }, if: proc { |c| c.will_save_change_to_email? } validates :code, uniqueness: { message: :epp_id_taken }, diff --git a/app/models/email_address_verification.rb b/app/models/email_address_verification.rb deleted file mode 100644 index 2fe7c0dbe..000000000 --- a/app/models/email_address_verification.rb +++ /dev/null @@ -1,56 +0,0 @@ -class EmailAddressVerification < ApplicationRecord - RECENTLY_VERIFIED_PERIOD = 1.month - - scope :not_verified_recently, lambda { - where('verified_at IS NULL or verified_at < ?', verification_period) - } - - scope :verified_recently, lambda { - where('verified_at IS NOT NULL and verified_at >= ?', verification_period).where(success: true) - } - - scope :verification_failed, lambda { - where.not(verified_at: nil).where(success: false) - } - - scope :by_domain, ->(domain_name) { where(domain: domain_name) } - - def recently_verified? - verified_at.present? && - verified_at > verification_period - end - - def verification_period - self.class.verification_period - end - - def self.verification_period - Time.zone.now - RECENTLY_VERIFIED_PERIOD - end - - def not_verified? - verified_at.blank? && !success - end - - def failed? - verified_at.present? && !success - end - - def verified? - success - end - - def verify - validation_request = Truemail.validate(email) - - if validation_request.result.success - update(verified_at: Time.zone.now, - success: true) - else - update(verified_at: Time.zone.now, - success: false) - end - - validation_request.result - end -end diff --git a/app/models/nameserver.rb b/app/models/nameserver.rb index 3e4051165..3ddf1d1c5 100644 --- a/app/models/nameserver.rb +++ b/app/models/nameserver.rb @@ -88,7 +88,7 @@ class Nameserver < ApplicationRecord end def normalize_attributes - self.hostname = hostname.try(:strip).try(:downcase).gsub(/\.$/, '') + self.hostname = hostname.try(:strip).try(:downcase) self.ipv4 = Array(ipv4).reject(&:blank?).map(&:strip) self.ipv6 = Array(ipv6).reject(&:blank?).map(&:strip).map(&:upcase) end diff --git a/app/models/registrar.rb b/app/models/registrar.rb index 470d768b7..dbdd7e8d3 100644 --- a/app/models/registrar.rb +++ b/app/models/registrar.rb @@ -1,7 +1,6 @@ class Registrar < ApplicationRecord include Versions # version/registrar_version.rb include Concerns::Registrar::BookKeeping - include Concerns::EmailVerifable include Concerns::Registrar::LegalDoc has_many :domains, dependent: :restrict_with_error @@ -30,11 +29,14 @@ class Registrar < ApplicationRecord validates :vat_rate, numericality: { greater_than_or_equal_to: 0, less_than: 100 }, allow_nil: true + validate :forbid_special_code + attribute :vat_rate, ::Type::VATRate.new after_initialize :set_defaults - validate :correct_email_format, if: proc { |c| c.will_save_change_to_email? } - validate :correct_billing_email_format + validates :email, email_format: { message: :invalid }, + allow_blank: true, if: proc { |c| c.will_save_change_to_email? } + validates :billing_email, email_format: { message: :invalid }, allow_blank: true alias_attribute :contact_email, :email diff --git a/app/views/admin/contacts/index.haml b/app/views/admin/contacts/index.haml index cbd11d3fc..cc80ac744 100644 --- a/app/views/admin/contacts/index.haml +++ b/app/views/admin/contacts/index.haml @@ -63,10 +63,6 @@ .form-group = label_tag :only_no_country_code, "Ident CC missing" = check_box_tag :only_no_country_code, '1',params[:only_no_country_code].eql?('1'), style: 'width:auto;height:auto;float:right' - .col-md-3 - .form-group - = label_tag :email_verification_failed, "Email verification failed" - = check_box_tag :email_verification_failed, '1',params[:email_verification_failed].eql?('1'), style: 'width:auto;height:auto;float:right' .row .col-md-3{style: 'padding-top: 25px;float:right;'} @@ -89,9 +85,7 @@ %th{class: 'col-xs-2'} = sort_link(@q, 'ident', t(:ident)) %th{class: 'col-xs-2'} - = sort_link(@q, 'email', t(:email)) - %th{class: 'col-xs-2'} - = sort_link(@q, 'created_at', t(:created_at)) + = sort_link(@q, 'email', t(:created_at)) %th{class: 'col-xs-2'} = sort_link(@q, 'registrar_name', t(:registrar_name)) %tbody @@ -100,7 +94,6 @@ %td= link_to(contact, admin_contact_path(contact)) %td= contact.code %td= ident_for(contact) - %td= verified_email_span(contact.email_verification) %td= l(contact.created_at, format: :short) %td - if contact.registrar diff --git a/app/views/admin/contacts/partials/_general.haml b/app/views/admin/contacts/partials/_general.haml index 6568cd3d0..029f89509 100644 --- a/app/views/admin/contacts/partials/_general.haml +++ b/app/views/admin/contacts/partials/_general.haml @@ -17,7 +17,7 @@ %dd= ident_for(@contact) %dt= t(:email) - %dd= verified_email_span(@contact.email_verification) + %dd= @contact.email %dt= t(:phone) %dd= @contact.phone diff --git a/app/views/admin/registrars/index.html.erb b/app/views/admin/registrars/index.html.erb index e641f5294..a66816568 100644 --- a/app/views/admin/registrars/index.html.erb +++ b/app/views/admin/registrars/index.html.erb @@ -28,9 +28,6 @@ <%= t(:test_registrar) %> - - <%= t(:emails) %> - @@ -48,12 +45,6 @@ <%= "#{x.test_registrar}" %> - - <%= verified_email_span(x.email_verification) %> - <% if x[:billing_email].present? %> - <%= verified_email_span(x.billing_email_verification) %> - <% end %> - <% end %> diff --git a/app/views/admin/registrars/show/_billing.html.erb b/app/views/admin/registrars/show/_billing.html.erb index 07bccc7f4..da79b9074 100644 --- a/app/views/admin/registrars/show/_billing.html.erb +++ b/app/views/admin/registrars/show/_billing.html.erb @@ -15,9 +15,7 @@
<%= registrar.accounting_customer_code %>
<%= Registrar.human_attribute_name :billing_email %>
-
- <%= verified_email_span(registrar.billing_email_verification) %> -
+
<%= registrar.billing_email %>
<%= Registrar.human_attribute_name :reference_no %>
<%= registrar.reference_no %>
@@ -26,4 +24,4 @@
<%= registrar.iban %>
- + \ No newline at end of file diff --git a/app/views/admin/registrars/show/_contacts.html.erb b/app/views/admin/registrars/show/_contacts.html.erb index 0ca1158d3..f467e6a51 100644 --- a/app/views/admin/registrars/show/_contacts.html.erb +++ b/app/views/admin/registrars/show/_contacts.html.erb @@ -15,9 +15,7 @@
<%= @registrar.phone %>
<%= Registrar.human_attribute_name :email %>
-
- <%= verified_email_span(@registrar.email_verification) %> -
+
<%= @registrar.email %>
- + \ No newline at end of file diff --git a/config/initializers/airbrake.rb b/config/initializers/airbrake.rb index abfe408c1..5c1983369 100644 --- a/config/initializers/airbrake.rb +++ b/config/initializers/airbrake.rb @@ -17,5 +17,5 @@ Airbrake.configure do |config| end config.environment = ENV['airbrake_env'] || Rails.env config.ignore_environments = %w[test] - config.blocklist_keys = Rails.application.config.filter_parameters + config.blacklist_keys = Rails.application.config.filter_parameters end diff --git a/config/initializers/truemail.rb b/config/initializers/truemail.rb deleted file mode 100644 index cfc8e14b1..000000000 --- a/config/initializers/truemail.rb +++ /dev/null @@ -1,77 +0,0 @@ -require 'truemail' - -Truemail.configure do |config| - # Required parameter. Must be an existing email on behalf of which verification will be performed - config.verifier_email = 'info@internet.ee' - - # Optional parameter. Must be an existing domain on behalf of which verification will be performed. - # By default verifier domain based on verifier email - # config.verifier_domain = 'internet.ee' - - # Optional parameter. You can override default regex pattern - # config.email_pattern = /regex_pattern/ - - # Optional parameter. You can override default regex pattern - # config.smtp_error_body_pattern = /regex_pattern/ - - # Optional parameter. Connection timeout is equal to 2 ms by default. - # config.connection_timeout = 1 - - # Optional parameter. A SMTP server response timeout is equal to 2 ms by default. - # config.response_timeout = 1 - - # Optional parameter. Total of connection attempts. It is equal to 2 by default. - # This parameter uses in mx lookup timeout error and smtp request (for cases when - # there is one mx server). - config.connection_attempts = 3 - - # Optional parameter. You can predefine default validation type for - # Truemail.validate('email@email.com') call without with-parameter - # Available validation types: :regex, :mx, :smtp - if Rails.env.production? - config.default_validation_type = :smtp - elsif Rails.env.test? - config.default_validation_type = :regex - else - config.default_validation_type = :mx - end - - # Optional parameter. You can predefine which type of validation will be used for domains. - # Also you can skip validation by domain. Available validation types: :regex, :mx, :smtp - # This configuration will be used over current or default validation type parameter - # All of validations for 'somedomain.com' will be processed with regex validation only. - # And all of validations for 'otherdomain.com' will be processed with mx validation only. - # It is equal to empty hash by default. - # config.validation_type_for = { 'somedomain.com' => :regex, 'otherdomain.com' => :mx } - - # Optional parameter. Validation of email which contains whitelisted domain always will - # return true. Other validations will not processed even if it was defined in validation_type_for - # It is equal to empty array by default. - # config.whitelisted_domains = [] - - # Optional parameter. With this option Truemail will validate email which contains whitelisted - # domain only, i.e. if domain whitelisted, validation will passed to Regex, MX or SMTP validators. - # Validation of email which not contains whitelisted domain always will return false. - # It is equal false by default. - #config.whitelist_validation = true - - # Optional parameter. Validation of email which contains blacklisted domain always will - # return false. Other validations will not processed even if it was defined in validation_type_for - # It is equal to empty array by default. - #config.blacklisted_domains = [] - - # Optional parameter. This option will provide to use not RFC MX lookup flow. - # It means that MX and Null MX records will be cheked on the DNS validation layer only. - # By default this option is disabled. - # config.not_rfc_mx_lookup_flow = true - - # Optional parameter. This option will be parse bodies of SMTP errors. It will be helpful - # if SMTP server does not return an exact answer that the email does not exist - # By default this option is disabled, available for SMTP validation only. - # config.smtp_safe_check = true - - # Optional parameter. This option will enable tracking events. You can print tracking events to - # stdout, write to file or both of these. Tracking event by default is :error - # Available tracking event: :all, :unrecognized_error, :recognized_error, :error - # config.logger = { tracking_event: :all, stdout: true, log_absolute_path: '/home/app/log/truemail.log' } -end diff --git a/config/locales/admin/email_verifable.en.yml b/config/locales/admin/email_verifable.en.yml deleted file mode 100644 index 724fa4c32..000000000 --- a/config/locales/admin/email_verifable.en.yml +++ /dev/null @@ -1,5 +0,0 @@ -en: - email_verifable: - email_smtp_check_error: SMTP check error - email_mx_check_error: Mail domain not found - email_regex_check_error: Invalid format diff --git a/config/locales/admin/email_verifable.et.yml b/config/locales/admin/email_verifable.et.yml deleted file mode 100644 index 6c008ed11..000000000 --- a/config/locales/admin/email_verifable.et.yml +++ /dev/null @@ -1,5 +0,0 @@ -et: - email_verifable: - email_smtp_check_error: Eposti aadressi ei leitud (SMTP viga) - email_mx_check_error: Eposti aadressi domeeni ei leitud - email_regex_check_error: Eposti aadress on vigane diff --git a/config/locales/en.yml b/config/locales/en.yml index 27299072e..a825b1dc0 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -636,7 +636,6 @@ en: edit_dispute: 'Edit dispute' optional: 'Optional' test_registrar: "Test registrar" - emails: 'Email addresses' verified_confirm: 'Verified status is for cases when current registrant is the one applying for the update. Legal document signed by the registrant is required. Are you sure this update is properly verified with the registrant?' verified: 'Verified' deleted: 'Deleted' diff --git a/config/locales/et.yml b/config/locales/et.yml index 9cb8aaa4a..05d32be24 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -5,4 +5,3 @@ et: date: # Don't forget the nil at the beginning; there's no such thing as a 0th month month_names: [~, Jaanuar, Veebruar, Märts, Aprill, Mai, Juuni, Juuli, August, September, Oktoober, November, Detsember] - emails: "Meillaadressid" diff --git a/config/schedule.rb b/config/schedule.rb index 7ebf97d12..089ce93f9 100644 --- a/config/schedule.rb +++ b/config/schedule.rb @@ -62,10 +62,6 @@ if @cron_group == 'registry' rake 'domain:discard' end - every 10.minutes do - rake 'verify_email:all_domains' - end - # Should be at least once every 4 days, since according to LHV specs: # "Unread messages older than 5 days are automatically scheduled for deletion" # https://partners.lhv.ee/en/connect/#messaging diff --git a/db/data/20200608084321_fill_email_verifications.rb b/db/data/20200608084321_fill_email_verifications.rb deleted file mode 100644 index 37a7f275c..000000000 --- a/db/data/20200608084321_fill_email_verifications.rb +++ /dev/null @@ -1,21 +0,0 @@ -class FillEmailVerifications < ActiveRecord::Migration[6.0] - include Concerns::EmailVerifable - - def up - registrar_billing_emails = Registrar.pluck(:billing_email).uniq.reject(&:blank?) - registrar_emails = Registrar.pluck(:email).uniq.reject(&:blank?) - contact_emails = Contact.pluck(:email).uniq.reject(&:blank?) - - emails = (contact_emails + registrar_emails + registrar_billing_emails) - emails = emails.map{ |email| punycode_to_unicode(email) }.uniq - - result = emails.map do |email| - { email: email, domain: domain(email) } - end - EmailAddressVerification.import result, batch_size: 500 - end - - def down - EmailAddressVerification.delete_all - end -end diff --git a/db/migrate/20200605100827_create_email_address_verifications.rb b/db/migrate/20200605100827_create_email_address_verifications.rb deleted file mode 100644 index 7f618b3a7..000000000 --- a/db/migrate/20200605100827_create_email_address_verifications.rb +++ /dev/null @@ -1,13 +0,0 @@ -class CreateEmailAddressVerifications < ActiveRecord::Migration[6.0] - def change - create_table :email_address_verifications do |t| - t.string :email, null: false - t.datetime :verified_at - t.boolean :success, null: false, default: false - t.string :domain, null: false - end - - add_index :email_address_verifications, :email, unique: true - add_index :email_address_verifications, :domain - end -end diff --git a/db/migrate/20200610090110_change_email_verification_fields_to_citext.rb b/db/migrate/20200610090110_change_email_verification_fields_to_citext.rb deleted file mode 100644 index a7e2f8ee8..000000000 --- a/db/migrate/20200610090110_change_email_verification_fields_to_citext.rb +++ /dev/null @@ -1,13 +0,0 @@ -class ChangeEmailVerificationFieldsToCitext < ActiveRecord::Migration[6.0] - def up - enable_extension 'citext' - change_column :email_address_verifications, :email, :citext - change_column :email_address_verifications, :domain, :citext - end - - def down - change_column :email_address_verifications, :email, :string - change_column :email_address_verifications, :domain, :string - disable_extension 'citext' - end -end diff --git a/db/structure.sql b/db/structure.sql index 587f68be8..960481c44 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -33,17 +33,10 @@ CREATE EXTENSION IF NOT EXISTS btree_gist WITH SCHEMA public; -- --- Name: citext; Type: EXTENSION; Schema: -; Owner: - +-- Name: EXTENSION btree_gist; Type: COMMENT; Schema: -; Owner: - -- -CREATE EXTENSION IF NOT EXISTS citext WITH SCHEMA public; - - --- --- Name: EXTENSION citext; Type: COMMENT; Schema: -; Owner: - --- - -COMMENT ON EXTENSION citext IS 'data type for case-insensitive character strings'; +COMMENT ON EXTENSION btree_gist IS 'support for indexing common datatypes in GiST'; -- @@ -824,99 +817,7 @@ ALTER SEQUENCE public.domains_id_seq OWNED BY public.domains.id; -- --- Name: email_address_verifications; Type: TABLE; Schema: public; Owner: - --- - -CREATE TABLE public.email_address_verifications ( - id bigint NOT NULL, - email public.citext NOT NULL, - verified_at timestamp without time zone, - success boolean DEFAULT false NOT NULL, - domain public.citext NOT NULL -); - - --- --- Name: email_address_verifications_id_seq; Type: SEQUENCE; Schema: public; Owner: - --- - -CREATE SEQUENCE public.email_address_verifications_id_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; - - --- --- Name: email_address_verifications_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: - --- - -ALTER SEQUENCE public.email_address_verifications_id_seq OWNED BY public.email_address_verifications.id; - - --- --- Name: email_addresses_validations; Type: TABLE; Schema: public; Owner: - --- - -CREATE TABLE public.email_addresses_validations ( - id bigint NOT NULL, - email character varying NOT NULL, - validated_at timestamp without time zone -); - - --- --- Name: email_addresses_validations_id_seq; Type: SEQUENCE; Schema: public; Owner: - --- - -CREATE SEQUENCE public.email_addresses_validations_id_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; - - --- --- Name: email_addresses_validations_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: - --- - -ALTER SEQUENCE public.email_addresses_validations_id_seq OWNED BY public.email_addresses_validations.id; - - --- --- Name: email_addresses_verifications; Type: TABLE; Schema: public; Owner: - --- - -CREATE TABLE public.email_addresses_verifications ( - id bigint NOT NULL, - email character varying NOT NULL, - validated_at timestamp without time zone -); - - --- --- Name: email_addresses_verifications_id_seq; Type: SEQUENCE; Schema: public; Owner: - --- - -CREATE SEQUENCE public.email_addresses_verifications_id_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; - - --- --- Name: email_addresses_verifications_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: - --- - -ALTER SEQUENCE public.email_addresses_verifications_id_seq OWNED BY public.email_addresses_verifications.id; - - --- --- Name: epp_sessions; Type: TABLE; Schema: public; Owner: - +-- Name: epp_sessions; Type: TABLE; Schema: public; Owner: -; Tablespace: -- CREATE TABLE public.epp_sessions ( @@ -2591,42 +2492,21 @@ ALTER TABLE ONLY public.domain_transfers ALTER COLUMN id SET DEFAULT nextval('pu -- --- Name: domains id; Type: DEFAULT; Schema: public; Owner: - +-- Name: id; Type: DEFAULT; Schema: public; Owner: - -- ALTER TABLE ONLY public.domains ALTER COLUMN id SET DEFAULT nextval('public.domains_id_seq'::regclass); -- --- Name: email_address_verifications id; Type: DEFAULT; Schema: public; Owner: - --- - -ALTER TABLE ONLY public.email_address_verifications ALTER COLUMN id SET DEFAULT nextval('public.email_address_verifications_id_seq'::regclass); - - --- --- Name: email_addresses_validations id; Type: DEFAULT; Schema: public; Owner: - --- - -ALTER TABLE ONLY public.email_addresses_validations ALTER COLUMN id SET DEFAULT nextval('public.email_addresses_validations_id_seq'::regclass); - - --- --- Name: email_addresses_verifications id; Type: DEFAULT; Schema: public; Owner: - --- - -ALTER TABLE ONLY public.email_addresses_verifications ALTER COLUMN id SET DEFAULT nextval('public.email_addresses_verifications_id_seq'::regclass); - - --- --- Name: epp_sessions id; Type: DEFAULT; Schema: public; Owner: - +-- Name: id; Type: DEFAULT; Schema: public; Owner: - -- ALTER TABLE ONLY public.epp_sessions ALTER COLUMN id SET DEFAULT nextval('public.epp_sessions_id_seq'::regclass); -- --- Name: invoice_items id; Type: DEFAULT; Schema: public; Owner: - +-- Name: id; Type: DEFAULT; Schema: public; Owner: - -- ALTER TABLE ONLY public.invoice_items ALTER COLUMN id SET DEFAULT nextval('public.invoice_items_id_seq'::regclass); @@ -3027,31 +2907,7 @@ ALTER TABLE ONLY public.domains -- --- Name: email_address_verifications email_address_verifications_pkey; Type: CONSTRAINT; Schema: public; Owner: - --- - -ALTER TABLE ONLY public.email_address_verifications - ADD CONSTRAINT email_address_verifications_pkey PRIMARY KEY (id); - - --- --- Name: email_addresses_validations email_addresses_validations_pkey; Type: CONSTRAINT; Schema: public; Owner: - --- - -ALTER TABLE ONLY public.email_addresses_validations - ADD CONSTRAINT email_addresses_validations_pkey PRIMARY KEY (id); - - --- --- Name: email_addresses_verifications email_addresses_verifications_pkey; Type: CONSTRAINT; Schema: public; Owner: - --- - -ALTER TABLE ONLY public.email_addresses_verifications - ADD CONSTRAINT email_addresses_verifications_pkey PRIMARY KEY (id); - - --- --- Name: epp_sessions epp_sessions_pkey; Type: CONSTRAINT; Schema: public; Owner: - +-- Name: epp_sessions_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: -- ALTER TABLE ONLY public.epp_sessions @@ -3059,7 +2915,7 @@ ALTER TABLE ONLY public.epp_sessions -- --- Name: invoice_items invoice_items_pkey; Type: CONSTRAINT; Schema: public; Owner: - +-- Name: invoice_items_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: -- ALTER TABLE ONLY public.invoice_items @@ -3622,447 +3478,434 @@ CREATE INDEX index_domains_on_registrar_id ON public.domains USING btree (regist -- --- Name: index_domains_on_statuses; Type: INDEX; Schema: public; Owner: - +-- Name: index_domains_on_statuses; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_domains_on_statuses ON public.domains USING gin (statuses); -- --- Name: index_email_address_verifications_on_domain; Type: INDEX; Schema: public; Owner: - --- - -CREATE INDEX index_email_address_verifications_on_domain ON public.email_address_verifications USING btree (domain); - - --- --- Name: index_epp_sessions_on_updated_at; Type: INDEX; Schema: public; Owner: - +-- Name: index_epp_sessions_on_updated_at; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_epp_sessions_on_updated_at ON public.epp_sessions USING btree (updated_at); -- --- Name: index_invoice_items_on_invoice_id; Type: INDEX; Schema: public; Owner: - +-- Name: index_invoice_items_on_invoice_id; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_invoice_items_on_invoice_id ON public.invoice_items USING btree (invoice_id); -- --- Name: index_invoices_on_buyer_id; Type: INDEX; Schema: public; Owner: - +-- Name: index_invoices_on_buyer_id; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_invoices_on_buyer_id ON public.invoices USING btree (buyer_id); -- --- Name: index_legal_documents_on_checksum; Type: INDEX; Schema: public; Owner: - +-- Name: index_legal_documents_on_checksum; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_legal_documents_on_checksum ON public.legal_documents USING btree (checksum); -- --- Name: index_legal_documents_on_documentable_type_and_documentable_id; Type: INDEX; Schema: public; Owner: - +-- Name: index_legal_documents_on_documentable_type_and_documentable_id; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_legal_documents_on_documentable_type_and_documentable_id ON public.legal_documents USING btree (documentable_type, documentable_id); -- --- Name: index_log_account_activities_on_item_type_and_item_id; Type: INDEX; Schema: public; Owner: - +-- Name: index_log_account_activities_on_item_type_and_item_id; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_log_account_activities_on_item_type_and_item_id ON public.log_account_activities USING btree (item_type, item_id); -- --- Name: index_log_account_activities_on_whodunnit; Type: INDEX; Schema: public; Owner: - +-- Name: index_log_account_activities_on_whodunnit; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_log_account_activities_on_whodunnit ON public.log_account_activities USING btree (whodunnit); -- --- Name: index_log_accounts_on_item_type_and_item_id; Type: INDEX; Schema: public; Owner: - +-- Name: index_log_accounts_on_item_type_and_item_id; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_log_accounts_on_item_type_and_item_id ON public.log_accounts USING btree (item_type, item_id); -- --- Name: index_log_accounts_on_whodunnit; Type: INDEX; Schema: public; Owner: - +-- Name: index_log_accounts_on_whodunnit; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_log_accounts_on_whodunnit ON public.log_accounts USING btree (whodunnit); -- --- Name: index_log_bank_statements_on_item_type_and_item_id; Type: INDEX; Schema: public; Owner: - +-- Name: index_log_bank_statements_on_item_type_and_item_id; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_log_bank_statements_on_item_type_and_item_id ON public.log_bank_statements USING btree (item_type, item_id); -- --- Name: index_log_bank_statements_on_whodunnit; Type: INDEX; Schema: public; Owner: - +-- Name: index_log_bank_statements_on_whodunnit; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_log_bank_statements_on_whodunnit ON public.log_bank_statements USING btree (whodunnit); -- --- Name: index_log_bank_transactions_on_item_type_and_item_id; Type: INDEX; Schema: public; Owner: - +-- Name: index_log_bank_transactions_on_item_type_and_item_id; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_log_bank_transactions_on_item_type_and_item_id ON public.log_bank_transactions USING btree (item_type, item_id); -- --- Name: index_log_bank_transactions_on_whodunnit; Type: INDEX; Schema: public; Owner: - +-- Name: index_log_bank_transactions_on_whodunnit; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_log_bank_transactions_on_whodunnit ON public.log_bank_transactions USING btree (whodunnit); -- --- Name: index_log_blocked_domains_on_item_type_and_item_id; Type: INDEX; Schema: public; Owner: - +-- Name: index_log_blocked_domains_on_item_type_and_item_id; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_log_blocked_domains_on_item_type_and_item_id ON public.log_blocked_domains USING btree (item_type, item_id); -- --- Name: index_log_blocked_domains_on_whodunnit; Type: INDEX; Schema: public; Owner: - +-- Name: index_log_blocked_domains_on_whodunnit; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_log_blocked_domains_on_whodunnit ON public.log_blocked_domains USING btree (whodunnit); -- --- Name: index_log_certificates_on_item_type_and_item_id; Type: INDEX; Schema: public; Owner: - +-- Name: index_log_certificates_on_item_type_and_item_id; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_log_certificates_on_item_type_and_item_id ON public.log_certificates USING btree (item_type, item_id); -- --- Name: index_log_certificates_on_whodunnit; Type: INDEX; Schema: public; Owner: - +-- Name: index_log_certificates_on_whodunnit; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_log_certificates_on_whodunnit ON public.log_certificates USING btree (whodunnit); -- --- Name: index_log_contacts_on_item_type_and_item_id; Type: INDEX; Schema: public; Owner: - +-- Name: index_log_contacts_on_item_type_and_item_id; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_log_contacts_on_item_type_and_item_id ON public.log_contacts USING btree (item_type, item_id); -- --- Name: index_log_contacts_on_whodunnit; Type: INDEX; Schema: public; Owner: - +-- Name: index_log_contacts_on_whodunnit; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_log_contacts_on_whodunnit ON public.log_contacts USING btree (whodunnit); -- --- Name: index_log_dnskeys_on_item_type_and_item_id; Type: INDEX; Schema: public; Owner: - +-- Name: index_log_dnskeys_on_item_type_and_item_id; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_log_dnskeys_on_item_type_and_item_id ON public.log_dnskeys USING btree (item_type, item_id); -- --- Name: index_log_dnskeys_on_whodunnit; Type: INDEX; Schema: public; Owner: - +-- Name: index_log_dnskeys_on_whodunnit; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_log_dnskeys_on_whodunnit ON public.log_dnskeys USING btree (whodunnit); -- --- Name: index_log_domain_contacts_on_item_type_and_item_id; Type: INDEX; Schema: public; Owner: - +-- Name: index_log_domain_contacts_on_item_type_and_item_id; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_log_domain_contacts_on_item_type_and_item_id ON public.log_domain_contacts USING btree (item_type, item_id); -- --- Name: index_log_domain_contacts_on_whodunnit; Type: INDEX; Schema: public; Owner: - +-- Name: index_log_domain_contacts_on_whodunnit; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_log_domain_contacts_on_whodunnit ON public.log_domain_contacts USING btree (whodunnit); -- --- Name: index_log_domains_on_item_type_and_item_id; Type: INDEX; Schema: public; Owner: - +-- Name: index_log_domains_on_item_type_and_item_id; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_log_domains_on_item_type_and_item_id ON public.log_domains USING btree (item_type, item_id); -- --- Name: index_log_domains_on_whodunnit; Type: INDEX; Schema: public; Owner: - +-- Name: index_log_domains_on_whodunnit; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_log_domains_on_whodunnit ON public.log_domains USING btree (whodunnit); -- --- Name: index_log_invoice_items_on_item_type_and_item_id; Type: INDEX; Schema: public; Owner: - +-- Name: index_log_invoice_items_on_item_type_and_item_id; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_log_invoice_items_on_item_type_and_item_id ON public.log_invoice_items USING btree (item_type, item_id); -- --- Name: index_log_invoice_items_on_whodunnit; Type: INDEX; Schema: public; Owner: - +-- Name: index_log_invoice_items_on_whodunnit; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_log_invoice_items_on_whodunnit ON public.log_invoice_items USING btree (whodunnit); -- --- Name: index_log_invoices_on_item_type_and_item_id; Type: INDEX; Schema: public; Owner: - +-- Name: index_log_invoices_on_item_type_and_item_id; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_log_invoices_on_item_type_and_item_id ON public.log_invoices USING btree (item_type, item_id); -- --- Name: index_log_invoices_on_whodunnit; Type: INDEX; Schema: public; Owner: - +-- Name: index_log_invoices_on_whodunnit; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_log_invoices_on_whodunnit ON public.log_invoices USING btree (whodunnit); -- --- Name: index_log_nameservers_on_item_type_and_item_id; Type: INDEX; Schema: public; Owner: - +-- Name: index_log_nameservers_on_item_type_and_item_id; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_log_nameservers_on_item_type_and_item_id ON public.log_nameservers USING btree (item_type, item_id); -- --- Name: index_log_nameservers_on_whodunnit; Type: INDEX; Schema: public; Owner: - +-- Name: index_log_nameservers_on_whodunnit; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_log_nameservers_on_whodunnit ON public.log_nameservers USING btree (whodunnit); -- --- Name: index_log_notifications_on_item_type_and_item_id; Type: INDEX; Schema: public; Owner: - +-- Name: index_log_notifications_on_item_type_and_item_id; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_log_notifications_on_item_type_and_item_id ON public.log_notifications USING btree (item_type, item_id); -- --- Name: index_log_notifications_on_whodunnit; Type: INDEX; Schema: public; Owner: - +-- Name: index_log_notifications_on_whodunnit; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_log_notifications_on_whodunnit ON public.log_notifications USING btree (whodunnit); -- --- Name: index_log_registrant_verifications_on_item_type_and_item_id; Type: INDEX; Schema: public; Owner: - +-- Name: index_log_registrant_verifications_on_item_type_and_item_id; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_log_registrant_verifications_on_item_type_and_item_id ON public.log_registrant_verifications USING btree (item_type, item_id); -- --- Name: index_log_registrant_verifications_on_whodunnit; Type: INDEX; Schema: public; Owner: - +-- Name: index_log_registrant_verifications_on_whodunnit; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_log_registrant_verifications_on_whodunnit ON public.log_registrant_verifications USING btree (whodunnit); -- --- Name: index_log_registrars_on_item_type_and_item_id; Type: INDEX; Schema: public; Owner: - +-- Name: index_log_registrars_on_item_type_and_item_id; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_log_registrars_on_item_type_and_item_id ON public.log_registrars USING btree (item_type, item_id); -- --- Name: index_log_registrars_on_whodunnit; Type: INDEX; Schema: public; Owner: - +-- Name: index_log_registrars_on_whodunnit; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_log_registrars_on_whodunnit ON public.log_registrars USING btree (whodunnit); -- --- Name: index_log_reserved_domains_on_item_type_and_item_id; Type: INDEX; Schema: public; Owner: - +-- Name: index_log_reserved_domains_on_item_type_and_item_id; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_log_reserved_domains_on_item_type_and_item_id ON public.log_reserved_domains USING btree (item_type, item_id); -- --- Name: index_log_reserved_domains_on_whodunnit; Type: INDEX; Schema: public; Owner: - +-- Name: index_log_reserved_domains_on_whodunnit; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_log_reserved_domains_on_whodunnit ON public.log_reserved_domains USING btree (whodunnit); -- --- Name: index_log_settings_on_item_type_and_item_id; Type: INDEX; Schema: public; Owner: - +-- Name: index_log_settings_on_item_type_and_item_id; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_log_settings_on_item_type_and_item_id ON public.log_settings USING btree (item_type, item_id); -- --- Name: index_log_settings_on_whodunnit; Type: INDEX; Schema: public; Owner: - +-- Name: index_log_settings_on_whodunnit; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_log_settings_on_whodunnit ON public.log_settings USING btree (whodunnit); -- --- Name: index_log_users_on_item_type_and_item_id; Type: INDEX; Schema: public; Owner: - +-- Name: index_log_users_on_item_type_and_item_id; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_log_users_on_item_type_and_item_id ON public.log_users USING btree (item_type, item_id); -- --- Name: index_log_users_on_whodunnit; Type: INDEX; Schema: public; Owner: - +-- Name: index_log_users_on_whodunnit; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_log_users_on_whodunnit ON public.log_users USING btree (whodunnit); -- --- Name: index_nameservers_on_domain_id; Type: INDEX; Schema: public; Owner: - +-- Name: index_nameservers_on_domain_id; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_nameservers_on_domain_id ON public.nameservers USING btree (domain_id); -- --- Name: index_notifications_on_registrar_id; Type: INDEX; Schema: public; Owner: - +-- Name: index_notifications_on_registrar_id; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_notifications_on_registrar_id ON public.notifications USING btree (registrar_id); -- --- Name: index_payment_orders_on_invoice_id; Type: INDEX; Schema: public; Owner: - +-- Name: index_payment_orders_on_invoice_id; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_payment_orders_on_invoice_id ON public.payment_orders USING btree (invoice_id); -- --- Name: index_prices_on_zone_id; Type: INDEX; Schema: public; Owner: - +-- Name: index_prices_on_zone_id; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_prices_on_zone_id ON public.prices USING btree (zone_id); -- --- Name: index_registrant_verifications_on_created_at; Type: INDEX; Schema: public; Owner: - +-- Name: index_registrant_verifications_on_created_at; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_registrant_verifications_on_created_at ON public.registrant_verifications USING btree (created_at); -- --- Name: index_registrant_verifications_on_domain_id; Type: INDEX; Schema: public; Owner: - +-- Name: index_registrant_verifications_on_domain_id; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_registrant_verifications_on_domain_id ON public.registrant_verifications USING btree (domain_id); -- --- Name: index_settings_on_thing_type_and_thing_id_and_var; Type: INDEX; Schema: public; Owner: - +-- Name: index_settings_on_thing_type_and_thing_id_and_var; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE UNIQUE INDEX index_settings_on_thing_type_and_thing_id_and_var ON public.settings USING btree (thing_type, thing_id, var); -- --- Name: index_users_on_identity_code; Type: INDEX; Schema: public; Owner: - +-- Name: index_users_on_identity_code; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_users_on_identity_code ON public.users USING btree (identity_code); -- --- Name: index_users_on_registrar_id; Type: INDEX; Schema: public; Owner: - +-- Name: index_users_on_registrar_id; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_users_on_registrar_id ON public.users USING btree (registrar_id); -- --- Name: index_versions_on_item_type_and_item_id; Type: INDEX; Schema: public; Owner: - +-- Name: index_versions_on_item_type_and_item_id; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_versions_on_item_type_and_item_id ON public.versions USING btree (item_type, item_id); -- --- Name: index_whois_records_on_domain_id; Type: INDEX; Schema: public; Owner: - +-- Name: index_whois_records_on_domain_id; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_whois_records_on_domain_id ON public.whois_records USING btree (domain_id); -- --- Name: index_whois_records_on_registrar_id; Type: INDEX; Schema: public; Owner: - +-- Name: index_whois_records_on_registrar_id; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX index_whois_records_on_registrar_id ON public.whois_records USING btree (registrar_id); -- --- Name: log_contacts_object_legacy_id; Type: INDEX; Schema: public; Owner: - +-- Name: log_contacts_object_legacy_id; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX log_contacts_object_legacy_id ON public.log_contacts USING btree ((((object ->> 'legacy_id'::text))::integer)); -- --- Name: log_dnskeys_object_legacy_id; Type: INDEX; Schema: public; Owner: - +-- Name: log_dnskeys_object_legacy_id; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX log_dnskeys_object_legacy_id ON public.log_contacts USING btree ((((object ->> 'legacy_domain_id'::text))::integer)); -- --- Name: log_domains_object_legacy_id; Type: INDEX; Schema: public; Owner: - +-- Name: log_domains_object_legacy_id; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX log_domains_object_legacy_id ON public.log_contacts USING btree ((((object ->> 'legacy_id'::text))::integer)); -- --- Name: log_nameservers_object_legacy_id; Type: INDEX; Schema: public; Owner: - +-- Name: log_nameservers_object_legacy_id; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE INDEX log_nameservers_object_legacy_id ON public.log_contacts USING btree ((((object ->> 'legacy_domain_id'::text))::integer)); -- --- Name: unique_data_migrations; Type: INDEX; Schema: public; Owner: - --- - -CREATE UNIQUE INDEX unique_data_migrations ON public.data_migrations USING btree (version); - - --- --- Name: unique_schema_migrations; Type: INDEX; Schema: public; Owner: - +-- Name: unique_schema_migrations; Type: INDEX; Schema: public; Owner: -; Tablespace: -- CREATE UNIQUE INDEX unique_schema_migrations ON public.schema_migrations USING btree (version); + -- --- Name: contacts contacts_registrar_id_fk; Type: FK CONSTRAINT; Schema: public; Owner: - +-- Name: contacts_registrar_id_fk; Type: FK CONSTRAINT; Schema: public; Owner: - -- ALTER TABLE ONLY public.contacts @@ -4070,7 +3913,7 @@ ALTER TABLE ONLY public.contacts -- --- Name: domain_contacts domain_contacts_contact_id_fk; Type: FK CONSTRAINT; Schema: public; Owner: - +-- Name: domain_contacts_contact_id_fk; Type: FK CONSTRAINT; Schema: public; Owner: - -- ALTER TABLE ONLY public.domain_contacts @@ -4692,7 +4535,6 @@ INSERT INTO "schema_migrations" (version) VALUES ('20200505150413'), ('20200518104105'), ('20200529115011'), -('20200605100827'), -('20200610090110'), ('20200630081231'); + diff --git a/lib/tasks/verify_email.rake b/lib/tasks/verify_email.rake deleted file mode 100644 index d49bb38b9..000000000 --- a/lib/tasks/verify_email.rake +++ /dev/null @@ -1,23 +0,0 @@ -namespace :verify_email do - desc 'Stars verifying email jobs for all the domain' - task all_domains: :environment do - verifications_by_domain = EmailAddressVerification.not_verified_recently.group_by(&:domain) - verifications_by_domain.each do |_domain, verifications| - ver = verifications.sample # Verify random email to not to clog the SMTP servers - VerifyEmailsJob.enqueue(ver.id) - next - end - end - - # Need to be run like 'bundle exec rake verify_email:domain['gmail.com']' - # In zsh syntax will be 'bundle exec rake verify_email:domain\['gmail.com'\]' - # Default 'bundle exec rake verify_email:domain' wil use 'internet.ee' domain - desc 'Stars verifying email jobs for domain stated in argument' - task :domain, [:domain_name] => [:environment] do |_task, args| - args.with_defaults(domain_name: 'internet.ee') - - verifications_by_domain = EmailAddressVerification.not_verified_recently - .by_domain(args[:domain_name]) - verifications_by_domain.map { |ver| VerifyEmailsJob.enqueue(ver.id) } - end -end diff --git a/test/fixtures/contacts.yml b/test/fixtures/contacts.yml index 0173d56dd..ddfbfe93f 100644 --- a/test/fixtures/contacts.yml +++ b/test/fixtures/contacts.yml @@ -85,11 +85,3 @@ invalid: auth_info: any registrar: bestnames uuid: bd80c0f9-26ee-49e0-a2cb-2311d931c433 - -invalid_email: - name: any - code: invalid_email - email: invalid@invalid. - auth_info: any - registrar: bestnames - uuid: fa8c4f51-a221-4628-b3c6-47995f4edea3 diff --git a/test/jobs/verify_emails_job_test.rb b/test/jobs/verify_emails_job_test.rb deleted file mode 100644 index f55a474db..000000000 --- a/test/jobs/verify_emails_job_test.rb +++ /dev/null @@ -1,59 +0,0 @@ -require "test_helper" - -class VerifyEmailsJobTest < ActiveSupport::TestCase - def setup - @contact = contacts(:john) - @invalid_contact = contacts(:invalid_email) - @contact_verification = @contact.email_verification - @invalid_contact_verification = @invalid_contact.email_verification - - @default_whitelist = Truemail.configure.whitelisted_domains - @default_blacklist = Truemail.configure.blacklisted_domains - Truemail.configure.whitelisted_domains = whitelisted_domains - Truemail.configure.blacklisted_domains = blacklisted_domains - end - - def teardown - Truemail.configure.whitelisted_domains = @default_whitelist - Truemail.configure.blacklisted_domains = @default_blacklist - end - - def domain(email) - Mail::Address.new(email).domain - rescue Mail::Field::IncompleteParseError - nil - end - - def whitelisted_domains - [domain(@contact.email)].reject(&:blank?) - end - - def blacklisted_domains - [domain(@invalid_contact.email)].reject(&:blank?) - end - - def test_job_checks_if_email_valid - VerifyEmailsJob.run(@contact_verification.id) - @contact_verification.reload - - assert @contact_verification.success - end - - def test_job_checks_does_not_run_if_recent - old_verified_at = Time.zone.now - 10.days - @contact_verification.update(success: true, verified_at: old_verified_at) - assert @contact_verification.recently_verified? - - VerifyEmailsJob.run(@contact_verification.id) - @contact_verification.reload - - assert_in_delta @contact_verification.verified_at.to_i, old_verified_at.to_i, 1 - end - - def test_job_checks_if_email_invalid - VerifyEmailsJob.run(@invalid_contact_verification.id) - @contact_verification.reload - - refute @contact_verification.success - end -end diff --git a/test/models/contact_test.rb b/test/models/contact_test.rb index 856019bfb..4e500e98d 100644 --- a/test/models/contact_test.rb +++ b/test/models/contact_test.rb @@ -3,11 +3,6 @@ require 'test_helper' class ContactTest < ActiveSupport::TestCase setup do @contact = contacts(:john) - @old_validation_type = Truemail.configure.default_validation_type - end - - teardown do - Truemail.configure.default_validation_type = @old_validation_type end def test_valid_contact_fixture_is_valid @@ -66,39 +61,16 @@ class ContactTest < ActiveSupport::TestCase assert contact.invalid? end - def test_email_verification_valid + def test_validates_email_format contact = valid_contact - contact.email = 'info@internet.ee' + + contact.email = 'invalid' + assert contact.invalid? + + contact.email = 'valid@registrar.test' assert contact.valid? end - def test_email_verification_smtp_error - Truemail.configure.default_validation_type = :smtp - - contact = valid_contact - contact.email = 'somecrude1337joke@internet.ee' - assert contact.invalid? - assert_equal I18n.t('email_verifable.email_smtp_check_error'), contact.errors.messages[:email].first - end - - def test_email_verification_mx_error - Truemail.configure.default_validation_type = :mx - - contact = valid_contact - contact.email = 'somecrude31337joke@somestrange31337domain.ee' - assert contact.invalid? - assert_equal I18n.t('email_verifable.email_mx_check_error'), contact.errors.messages[:email].first - end - - def test_email_verification_regex_error - Truemail.configure.default_validation_type = :regex - - contact = valid_contact - contact.email = 'some@strangesentence@internet.ee' - assert contact.invalid? - assert_equal I18n.t('email_verifable.email_regex_check_error'), contact.errors.messages[:email].first - end - def test_invalid_without_phone contact = valid_contact contact.phone = '' @@ -285,16 +257,6 @@ class ContactTest < ActiveSupport::TestCase assert_equal domain.whois_record.try(:json).try(:[], 'registrant'), @contact.name end - def test_creates_email_verification_in_unicode - unicode_email = 'suur@äri.ee' - punycode_email = Contact.unicode_to_punycode(unicode_email) - - @contact.email = punycode_email - @contact.save - - assert_equal @contact.email_verification.email, unicode_email - end - private def make_contact_free_of_domains_where_it_acts_as_a_registrant(contact) diff --git a/test/models/registrar_test.rb b/test/models/registrar_test.rb index 8edbb1e4b..c5d832922 100644 --- a/test/models/registrar_test.rb +++ b/test/models/registrar_test.rb @@ -5,13 +5,11 @@ class RegistrarTest < ActiveSupport::TestCase @registrar = registrars(:bestnames) @original_default_language = Setting.default_language @original_days_to_keep_invoices_active = Setting.days_to_keep_invoices_active - @old_validation_type = Truemail.configure.default_validation_type end teardown do Setting.default_language = @original_default_language Setting.days_to_keep_invoices_active = @original_days_to_keep_invoices_active - Truemail.configure.default_validation_type = @old_validation_type end def test_valid_registrar_is_valid @@ -40,99 +38,16 @@ class RegistrarTest < ActiveSupport::TestCase assert registrar.invalid? end - def test_email_verification_valid + def test_email_format_validation registrar = valid_registrar - registrar.email = 'info@internet.ee' - registrar.billing_email = nil + registrar.email = 'invalid' + assert registrar.invalid? + + registrar.email = 'valid@email.test' assert registrar.valid? end - def test_email_verification_smtp_error - Truemail.configure.default_validation_type = :smtp - - registrar = valid_registrar - registrar.email = 'somecrude1337joke@internet.ee' - registrar.billing_email = nil - - assert registrar.invalid? - assert_equal I18n.t('email_verifable.email_smtp_check_error'), registrar.errors.messages[:email].first - end - - def test_email_verification_mx_error - Truemail.configure.default_validation_type = :mx - - registrar = valid_registrar - registrar.email = 'somecrude31337joke@somestrange31337domain.ee' - registrar.billing_email = nil - - assert registrar.invalid? - assert_equal I18n.t('email_verifable.email_mx_check_error'), registrar.errors.messages[:email].first - end - - def test_email_verification_regex_error - Truemail.configure.default_validation_type = :regex - - registrar = valid_registrar - registrar.email = 'some@strangesentence@internet.ee' - registrar.billing_email = nil - - assert registrar.invalid? - assert_equal I18n.t('email_verifable.email_regex_check_error'), registrar.errors.messages[:email].first - end - - def test_billing_email_verification_valid - registrar = valid_registrar - registrar.billing_email = 'info@internet.ee' - - assert registrar.valid? - end - - def test_billing_email_verification_smtp_error - Truemail.configure.default_validation_type = :smtp - - registrar = valid_registrar - registrar.billing_email = 'somecrude1337joke@internet.ee' - - assert registrar.invalid? - assert_equal I18n.t('email_verifable.email_smtp_check_error'), registrar.errors.messages[:billing_email].first - end - - def test_billing_email_verification_mx_error - Truemail.configure.default_validation_type = :mx - - registrar = valid_registrar - registrar.billing_email = 'somecrude31337joke@somestrange31337domain.ee' - - assert registrar.invalid? - assert_equal I18n.t('email_verifable.email_mx_check_error'), registrar.errors.messages[:billing_email].first - end - - def test_billing_email_verification_regex_error - Truemail.configure.default_validation_type = :regex - - registrar = valid_registrar - registrar.billing_email = 'some@strangesentence@internet.ee' - - assert registrar.invalid? - assert_equal I18n.t('email_verifable.email_regex_check_error'), registrar.errors.messages[:billing_email].first - end - - def test_creates_email_verification_in_unicode - unicode_email = 'suur@äri.ee' - punycode_email = Registrar.unicode_to_punycode(unicode_email) - unicode_billing_email = 'billing@äri.ee' - punycode_billing_email = Registrar.unicode_to_punycode(unicode_billing_email) - - registrar = valid_registrar - registrar.email = punycode_email - registrar.billing_email = punycode_billing_email - registrar.save - - assert_equal registrar.email_verification.email, unicode_email - assert_equal registrar.billing_email_verification.email, unicode_billing_email - end - def test_invalid_without_accounting_customer_code registrar = valid_registrar registrar.accounting_customer_code = '' @@ -145,6 +60,16 @@ class RegistrarTest < ActiveSupport::TestCase assert registrar.valid? end + def test_billing_email_format_validation + registrar = valid_registrar + + registrar.billing_email = 'invalid' + assert registrar.invalid? + + registrar.billing_email = 'valid@email.test' + assert registrar.valid? + end + def test_returns_billing_email_when_provided billing_email = 'billing@registrar.test' registrar = Registrar.new(billing_email: billing_email) diff --git a/test/tasks/emails/verify_email_task_test.rb b/test/tasks/emails/verify_email_task_test.rb deleted file mode 100644 index 7cca11845..000000000 --- a/test/tasks/emails/verify_email_task_test.rb +++ /dev/null @@ -1,63 +0,0 @@ -require 'test_helper' - -class VerifyEmailTaskTest < ActiveSupport::TestCase - - def setup - @contact = contacts(:john) - @invalid_contact = contacts(:invalid_email) - @contact_verification = @contact.email_verification - @invalid_contact_verification = @invalid_contact.email_verification - - @default_whitelist = Truemail.configure.whitelisted_domains - @default_blacklist = Truemail.configure.blacklisted_domains - Truemail.configure.whitelisted_domains = whitelisted_domains - Truemail.configure.blacklisted_domains = blacklisted_domains - end - - def teardown - Truemail.configure.whitelisted_domains = @default_whitelist - Truemail.configure.blacklisted_domains = @default_blacklist - end - - def domain(email) - Mail::Address.new(email).domain - rescue Mail::Field::IncompleteParseError - nil - end - - def whitelisted_domains - [domain(@contact.email)].reject(&:blank?) - end - - def blacklisted_domains - [domain(@invalid_contact.email)].reject(&:blank?) - end - - def test_tasks_verifies_emails - capture_io { run_task } - - @contact_verification.reload - @invalid_contact_verification.reload - - assert @contact_verification.verified? - assert @invalid_contact_verification.failed? - end - - def test_domain_task_verifies_for_one_domain - capture_io { run_single_domain_task(@contact_verification.domain) } - - @contact_verification.reload - @invalid_contact_verification.reload - - assert @contact_verification.verified? - assert @invalid_contact_verification.not_verified? - end - - def run_task - Rake::Task['verify_email:all_domains'].execute - end - - def run_single_domain_task(domain) - Rake::Task["verify_email:domain"].invoke(domain) - end -end