Merge pull request #1871 from internetee/645-2-gracefully-drop-que-email-jobs-sidekiq

Change Que for Sidekiq as job backend

Gemfile

@@ -67,6 +67,7 @@ gem 'epp-xml', '1.1.0', github: 'internetee/epp-xml'
 gem 'que'
 gem 'daemons-rails', '1.2.1'
 gem 'que-web'
+gem 'sidekiq'
 gem 'pdfkit'
 gem 'jquery-ui-rails', '5.0.5'
 gem 'airbrake'

Gemfile.lock

@@ -190,6 +190,7 @@ GEM
       execjs
     coffee-script-source (1.12.2)
     concurrent-ruby (1.1.8)
+    connection_pool (2.2.3)
     countries (3.1.0)
       i18n_data (~> 0.11.0)
       sixarm_ruby_unaccent (~> 1.1)
@@ -384,6 +385,7 @@ GEM
       activesupport (>= 5.2.4)
       i18n
     rbtree3 (0.6.0)
+    redis (4.2.5)
     regexp_parser (2.1.1)
     request_store (1.5.0)
       rack (>= 1.4)
@@ -421,6 +423,10 @@ GEM
     selenium-webdriver (3.142.7)
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
+    sidekiq (6.1.3)
+      connection_pool (>= 2.2.2)
+      rack (~> 2.0)
+      redis (>= 4.2.0)
     simplecov (0.17.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -554,6 +560,7 @@ DEPENDENCIES
   sass-rails
   select2-rails (= 4.0.13)
   selectize-rails (= 0.12.1)
+  sidekiq
   simplecov (= 0.17.1)
   simpleidn (= 0.1.1)
   truemail (~> 2.2)
@@ -565,4 +572,4 @@ DEPENDENCIES
   wkhtmltopdf-binary (~> 0.12.5.1)
 
 BUNDLED WITH
-   2.2.2
+   2.2.15

app/interactions/domains/expire_period/process_expired.rb

@@ -14,7 +14,7 @@ module Domains
         return unless saved
 
         recipients.each do |recipient|
-          DomainExpireEmailJob.enqueue(domain.id, recipient, run_at: send_time)
+          DomainExpireEmailJob.set(wait_until: send_time).perform_later(domain.id, recipient)
         end
       end
 

app/interactions/domains/expired_pendings/process_clean.rb

@@ -9,7 +9,7 @@ module Domains
         clean_pendings
 
         to_stdout("DomainCron.clean_expired_pendings: ##{domain.id} (#{domain.name})")
-        UpdateWhoisRecordJob.enqueue domain.name, 'domain'
+        UpdateWhoisRecordJob.perform_later domain.name, 'domain'
       end
 
       private

app/interactions/domains/update_confirm/process_update_confirmed.rb

@@ -17,7 +17,7 @@ module Domains
         update_domain
         clean_pendings!
 
-        WhoisRecord.find_by(domain_id: domain.id).save # need to reload model
+        WhoisRecord.find_by(domain_id: domain.id)&.save # need to reload model
       end
 
       def update_domain

app/jobs/application_job.rb

@@ -1,2 +1,4 @@
 class ApplicationJob < ActiveJob::Base
+  discard_on NoMethodError
+  queue_as :default
 end

app/jobs/csync_job.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-class CsyncJob < Que::Job
+class CsyncJob < ApplicationJob
-  def run(generate: false)
+  def perform(generate: false)
     @store = {}
     @input_store = { secure: {}, insecure: {} }
     @results = {}

app/jobs/directo_invoice_forward_job.rb

@@ -1,5 +1,5 @@
-class DirectoInvoiceForwardJob < Que::Job
+class DirectoInvoiceForwardJob < ApplicationJob
-  def run(monthly: false, dry: false)
+  def perform(monthly: false, dry: false)
     @dry = dry
     (@month = Time.zone.now - 1.month) if monthly
 

app/jobs/dispute_status_update_job.rb

@@ -1,5 +1,5 @@
-class DisputeStatusUpdateJob < Que::Job
+class DisputeStatusUpdateJob < ApplicationJob
-  def run(logger: Logger.new(STDOUT))
+  def perform(logger: Logger.new(STDOUT))
     @logger = logger
 
     @backlog = { 'activated': 0, 'closed': 0, 'activate_fail': [], 'close_fail': [] }

app/jobs/domain_delete_confirm_job.rb

@@ -1,6 +1,4 @@
 class DomainDeleteConfirmJob < ApplicationJob
-  queue_as :default
-
   def perform(domain_id, action, initiator = nil)
     domain = Epp::Domain.find(domain_id)
 
@@ -8,4 +6,34 @@ class DomainDeleteConfirmJob < ApplicationJob
                                               action: action,
                                               initiator: initiator)
   end
+
+  private
+
+  def action_confirmed(domain)
+    domain.notify_registrar(:poll_pending_delete_confirmed_by_registrant)
+    domain.apply_pending_delete!
+    raise_errors!(domain)
+  end
+
+  def action_rejected(domain)
+    domain.statuses.delete(DomainStatus::PENDING_DELETE_CONFIRMATION)
+    domain.notify_registrar(:poll_pending_delete_rejected_by_registrant)
+
+    domain.cancel_pending_delete
+    domain.save(validate: false)
+    raise_errors!(domain)
+    notify_on_domain(domain)
+  end
+
+  def notify_on_domain(domain)
+    if domain.registrant_verification_token.blank?
+      Rails.logger.warn 'EMAIL NOT DELIVERED: registrant_verification_token is missing for '\
+                        "#{domain.name}"
+    elsif domain.registrant_verification_asked_at.blank?
+      Rails.logger.warn 'EMAIL NOT DELIVERED: registrant_verification_asked_at is missing for '\
+                        "#{domain.name}"
+    else
+      DomainDeleteMailer.rejected(domain).deliver_now
+    end
+  end
 end

app/jobs/domain_delete_job.rb

@@ -1,6 +1,5 @@
-class DomainDeleteJob < Que::Job
+class DomainDeleteJob < ApplicationJob
-
+  def perform(domain_id)
-  def run(domain_id)
     domain = Domain.find(domain_id)
 
     Domains::Delete::DoDelete.run(domain: domain)

app/jobs/domain_expire_email_job.rb

@@ -1,5 +1,5 @@
-class DomainExpireEmailJob < Que::Job
+class DomainExpireEmailJob < ApplicationJob
-  def run(domain_id, email)
+  def perform(domain_id, email)
     domain = Domain.find(domain_id)
 
     return if domain.registered?

app/jobs/domain_update_confirm_job.rb

@@ -1,6 +1,4 @@
 class DomainUpdateConfirmJob < ApplicationJob
-  queue_as :default
-
   def perform(domain_id, action, initiator = nil)
     domain = Epp::Domain.find(domain_id)
     Domains::UpdateConfirm::ProcessAction.run(domain: domain,

app/jobs/regenerate_registrar_whoises_job.rb

@@ -1,10 +1,12 @@
-class RegenerateRegistrarWhoisesJob < Que::Job
+class RegenerateRegistrarWhoisesJob < ApplicationJob
-  def run(registrar_id)
+  retry_on StandardError, wait: 2.seconds, attempts: 3
+
+  def perform(registrar_id)
     # no return as we want restart job if fails
     registrar = Registrar.find(registrar_id)
 
     registrar.whois_records.select(:name).find_in_batches(batch_size: 20) do |group|
-      UpdateWhoisRecordJob.enqueue group.map(&:name), 'domain'
+      UpdateWhoisRecordJob.perform_later group.map(&:name), 'domain'
     end
   end
 end

app/jobs/regenerate_subzone_whoises_job.rb

@@ -1,11 +1,11 @@
-class RegenerateSubzoneWhoisesJob < Que::Job
+class RegenerateSubzoneWhoisesJob < ApplicationJob
-  def run
+  def perform
     subzones = DNS::Zone.all
 
     subzones.each do |zone|
       next unless zone.subzone?
 
-      UpdateWhoisRecordJob.enqueue zone.origin, 'zone'
+      UpdateWhoisRecordJob.perform_later zone.origin, 'zone'
     end
   end
 end

app/jobs/registrant_change_confirm_email_job.rb

@@ -1,5 +1,5 @@
-class RegistrantChangeConfirmEmailJob < Que::Job
+class RegistrantChangeConfirmEmailJob < ApplicationJob
-  def run(domain_id, new_registrant_id)
+  def perform(domain_id, new_registrant_id)
     domain = Domain.find(domain_id)
     new_registrant = Registrant.find(new_registrant_id)
 

app/jobs/registrant_change_expired_email_job.rb

@@ -0,0 +1,23 @@
+class RegistrantChangeExpiredEmailJob < ApplicationJob
+  def perform(domain_id)
+    domain = Domain.find(domain_id)
+    log(domain)
+    RegistrantChangeMailer.expired(domain: domain,
+                                   registrar: domain.registrar,
+                                   registrant: domain.registrant,
+                                   send_to: [domain.new_registrant_email,
+                                             domain.registrant.email]).deliver_now
+  end
+
+  private
+
+  def log(domain)
+    message = 'Send RegistrantChangeMailer#expired email for domain '\
+               "#{domain.name} (##{domain.id}) to #{domain.new_registrant_email}"
+    logger.info(message)
+  end
+
+  def logger
+    Rails.logger
+  end
+end

app/jobs/registrant_change_notice_email_job.rb

@@ -1,5 +1,5 @@
-class RegistrantChangeNoticeEmailJob < Que::Job
+class RegistrantChangeNoticeEmailJob < ApplicationJob
-  def run(domain_id, new_registrant_id)
+  def perform(domain_id, new_registrant_id)
     domain = Domain.find(domain_id)
     new_registrant = Registrant.find(new_registrant_id)
     log(domain, new_registrant)

app/jobs/send_e_invoice_job.rb

@@ -1,13 +1,11 @@
-class SendEInvoiceJob < Que::Job
+class SendEInvoiceJob < ApplicationJob
-  def run(invoice_id, payable = true)
+  discard_on HTTPClient::TimeoutError
-    invoice = run_condition(Invoice.find_by(id: invoice_id), payable: payable)
 
-    invoice.to_e_invoice(payable: payable).deliver
+  def perform(invoice_id, payable = true)
-    ActiveRecord::Base.transaction do
+    invoice = Invoice.find_by(id: invoice_id)
-      invoice.update(e_invoice_sent_at: Time.zone.now)
+    return unless need_to_process_invoice?(invoice: invoice, payable: payable)
-      log_success(invoice)
+
-      destroy
+    process(invoice: invoice, payable: payable)
-    end
   rescue StandardError => e
     log_error(invoice: invoice, error: e)
     raise e
@@ -15,10 +13,17 @@ class SendEInvoiceJob < Que::Job
 
   private
 
-  def run_condition(invoice, payable: true)
+  def need_to_process_invoice?(invoice:, payable:)
-    destroy unless invoice
+    return false if invoice.blank?
-    destroy if invoice.do_not_send_e_invoice? && payable
+    return false if invoice.do_not_send_e_invoice? && payable
-    invoice
+
+    true
+  end
+
+  def process(invoice:, payable:)
+    invoice.to_e_invoice(payable: payable).deliver
+    invoice.update(e_invoice_sent_at: Time.zone.now)
+    log_success(invoice)
   end
 
   def log_success(invoice)

app/jobs/update_whois_record_job.rb

@@ -1,5 +1,5 @@
-class UpdateWhoisRecordJob < Que::Job
+class UpdateWhoisRecordJob < ApplicationJob
-  def run(names, type)
+  def perform(names, type)
     Whois::Update.run(names: [names].flatten, type: type)
   end
 end

app/jobs/verify_emails_job.rb

@@ -1,14 +1,11 @@
-class VerifyEmailsJob < Que::Job
+class VerifyEmailsJob < ApplicationJob
-  def run(verification_id)
+  discard_on StandardError
-    email_address_verification = run_condition(EmailAddressVerification.find(verification_id))
 
-    return if email_address_verification.recently_verified?
+  def perform(verification_id)
+    email_address_verification = EmailAddressVerification.find(verification_id)
+    return unless need_to_verify?(email_address_verification)
 
-    ActiveRecord::Base.transaction do
+    process(email_address_verification)
-      email_address_verification.verify
-      log_success(email_address_verification)
-      destroy
-    end
   rescue StandardError => e
     log_error(verification: email_address_verification, error: e)
     raise e
@@ -16,11 +13,16 @@ class VerifyEmailsJob < Que::Job
 
   private
 
-  def run_condition(email_address_verification)
+  def need_to_verify?(email_address_verification)
-    destroy unless email_address_verification
+    return false if email_address_verification.blank?
-    destroy if email_address_verification.recently_verified?
+    return false if email_address_verification.recently_verified?
 
-    email_address_verification
+    true
+  end
+
+  def process(email_address_verification)
+    email_address_verification.verify
+    log_success(email_address_verification)
   end
 
   def logger

app/models/blocked_domain.rb

@@ -34,6 +34,6 @@ class BlockedDomain < ApplicationRecord
   end
 
   def remove_data
-    UpdateWhoisRecordJob.enqueue name, 'blocked'
+    UpdateWhoisRecordJob.perform_later name, 'blocked'
   end
 end

app/models/concerns/domain/deletable.rb

@@ -7,17 +7,24 @@ module Domain::Deletable
     DomainStatus::FORCE_DELETE,
   ].freeze
 
+  def deletion_time
+    @deletion_time ||= Time.zone.at(rand(deletion_time_span))
+  end
+
   private
 
   def delete_later
-    deletion_time = Time.zone.at(rand(deletion_time_span))
+    DomainDeleteJob.set(wait_until: deletion_time).perform_later(id)
-    DomainDeleteJob.enqueue(id, run_at: deletion_time, priority: 1)
     logger.info "Domain #{name} is scheduled to be deleted around #{deletion_time}"
   end
 
   def do_not_delete_later
-    # Que job can be manually deleted in admin area UI
+    return if Rails.env.test?
-    QueJob.find_by("args->>0 = '#{id}'", job_class: DomainDeleteJob.name)&.destroy
+
+    jobs = Sidekiq::ScheduledSet.new.select do |job|
+      job.args.first['job_class'] == 'DomainDeleteJob' && job.args.first['arguments'] == [id]
+    end
+    jobs.each(&:delete)
   end
 
   def deletion_time_span

app/models/concerns/invoice/payable.rb

@@ -11,7 +11,7 @@ module Invoice::Payable
   end
 
   def paid?
-    account_activity
+    account_activity.present?
   end
 
   def receipt_date

app/models/concerns/zone/whois_queryable.rb

@@ -11,7 +11,7 @@ module Zone::WhoisQueryable
   end
 
   def update_whois_record
-    UpdateWhoisRecordJob.enqueue origin, 'zone'
+    UpdateWhoisRecordJob.perform_later origin, 'zone'
   end
 
   def generate_data

app/models/contact.rb

@@ -492,7 +492,7 @@ class Contact < ApplicationRecord
     return if saved_changes.slice(*(self.class.column_names - ignored_columns)).empty?
 
     names = related_domain_descriptions.keys
-    UpdateWhoisRecordJob.enqueue(names, 'domain') if names.present?
+    UpdateWhoisRecordJob.perform_later(names, 'domain') if names.present?
   end
 
   def children_log

app/models/dispute.rb

@@ -84,7 +84,7 @@ class Dispute < ApplicationRecord
   end
 
   def remove_data
-    UpdateWhoisRecordJob.enqueue domain_name, 'disputed'
+    UpdateWhoisRecordJob.perform_later domain_name, 'disputed'
   end
 
   def fill_empty_passwords

app/models/domain.rb

@@ -425,8 +425,8 @@ class Domain < ApplicationRecord
     new_registrant_email = registrant.email
     new_registrant_name  = registrant.name
 
-    RegistrantChangeConfirmEmailJob.enqueue(id, new_registrant_id)
+    RegistrantChangeConfirmEmailJob.perform_later(id, new_registrant_id)
-    RegistrantChangeNoticeEmailJob.enqueue(id, new_registrant_id)
+    RegistrantChangeNoticeEmailJob.perform_later(id, new_registrant_id)
 
     reload
 
@@ -670,7 +670,7 @@ class Domain < ApplicationRecord
   end
 
   def update_whois_record
-    UpdateWhoisRecordJob.enqueue name, 'domain'
+    UpdateWhoisRecordJob.perform_later name, 'domain'
   end
 
   def status_notes_array=(notes)

app/models/que_job.rb

@@ -1,4 +1,3 @@
-# To be able to remove existing jobs
 class QueJob < ApplicationRecord
   self.primary_key = 'job_id'
 end

app/models/registrant_verification.rb

@@ -30,12 +30,12 @@ class RegistrantVerification < ApplicationRecord
   def domain_registrant_delete_confirm!(initiator)
     self.action_type = DOMAIN_DELETE
     self.action = CONFIRMED
-    DomainDeleteConfirmJob.perform_later domain.id, CONFIRMED, initiator if save
+    DomainDeleteConfirmJob.perform_later(domain.id, CONFIRMED, initiator) if save
   end
 
   def domain_registrant_delete_reject!(initiator)
     self.action_type = DOMAIN_DELETE
     self.action = REJECTED
-    DomainDeleteConfirmJob.perform_later domain.id, REJECTED, initiator if save
+    DomainDeleteConfirmJob.perform_later(domain.id, REJECTED, initiator) if save
   end
 end

app/models/registrar.rb

@@ -43,7 +43,7 @@ class Registrar < ApplicationRecord
   after_commit :update_whois_records
   def update_whois_records
     return true unless changed? && (changes.keys & WHOIS_TRIGGERS).present?
-    RegenerateRegistrarWhoisesJob.enqueue id
+    RegenerateRegistrarWhoisesJob.perform_later id
   end
 
   self.ignored_columns = %w[legacy_id]
@@ -104,7 +104,7 @@ class Registrar < ApplicationRecord
       InvoiceMailer.invoice_email(invoice: invoice, recipient: billing_email).deliver_now
     end
 
-    SendEInvoiceJob.enqueue(invoice.id, payable)
+    SendEInvoiceJob.perform_later(invoice.id, payable)
 
     invoice
   end

app/models/reserved_domain.rb

@@ -59,6 +59,6 @@ class ReservedDomain < ApplicationRecord
   alias_method :update_whois_record, :generate_data
 
   def remove_data
-    UpdateWhoisRecordJob.enqueue name, 'reserved'
+    UpdateWhoisRecordJob.perform_later name, 'reserved'
   end
 end

config/application.rb

@@ -17,7 +17,7 @@ end
 module DomainNameRegistry
   class Application < Rails::Application
     config.load_defaults 6.0
-    config.autoloader = :zeitwerk # Do not use zeitwerk for now
+    config.autoloader = :zeitwerk
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
@@ -44,6 +44,8 @@ module DomainNameRegistry
 
     config.active_record.schema_format = :sql
 
+    config.active_job.queue_adapter = :sidekiq
+
     config.generators do |g|
       g.stylesheets false
       g.javascripts false
@@ -77,6 +79,14 @@ module DomainNameRegistry
     config.action_view.default_form_builder = 'DefaultFormBuilder'
     config.secret_key_base = Figaro.env.secret_key_base
 
+    # nil will use the "default" queue
+    # some of these options will not work with your Rails version
+    # add/remove as necessary
+    config.action_mailer.deliver_later_queue_name = nil # defaults to "mailers"
+    config.active_storage.queues.analysis   = nil       # defaults to "active_storage_analysis"
+    config.active_storage.queues.purge      = nil       # defaults to "active_storage_purge"
+    config.active_storage.queues.mirror     = nil       # defaults to "active_storage_mirror"
+
     # Using `Rails.application.config.active_record.belongs_to_required_by_default` in
     # `new_framework_defaults.rb` has no effect in Rails 5.0.x.
     # https://github.com/rails/rails/issues/23589

config/environments/development.rb.sample

@@ -62,9 +62,10 @@ Rails.application.configure do
   # Use an evented file watcher to asynchronously detect changes in source code,
   # routes, locales, etc. This feature depends on the listen gem.
   config.file_watcher = ActiveSupport::EventedFileUpdateChecker
-end
 
-# In this mode, any jobs you queue will be run in the same thread, synchronously
+  # In this mode, any jobs you queue will be run in the same thread, synchronously
-# (that is, MyJob.enqueue runs the job and won't return until it's completed).
+  # (that is, MyJob.enqueue runs the job and won't return until it's completed).
-# This makes your application's behavior easier to test
+  # This makes your application's behavior easier to test
-Que.mode = :sync
+  config.active_job.queue_adapter = :test
+
+end

config/environments/production.rb

@@ -56,7 +56,7 @@ Rails.application.configure do
   # config.cache_store = :mem_cache_store
 
   # Use a real queuing backend for Active Job (and separate queues per environment)
-  # config.active_job.queue_adapter     = :resque
+  config.active_job.queue_adapter = :que
   # config.active_job.queue_name_prefix = "domain_name_registry_#{Rails.env}"
   config.action_mailer.perform_caching = false
 
@@ -87,8 +87,3 @@ Rails.application.configure do
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
 end
-
-# In off mode, queueing a job will simply insert it into the database -
-# the current process will make no effort to run it.
-# You should use this if you want to use a dedicated process to work tasks
-Que.mode = :off

config/environments/test.rb

@@ -14,6 +14,8 @@ Rails.application.configure do
   # preloads Rails for running tests, you may have to set it to true.
   config.eager_load = false
 
+  config.active_job.queue_adapter = :test
+
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
@@ -40,5 +42,3 @@ Rails.application.configure do
   # If set to :null_store, Setting.x returns nil after first spec runs (database is emptied)
   config.cache_store = :memory_store
 end
-
-Que.mode = :sync

config/initializers/sidekiq.rb

@@ -0,0 +1,3 @@
+require 'sidekiq/web' # Require at the top of the initializer
+
+Sidekiq::Web.set :session_secret, Rails.application.secret_key_base

config/routes.rb

@@ -1,4 +1,5 @@
 require_dependency 'epp_constraint'
+require 'sidekiq/web'
 
 Rails.application.routes.draw do
   # https://github.com/internetee/epp_proxy#translation-of-epp-calls
@@ -324,6 +325,7 @@ Rails.application.routes.draw do
 
     authenticate :admin_user do
       mount Que::Web, at: 'que'
+      mount Sidekiq::Web, at: 'sidekiq'
     end
   end
 

config/sidekiq.yml

@@ -0,0 +1 @@
+:concurrency: 10

db/data/20210405081552_migrate_que_jobs.rb

@@ -0,0 +1,24 @@
+class MigrateQueJobs < ActiveRecord::Migration[6.0]
+  def up
+    QueJob.all.each do |job|
+      if skip_condition(job)
+        logger.info "Skipped Que job migration: #{job.inspect}"
+      else
+        args = job.args
+        job.job_class.constantize.perform_later(args)
+      end
+    end
+  end
+
+  def down
+    # raise ActiveRecord::IrreversibleMigration
+  end
+
+  def logger
+    @logger ||= Logger.new(Rails.root.join('log', 'que_to_sidekiq_migration.log'))
+  end
+
+  def skip_condition(job)
+    job.last_error.present? || !(job.job_class.constantize < ApplicationJob)
+  end
+end

db/data_schema.rb

@@ -1,2 +1,2 @@
 # encoding: UTF-8
-DataMigrate::Data.define(version: 20210407140317)
+DataMigrate::Data.define(version: 20210405081552)

lib/daemons/que_ctl

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 require 'rubygems'
 require 'daemons/rails/config'
-
 config = Daemons::Rails::Config.for_controller(File.expand_path(__FILE__))
 Daemons::Rails.run config[:script], config.to_hash

lib/tasks/verify_email.rake

@@ -4,7 +4,7 @@ namespace :verify_email 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)
+      VerifyEmailsJob.perform_later(ver.id)
       next
     end
   end
@@ -18,6 +18,6 @@ namespace :verify_email do
 
     verifications_by_domain = EmailAddressVerification.not_verified_recently
                                                       .by_domain(args[:domain_name])
-    verifications_by_domain.map { |ver| VerifyEmailsJob.enqueue(ver.id) }
+    verifications_by_domain.map { |ver| VerifyEmailsJob.perform_later(ver.id) }
   end
 end

lib/tasks/whois.rake

@@ -23,22 +23,23 @@ namespace :whois do
 
       print "\n-----> Update domains whois_records"
       Domain.find_in_batches.each do |group|
-        UpdateWhoisRecordJob.enqueue group.map(&:name), 'domain'
+        UpdateWhoisRecordJob.perform_later group.map(&:name), 'domain'
       end
 
       print "\n-----> Update blocked domains whois_records"
       BlockedDomain.find_in_batches.each do |group|
-        UpdateWhoisRecordJob.enqueue group.map(&:name), 'blocked'
+        UpdateWhoisRecordJob.perform_later group.map(&:name), 'blocked'
       end
 
       print "\n-----> Update reserved domains whois_records"
       ReservedDomain.find_in_batches.each do |group|
-        UpdateWhoisRecordJob.enqueue group.map(&:name), 'reserved'
+        UpdateWhoisRecordJob.perform_later group.map(&:name), 'reserved'
       end
 
       print "\n-----> Update disputed domains whois_records"
       Dispute.active.find_in_batches.each do |group|
-        UpdateWhoisRecordJob.enqueue group.map(&:domain_name), 'disputed'
+
+        UpdateWhoisRecordJob.perform_later group.map(&:domain_name), 'disputed'
       end
     end
     puts "\n-----> all done in #{(Time.zone.now.to_f - start).round(2)} seconds"

test/integration/epp/domain/delete/base_test.rb

@@ -92,12 +92,13 @@ class EppDomainDeleteBaseTest < EppTestCase
     perform_enqueued_jobs do
       post epp_delete_path, params: { frame: request_xml }, headers: { 'HTTP_COOKIE' => 'session=api_bestnames' }
     end
+
     @domain.reload
 
     assert @domain.registrant_verification_asked?
     assert @domain.pending_delete_confirmation?
-    assert_emails 1
     assert_epp_response :completed_successfully_action_pending
+    assert_emails 1
   end
 
   def test_skips_registrant_confirmation_when_not_required

test/integration/epp/domain/update/base_test.rb

@@ -2,6 +2,7 @@ require 'test_helper'
 
 class EppDomainUpdateBaseTest < EppTestCase
   include ActionMailer::TestHelper
+  include ActiveJob::TestHelper
 
   setup do
     @domain = domains(:shop)
@@ -134,15 +135,17 @@ class EppDomainUpdateBaseTest < EppTestCase
       </epp>
     XML
 
-    post epp_update_path, params: { frame: request_xml },
+    assert_no_enqueued_jobs
-         headers: { 'HTTP_COOKIE' => 'session=api_bestnames' }
+    assert_enqueued_jobs 3 do
+      post epp_update_path, params: { frame: request_xml },
+           headers: { 'HTTP_COOKIE' => 'session=api_bestnames' }
+    end
     @domain.reload
 
     assert_epp_response :completed_successfully_action_pending
     assert_not_equal new_registrant, @domain.registrant
     assert @domain.registrant_verification_asked?
     assert_includes @domain.statuses, DomainStatus::PENDING_UPDATE
-    assert_verification_and_notification_emails
   end
 
   def test_domain_should_doesnt_have_pending_update_when_updated_registrant_with_same_idents_data
@@ -211,15 +214,17 @@ class EppDomainUpdateBaseTest < EppTestCase
       </epp>
     XML
 
-    post epp_update_path, params: { frame: request_xml },
+    assert_no_enqueued_jobs
-         headers: { 'HTTP_COOKIE' => 'session=api_bestnames' }
+    assert_enqueued_jobs 3 do
+      post epp_update_path, params: { frame: request_xml },
+           headers: { 'HTTP_COOKIE' => 'session=api_bestnames' }
+    end
     @domain.reload
 
     assert_epp_response :completed_successfully_action_pending
     assert_not_equal new_registrant, @domain.registrant
     assert @domain.registrant_verification_asked?
     assert_includes @domain.statuses, DomainStatus::PENDING_UPDATE
-    assert_verification_and_notification_emails
   end
 
   def test_updates_registrant_when_legaldoc_is_not_mandatory
@@ -247,15 +252,17 @@ class EppDomainUpdateBaseTest < EppTestCase
       </epp>
     XML
 
-    post epp_update_path, params: { frame: request_xml },
+    assert_no_enqueued_jobs
-         headers: { 'HTTP_COOKIE' => 'session=api_bestnames' }
+    assert_enqueued_jobs 3 do
+      post epp_update_path, params: { frame: request_xml },
+           headers: { 'HTTP_COOKIE' => 'session=api_bestnames' }
+    end
     @domain.reload
 
     assert_epp_response :completed_successfully_action_pending
     assert_not_equal new_registrant, @domain.registrant
     assert @domain.registrant_verification_asked?
     assert_includes @domain.statuses, DomainStatus::PENDING_UPDATE
-    assert_verification_and_notification_emails
   end
 
   def test_dows_not_update_registrant_when_legaldoc_is_mandatory

test/interactions/expire_period/start_test.rb

@@ -10,13 +10,7 @@ class StartTest < ActiveSupport::TestCase
   end
 
   def test_sets_expired
-    job_count = lambda do
+    Sidekiq::Testing.fake! do
-      QueJob.where("args->>0 = '#{@domain.id}'", job_class: DomainExpireEmailJob.name).count
-    end
-
-    one_job_per_contact_email = @domain.expired_domain_contact_emails.count
-
-    assert_difference job_count, one_job_per_contact_email do
       perform_enqueued_jobs do
         DomainCron.start_expire_period
       end

test/jobs/active_job_queuing_test.rb

@@ -0,0 +1,45 @@
+$VERBOSE=nil
+require 'test_helper'
+
+class ActiveJobQueuingTest < ActiveJob::TestCase
+
+  def test_job_discarded_after_error
+    assert_no_enqueued_jobs
+    assert_performed_jobs 1 do
+      TestDiscardedJob.perform_later
+    end
+    assert_no_enqueued_jobs
+  end
+
+  def test_job_retried_after_error
+    assert_no_enqueued_jobs
+    assert_raises StandardError do
+      assert_performed_jobs 3 do
+        TestRetriedJob.perform_later
+      end
+    end
+
+    assert_no_enqueued_jobs
+  end
+
+end
+
+class TestDiscardedJob < ApplicationJob
+  queue_as :default
+
+  discard_on StandardError
+
+  def perform
+    raise StandardError
+  end
+end
+
+class TestRetriedJob < ApplicationJob
+  queue_as :default
+
+  retry_on StandardError, wait: 2.seconds, attempts: 3
+
+  def perform
+    raise StandardError
+  end
+end

test/jobs/csync_job_test.rb

@@ -14,14 +14,14 @@ class CsyncJobTest < ActiveSupport::TestCase
     expected_contents = "[secure]\nns1.bestnames.test shop.test\nns2.bestnames.test shop.test\n" \
     "[insecure]\nns1.bestnames.test airport.test metro.test\nns2.bestnames.test airport.test\n"
 
-    CsyncJob.run(generate: true)
+    CsyncJob.perform_now(generate: true)
 
     assert_equal expected_contents, IO.read(ENV['cdns_scanner_input_file'])
   end
 
   def test_creates_csync_record_when_new_cdnskey_discovered
     assert_nil @domain.csync_record
-    CsyncJob.run
+    CsyncJob.perform_now
 
     @domain.reload
     assert @domain.csync_record
@@ -35,7 +35,7 @@ class CsyncJobTest < ActiveSupport::TestCase
   def test_creates_dnskey_after_required_cycles
     assert_equal 0, @domain.dnskeys.count
     assert_nil @domain.csync_record
-    CsyncJob.run # Creates initial CsyncRecord for domain
+    CsyncJob.perform_now # Creates initial CsyncRecord for domain
 
     @domain.reload
     assert @domain.csync_record.present?
@@ -46,7 +46,7 @@ class CsyncJobTest < ActiveSupport::TestCase
 
     CsyncRecord.stub :by_domain_name, @domain.csync_record do
       @domain.csync_record.stub :dnssec_validates?, true do
-        CsyncJob.run
+        CsyncJob.perform_now
       end
     end
 
@@ -58,13 +58,13 @@ class CsyncJobTest < ActiveSupport::TestCase
 
   def test_sends_mail_to_contacts_if_dnskey_updated
     assert_emails 1 do
-      CsyncJob.run
+      CsyncJob.perform_now
       @domain.reload
 
       CsyncRecord.stub :by_domain_name, @domain.csync_record do
         @domain.csync_record.stub :dnssec_validates?, true do
           2.times do
-            CsyncJob.run
+            CsyncJob.perform_now
           end
         end
       end

test/jobs/directo_invoice_forward_job_test.rb

@@ -38,7 +38,7 @@ class DirectoInvoiceForwardJobTest < ActiveSupport::TestCase
     end.to_return(status: 200, body: response)
 
     assert_nothing_raised do
-      DirectoInvoiceForwardJob.run(monthly: false, dry: false)
+      DirectoInvoiceForwardJob.perform_now(monthly: false, dry: false)
     end
 
     assert_not_empty @invoice.directo_records.first.request
@@ -52,7 +52,7 @@ class DirectoInvoiceForwardJobTest < ActiveSupport::TestCase
     Setting.directo_monthly_number_max = 30991
 
     assert_raises 'RuntimeError' do
-      DirectoInvoiceForwardJob.run(monthly: true, dry: false)
+      DirectoInvoiceForwardJob.perform_now(monthly: true, dry: false)
     end
   end
 
@@ -78,7 +78,7 @@ class DirectoInvoiceForwardJobTest < ActiveSupport::TestCase
     end.to_return(status: 200, body: response)
 
     assert_difference 'Setting.directo_monthly_number_last' do
-      DirectoInvoiceForwardJob.run(monthly: true, dry: false)
+      DirectoInvoiceForwardJob.perform_now(monthly: true, dry: false)
     end
   end
 
@@ -103,7 +103,7 @@ class DirectoInvoiceForwardJobTest < ActiveSupport::TestCase
     end.to_return(status: 200, body: response)
 
     assert_difference 'Setting.directo_monthly_number_last' do
-      DirectoInvoiceForwardJob.run(monthly: true, dry: false)
+      DirectoInvoiceForwardJob.perform_now(monthly: true, dry: false)
     end
   end
 
@@ -126,7 +126,7 @@ class DirectoInvoiceForwardJobTest < ActiveSupport::TestCase
     end.to_return(status: 200, body: response)
 
     assert_difference 'Setting.directo_monthly_number_last' do
-      DirectoInvoiceForwardJob.run(monthly: true, dry: false)
+      DirectoInvoiceForwardJob.perform_now(monthly: true, dry: false)
     end
   end
 
@@ -148,7 +148,7 @@ class DirectoInvoiceForwardJobTest < ActiveSupport::TestCase
     end.to_return(status: 200, body: response)
 
     assert_difference 'Setting.directo_monthly_number_last' do
-      DirectoInvoiceForwardJob.run(monthly: true, dry: false)
+      DirectoInvoiceForwardJob.perform_now(monthly: true, dry: false)
     end
   end
 
@@ -186,7 +186,7 @@ class DirectoInvoiceForwardJobTest < ActiveSupport::TestCase
       (body.include? 'StartDate') && (body.include? 'EndDate') && (body.include? 'goodnames')
     end.to_return(status: 200, body: response)
 
-    DirectoInvoiceForwardJob.run(monthly: true, dry: false)
+    DirectoInvoiceForwardJob.perform_now(monthly: true, dry: false)
 
     assert_requested first_registrar_stub
     assert_requested second_registrar_stub

test/jobs/dispute_status_update_job_test.rb

@@ -1,6 +1,6 @@
 require "test_helper"
 
-class DisputeStatusUpdateJobTest < ActiveSupport::TestCase
+class DisputeStatusUpdateJobTest < ActiveJob::TestCase
   setup do
     travel_to Time.zone.parse('2010-10-05')
     @logger = Rails.logger
@@ -8,13 +8,13 @@ class DisputeStatusUpdateJobTest < ActiveSupport::TestCase
 
   def test_nothing_is_raised
     assert_nothing_raised do
-      DisputeStatusUpdateJob.run(logger: @logger)
+      DisputeStatusUpdateJob.perform_now(logger: @logger)
     end
   end
 
   def test_whois_data_added_when_dispute_activated
     dispute = disputes(:future)
-    DisputeStatusUpdateJob.run(logger: @logger)
+    DisputeStatusUpdateJob.perform_now(logger: @logger)
 
     whois_record = Whois::Record.find_by(name: dispute.domain_name)
     assert whois_record.present?
@@ -25,7 +25,7 @@ class DisputeStatusUpdateJobTest < ActiveSupport::TestCase
     dispute = disputes(:active)
     dispute.update!(starts_at: Time.zone.today - 3.years - 1.day)
 
-    DisputeStatusUpdateJob.run(logger: @logger)
+    DisputeStatusUpdateJob.perform_now(logger: @logger)
     dispute.reload
 
     assert dispute.closed
@@ -37,7 +37,9 @@ class DisputeStatusUpdateJobTest < ActiveSupport::TestCase
   def test_registered_domain_whois_data_is_added
     Dispute.create(domain_name: 'shop.test', starts_at: '2010-07-05')
     travel_to Time.zone.parse('2010-07-05')
-    DisputeStatusUpdateJob.run(logger: @logger)
+    perform_enqueued_jobs do
+      DisputeStatusUpdateJob.perform_now(logger: @logger)
+    end
 
     whois_record = Whois::Record.find_by(name: 'shop.test')
     assert_includes whois_record.json['status'], 'disputed'
@@ -53,7 +55,9 @@ class DisputeStatusUpdateJobTest < ActiveSupport::TestCase
                   force_delete_date: nil)
 
     # Dispute status is added automatically if starts_at is not in future
-    Dispute.create(domain_name: 'shop.test', starts_at: Time.zone.parse('2010-07-05'))
+    perform_enqueued_jobs do
+      Dispute.create(domain_name: 'shop.test', starts_at: Time.zone.parse('2010-07-05'))
+    end
     domain.reload
 
     whois_record = Whois::Record.find_by(name: 'shop.test')
@@ -62,7 +66,9 @@ class DisputeStatusUpdateJobTest < ActiveSupport::TestCase
     # Dispute status is removed night time day after it's ended
     travel_to Time.zone.parse('2010-07-05') + 3.years + 1.day
 
-    DisputeStatusUpdateJob.run(logger: @logger)
+    perform_enqueued_jobs do
+      DisputeStatusUpdateJob.perform_now(logger: @logger)
+    end
 
     whois_record.reload
     assert_not whois_record.json['status'].include? 'disputed'

test/jobs/domain_delete_job_test.rb

@@ -12,7 +12,7 @@ class DomainDeleteJobTest < ActiveSupport::TestCase
     dom = Domain.find_by(id: @domain.id)
     assert dom
 
-    DomainDeleteJob.run(@domain.id)
+    DomainDeleteJob.perform_now(@domain.id)
 
     dom = Domain.find_by(id: @domain.id)
     assert_nil dom

test/jobs/domain_expire_email_job_test.rb

@@ -9,18 +9,12 @@ class DomainExpireEmailJobTest < ActiveSupport::TestCase
     @email = @domain.registrant.email
   end
 
-  def test_domain_expire
-    success = DomainExpireEmailJob.run(@domain.id, @email)
-    assert success
-  end
-
   def test_domain_expire_with_force_delete
     @domain.update(statuses: [DomainStatus::FORCE_DELETE])
     @domain.reload
     assert_equal ['serverForceDelete'], @domain.statuses
 
-    success = DomainExpireEmailJob.run(@domain.id, @email)
+    DomainExpireEmailJob.perform_now(@domain.id, @email)
-    assert success
 
     statuses = @domain.statuses
     statuses.delete(DomainStatus::FORCE_DELETE)

test/jobs/regenerate_registrar_whoises_job_test.rb

@@ -1,13 +0,0 @@
-require "test_helper"
-
-class RegenerateRegistrarWhoisesJobTest < ActiveSupport::TestCase
-  setup do
-    travel_to Time.zone.parse('2010-07-05 10:00')
-    @registrar = registrars(:bestnames)
-  end
-
-  def test_job_return_true
-    # if return false, then job was failes
-    assert RegenerateRegistrarWhoisesJob.run(@registrar.id)
-  end
-end

test/jobs/regenerate_subzone_whoises_job_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class RegenerateSubzoneWhoisesJobTest < ActiveSupport::TestCase
+class RegenerateSubzoneWhoisesJobTest < ActiveJob::TestCase
   def test_regenerates_whois_data_only_for_subzones
     subzone = dns_zones(:one).dup
     subzone.origin = 'subzone.test'
@@ -11,7 +11,9 @@ class RegenerateSubzoneWhoisesJobTest < ActiveSupport::TestCase
     assert_nil Whois::Record.find_by(name: subzone.origin)
     assert_nil Whois::Record.find_by(name: dns_zones(:one).origin)
 
-    RegenerateSubzoneWhoisesJob.run
+    perform_enqueued_jobs do
+      RegenerateSubzoneWhoisesJob.perform_now
+    end
     record = Whois::Record.find_by(name: subzone.origin)
     assert record
     assert record.json['dnssec_keys'].is_a?(Array)

test/jobs/registrant_change_confirm_email_job_test.rb

@@ -11,7 +11,7 @@ class RegistrantChangeConfirmEmailJobTest < ActiveSupport::TestCase
     domain_id = domains(:shop).id
     new_registrant_id = contacts(:william).id
 
-    RegistrantChangeConfirmEmailJob.enqueue(domain_id, new_registrant_id)
+    RegistrantChangeConfirmEmailJob.perform_now(domain_id, new_registrant_id)
 
     assert_emails 1
   end

test/jobs/registrant_change_expired_email_job_test.rb

@@ -0,0 +1,24 @@
+require 'test_helper'
+
+class RegistrantChangeExpiredEmailJobTest < ActiveJob::TestCase
+  include ActionMailer::TestHelper
+
+  setup do
+    ActionMailer::Base.deliveries.clear
+  end
+
+  def test_delivers_email
+    domain = domains(:shop)
+    domain.update!(pending_json: {new_registrant_email: 'aaa@bbb.com'})
+    domain_id = domain.id
+
+    assert_performed_jobs 1 do
+      perform_enqueued_jobs do
+        RegistrantChangeExpiredEmailJob.perform_later(domain_id)
+      end
+    end
+
+    assert_emails 1
+  end
+
+end

test/jobs/registrant_change_notice_email_job_test.rb

@@ -11,7 +11,7 @@ class RegistrantChangeNoticeEmailJobTest < ActiveSupport::TestCase
     domain_id = domains(:shop).id
     new_registrant_id = contacts(:william).id
 
-    RegistrantChangeNoticeEmailJob.enqueue(domain_id, new_registrant_id)
+    RegistrantChangeNoticeEmailJob.perform_now(domain_id, new_registrant_id)
 
     assert_emails 1
   end

test/jobs/send_e_invoice_job_test.rb

@@ -1,43 +1,22 @@
 require 'test_helper'
 
-class SendEInvoiceJobTest < ActiveSupport::TestCase
+class SendEInvoiceJobTest < ActiveJob::TestCase
 
   def teardown
     EInvoice.provider = EInvoice::Providers::TestProvider.new
     EInvoice::Providers::TestProvider.deliveries.clear
   end
 
-  def test_if_invoice_is_sended
+  def test_if_invoice_is_sent
     @invoice = invoices(:one)
+    @invoice.account_activity.destroy
     EInvoice.provider = EInvoice::Providers::TestProvider.new
     EInvoice::Providers::TestProvider.deliveries.clear
 
     assert_nothing_raised do
-      SendEInvoiceJob.enqueue(@invoice.id, true)
+      perform_enqueued_jobs do
-    end
+        SendEInvoiceJob.perform_now(@invoice.id, true)
-    @invoice.reload
+      end
-
-    assert_not @invoice.e_invoice_sent_at.blank?
-    assert_equal 1, EInvoice::Providers::TestProvider.deliveries.count
-  end
-
-  def test_if_invoice_sending_retries
-    @invoice = invoices(:one)
-    provider_config = { password: nil,
-                        test_mode: true }
-    EInvoice.provider = EInvoice::Providers::OmnivaProvider.new(provider_config)
-    stub_request(:get, "https://testfinance.post.ee/finance/erp/erpServices.wsdl").to_timeout
-
-    assert_raise HTTPClient::TimeoutError do
-      SendEInvoiceJob.enqueue(@invoice.id, true)
-    end
-    assert @invoicee_invoice_sent_at.blank?
-
-    EInvoice.provider = EInvoice::Providers::TestProvider.new
-    EInvoice::Providers::TestProvider.deliveries.clear
-
-    assert_nothing_raised do
-      SendEInvoiceJob.enqueue(@invoice.id, true)
     end
     @invoice.reload
 

test/jobs/update_whois_record_job_test.rb

@@ -0,0 +1,28 @@
+require 'test_helper'
+
+class SendEInvoiceJobTest < ActiveJob::TestCase
+
+  def test_job_is_updating_domains
+    domain_names = Domain.find_in_batches.first.map(&:name)
+    assert_domains_processed_by_task(domain_names, 'domain')
+  end
+
+  def test_job_is_updating_blocked_domains
+    domain_names = BlockedDomain.find_in_batches.first.map(&:name)
+    assert_domains_processed_by_task(domain_names, 'blocked')
+  end
+
+  def test_job_is_updating_reserved_domains
+    domain_names = ReservedDomain.find_in_batches.first.map(&:name)
+    assert_domains_processed_by_task(domain_names, 'reserved')
+  end
+
+  private
+
+  def assert_domains_processed_by_task(domain_names, type)
+    Rake::Task['whois:regenerate'].execute
+
+    perform_enqueued_jobs
+    assert_performed_with(job: UpdateWhoisRecordJob, args: [domain_names, type])
+  end
+end

test/jobs/verify_emails_job_test.rb

@@ -1,6 +1,6 @@
 require "test_helper"
 
-class VerifyEmailsJobTest < ActiveSupport::TestCase
+class VerifyEmailsJobTest < ActiveJob::TestCase
   def setup
     @contact = contacts(:john)
     @invalid_contact = contacts(:invalid_email)
@@ -33,7 +33,9 @@ class VerifyEmailsJobTest < ActiveSupport::TestCase
   end
 
   def test_job_checks_if_email_valid
-    VerifyEmailsJob.run(@contact_verification.id)
+    perform_enqueued_jobs do
+      VerifyEmailsJob.perform_now(@contact_verification.id)
+    end
     @contact_verification.reload
 
     assert @contact_verification.success
@@ -44,14 +46,18 @@ class VerifyEmailsJobTest < ActiveSupport::TestCase
     @contact_verification.update(success: true, verified_at: old_verified_at)
     assert @contact_verification.recently_verified?
 
-    VerifyEmailsJob.run(@contact_verification.id)
+    perform_enqueued_jobs do
+      VerifyEmailsJob.perform_now(@contact_verification.id)
+    end
     @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)
+    perform_enqueued_jobs do
+      VerifyEmailsJob.perform_now(@invalid_contact_verification.id)
+    end
     @contact_verification.reload
 
     refute @contact_verification.success

test/mailers/previews/registrant_change_mailer_preview.rb

@@ -37,6 +37,8 @@ class RegistrantChangeMailerPreview < ActionMailer::Preview
   def expired
     RegistrantChangeMailer.expired(domain: @domain,
                                    registrar: @domain.registrar,
-                                   registrant: @domain.registrant)
+                                   registrant: @domain.registrant,
+                                   send_to: [@domain.new_registrant_email,
+                                             @domain.registrant.email])
   end
 end

test/models/contact_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class ContactTest < ActiveSupport::TestCase
+class ContactTest < ActiveJob::TestCase
   setup do
     @contact = contacts(:john)
     @old_validation_type = Truemail.configure.default_validation_type
@@ -336,7 +336,9 @@ class ContactTest < ActiveSupport::TestCase
     @contact.name = 'SomeReallyWeirdRandomTestName'
     domain = @contact.registrant_domains.first
 
-    @contact.save!
+    perform_enqueued_jobs do
+      @contact.save!
+    end
 
     assert_equal domain.whois_record.try(:json).try(:[], 'registrant'), @contact.name
   end

test/models/dns/zone_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class DNS::ZoneTest < ActiveSupport::TestCase
+class DNS::ZoneTest < ActiveJob::TestCase
   def test_valid_zone_fixture_is_valid
     assert valid_zone.valid?, proc { valid_zone.errors.full_messages }
   end
@@ -134,7 +134,9 @@ class DNS::ZoneTest < ActiveSupport::TestCase
     subzone = dns_zones(:one).dup
 
     subzone.origin = 'sub.zone'
-    subzone.save
+    perform_enqueued_jobs do
+      subzone.save
+    end
 
     whois_record = Whois::Record.find_by(name: subzone.origin)
     assert whois_record.present?
@@ -144,7 +146,9 @@ class DNS::ZoneTest < ActiveSupport::TestCase
     subzone = dns_zones(:one).dup
 
     subzone.origin = 'sub.zone'
-    subzone.save
+    perform_enqueued_jobs do
+      subzone.save
+    end
 
     whois_record = Whois::Record.find_by(name: subzone.origin)
     assert whois_record.present?
@@ -170,11 +174,15 @@ class DNS::ZoneTest < ActiveSupport::TestCase
     subzone = dns_zones(:one).dup
 
     subzone.origin = 'sub.zone'
-    subzone.save
+    perform_enqueued_jobs do
+      subzone.save
+    end
 
     assert Whois::Record.find_by(name: subzone.origin).present?
 
-    subzone.destroy
+    perform_enqueued_jobs do
+      subzone.destroy
+    end
     assert_nil Whois::Record.find_by(name: subzone.origin)
   end
 

test/models/domain/releasable/auctionable_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class DomainReleasableAuctionableTest < ActiveSupport::TestCase
+class DomainReleasableAuctionableTest < ActiveJob::TestCase
   # Needed for `test_updates_whois` test because of `after_commit :update_whois_record` in Domain
   self.use_transactional_tests = false
 
@@ -65,7 +65,9 @@ class DomainReleasableAuctionableTest < ActiveSupport::TestCase
     travel_to Time.zone.parse('2010-07-05')
     old_whois = @domain.whois_record
 
-    Domain.release_domains
+    perform_enqueued_jobs do
+      Domain.release_domains
+    end
 
     assert_raises ActiveRecord::RecordNotFound do
       old_whois.reload

test/models/domain/releasable/discardable_test.rb

@@ -1,7 +1,12 @@
 require 'test_helper'
+require 'sidekiq/testing'
+Sidekiq::Testing.fake!
 
 class DomainReleasableDiscardableTest < ActiveSupport::TestCase
+  include ActiveJob::TestHelper
+
   setup do
+    ActiveJob::Base.queue_adapter = :test
     @domain = domains(:shop)
   end
 
@@ -41,11 +46,7 @@ class DomainReleasableDiscardableTest < ActiveSupport::TestCase
 
     Domain.release_domains
 
-    job_count = lambda do
+    assert_no_enqueued_jobs do
-      QueJob.where("args->>0 = '#{@domain.id}'", job_class: DomainDeleteJob.name).count
-    end
-
-    assert_no_difference job_count, 'A domain should not be discarded again' do
       Domain.release_domains
     end
   end
@@ -64,16 +65,18 @@ class DomainReleasableDiscardableTest < ActiveSupport::TestCase
     travel_to Time.zone.parse('2010-07-05')
 
     @domain.update_columns(delete_date: '2010-07-05')
-    Domain.release_domains
+
+    assert_enqueued_with(job: DomainDeleteJob) do
+      Domain.release_domains
+    end
 
     other_domain = domains(:airport)
     other_domain.update_columns(delete_date: '2010-07-05')
-    Domain.release_domains
+    assert_enqueued_with(job: DomainDeleteJob) do
+      Domain.release_domains
+    end
 
-    background_job = QueJob.find_by("args->>0 = '#{@domain.id}'", job_class: DomainDeleteJob.name)
+    assert_not other_domain.deletion_time == @domain.deletion_time
-    other_background_job = QueJob.find_by("args->>0 = '#{other_domain.id}'",
-                                          job_class: DomainDeleteJob.name)
-    assert_not_equal background_job.run_at, other_background_job.run_at
   end
 
   def test_discarding_a_domain_bypasses_validation
@@ -99,7 +102,8 @@ class DomainReleasableDiscardableTest < ActiveSupport::TestCase
 
   def test_keeping_a_domain_cancels_domain_deletion
     @domain.update!(statuses: [DomainStatus::DELETE_CANDIDATE])
-    @domain.keep
+    assert_no_enqueued_jobs only: DomainDeleteJob do
-    assert_nil QueJob.find_by("args->>0 = '#{@domain.id}'", job_class: DomainDeleteJob.name)
+      @domain.keep
+    end
   end
 end

test/models/registrar_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class RegistrarTest < ActiveSupport::TestCase
+class RegistrarTest < ActiveJob::TestCase
   setup do
     @registrar = registrars(:bestnames)
     @original_default_language = Setting.default_language
@@ -213,7 +213,9 @@ class RegistrarTest < ActiveSupport::TestCase
   def test_issues_e_invoice_along_with_invoice
     EInvoice::Providers::TestProvider.deliveries.clear
 
-    @registrar.issue_prepayment_invoice(100)
+    perform_enqueued_jobs do
+      @registrar.issue_prepayment_invoice(100)
+    end
 
     assert_equal 1, EInvoice::Providers::TestProvider.deliveries.count
   end

test/system/admin_area/domains_test.rb

@@ -1,4 +1,7 @@
 require 'application_system_test_case'
+require 'sidekiq/testing'
+
+Sidekiq::Testing.fake!
 
 class AdminDomainsTestTest < ApplicationSystemTestCase
   setup do

test/tasks/emails/verify_email_task_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class VerifyEmailTaskTest < ActiveSupport::TestCase
+class VerifyEmailTaskTest < ActiveJob::TestCase
 
   def setup
     @contact = contacts(:john)
@@ -54,10 +54,14 @@ class VerifyEmailTaskTest < ActiveSupport::TestCase
   end
 
   def run_task
-    Rake::Task['verify_email:all_domains'].execute
+    perform_enqueued_jobs do
+      Rake::Task['verify_email:all_domains'].execute
+    end
   end
 
   def run_single_domain_task(domain)
-    Rake::Task["verify_email:domain"].invoke(domain)
+    perform_enqueued_jobs do
+      Rake::Task["verify_email:domain"].invoke(domain)
+    end
   end
 end

test/test_helper.rb

@@ -18,6 +18,9 @@ require 'capybara/rails'
 require 'capybara/minitest'
 require 'webmock/minitest'
 require 'support/assertions/epp_assertions'
+require 'sidekiq/testing'
+
+Sidekiq::Testing.fake!
 
 
 # `bin/rails test` is not the same as `bin/rake test`.
@@ -27,6 +30,8 @@ require 'rake'
 Rake::Task.clear
 Rails.application.load_tasks
 
+ActiveJob::Base.queue_adapter = :test
+
 class CompanyRegisterClientStub
   Company = Struct.new(:registration_number, :company_name)