6 files changed, 6 insertions, 51 deletions
diff --git a/activejob/test/adapters/async.rb b/activejob/test/adapters/async.rb
index 5fcfb89566..08eb9658cd 100644
--- a/activejob/test/adapters/async.rb
+++ b/activejob/test/adapters/async.rb
@@ -1,4 +1,2 @@
-require 'active_job/async_job'
-
 ActiveJob::Base.queue_adapter = :async
-ActiveJob::AsyncJob.perform_immediately!
+ActiveJob::Base.queue_adapter.immediate = true
diff --git a/activejob/test/cases/async_job_test.rb b/activejob/test/cases/async_job_test.rb
deleted file mode 100644
index 2642cfc608..0000000000
--- a/activejob/test/cases/async_job_test.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-require 'helper'
-require 'jobs/hello_job'
-require 'jobs/queue_as_job'
-
-class AsyncJobTest < ActiveSupport::TestCase
-  def using_async_adapter?
-    ActiveJob::Base.queue_adapter.is_a? ActiveJob::QueueAdapters::AsyncAdapter
-  end
-
-  setup do
-    ActiveJob::AsyncJob.perform_asynchronously!
-  end
-
-  teardown do
-    ActiveJob::AsyncJob::QUEUES.clear
-    ActiveJob::AsyncJob.perform_immediately!
-  end
-
-  test "#create_thread_pool returns a thread_pool" do
-    thread_pool = ActiveJob::AsyncJob.create_thread_pool
-    assert thread_pool.is_a? Concurrent::ExecutorService
-    assert_not thread_pool.is_a? Concurrent::ImmediateExecutor
-  end
-
-  test "#create_thread_pool returns an ImmediateExecutor after #perform_immediately! is called" do
-    ActiveJob::AsyncJob.perform_immediately!
-    thread_pool = ActiveJob::AsyncJob.create_thread_pool
-    assert thread_pool.is_a? Concurrent::ImmediateExecutor
-  end
-
-  test "enqueuing without specifying a queue uses the default queue" do
-    skip unless using_async_adapter?
-    HelloJob.perform_later
-    assert ActiveJob::AsyncJob::QUEUES.key? 'default'
-  end
-
-  test "enqueuing to a queue that does not exist creates the queue" do
-    skip unless using_async_adapter?
-    QueueAsJob.perform_later
-    assert ActiveJob::AsyncJob::QUEUES.key? QueueAsJob::MY_QUEUE.to_s
-  end
-end
diff --git a/activejob/test/helper.rb b/activejob/test/helper.rb
index 7e86415f48..54b6076f09 100644
--- a/activejob/test/helper.rb
+++ b/activejob/test/helper.rb
@@ -1,5 +1,3 @@
-require File.expand_path('../../../load_paths', __FILE__)
-
 require 'active_job'
 require 'support/job_buffer'
 
diff --git a/activejob/test/integration/queuing_test.rb b/activejob/test/integration/queuing_test.rb
index d8425c9706..40f27500a5 100644
--- a/activejob/test/integration/queuing_test.rb
+++ b/activejob/test/integration/queuing_test.rb
@@ -57,13 +57,13 @@ class QueuingTest < ActiveSupport::TestCase
   end
 
   test 'should supply a provider_job_id when available for immediate jobs' do
-    skip unless adapter_is?(:delayed_job, :sidekiq, :qu, :que, :queue_classic)
+    skip unless adapter_is?(:async, :delayed_job, :sidekiq, :qu, :que, :queue_classic)
     test_job = TestJob.perform_later @id
     assert test_job.provider_job_id, 'Provider job id should be set by provider'
   end
 
   test 'should supply a provider_job_id when available for delayed jobs' do
-    skip unless adapter_is?(:delayed_job, :sidekiq, :que, :queue_classic)
+    skip unless adapter_is?(:async, :delayed_job, :sidekiq, :que, :queue_classic)
     delayed_test_job = TestJob.set(wait: 1.minute).perform_later @id
     assert delayed_test_job.provider_job_id, 'Provider job id should by set for delayed jobs by provider'
   end
diff --git a/activejob/test/support/integration/adapters/async.rb b/activejob/test/support/integration/adapters/async.rb
index 42beb12b1f..44ab98437a 100644
--- a/activejob/test/support/integration/adapters/async.rb
+++ b/activejob/test/support/integration/adapters/async.rb
@@ -1,9 +1,10 @@
 module AsyncJobsManager
   def setup
     ActiveJob::Base.queue_adapter = :async
+    ActiveJob::Base.queue_adapter.immediate = false
   end
 
   def clear_jobs
-    ActiveJob::AsyncJob::QUEUES.clear
+    ActiveJob::Base.queue_adapter.shutdown
   end
 end
diff --git a/activejob/test/support/integration/dummy_app_template.rb b/activejob/test/support/integration/dummy_app_template.rb
index 262ca72327..a0ef38b0b2 100644
--- a/activejob/test/support/integration/dummy_app_template.rb
+++ b/activejob/test/support/integration/dummy_app_template.rb
@@ -2,7 +2,7 @@ if ENV['AJ_ADAPTER'] == 'delayed_job'
   generate "delayed_job:active_record", "--quiet"
 end
 
-rake("db:migrate")
+rails_command("db:migrate")
 
 initializer 'activejob.rb', <<-CODE
 require "#{File.expand_path("../jobs_manager.rb",  __FILE__)}"