Move jobs from Que to ActiveJob

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,10 @@
 require 'test_helper'
 
 class DomainReleasableDiscardableTest < ActiveSupport::TestCase
+  include ActiveJob::TestHelper
+
   setup do
+    ActiveJob::Base.queue_adapter = :test
     @domain = domains(:shop)
   end
 
@@ -64,16 +67,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)
-    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
+    assert_not other_domain.deletion_time == @domain.deletion_time
   end
 
   def test_discarding_a_domain_bypasses_validation