Active Job refactoring

1 files changed, 25 insertions, 16 deletions

diff --git a/activejob/test/cases/logging_test.rb b/activejob/test/cases/logging_test.rb
index 888c183a0b..9c56ee08b6 100644
--- a/activejob/test/cases/logging_test.rb
+++ b/activejob/test/cases/logging_test.rb
@@ -42,34 +42,43 @@ class AdapterTest < ActiveSupport::TestCase
 
 
   def test_uses_active_job_as_tag
-    HelloJob.enqueue "Cristian"
+    HelloJob.perform_later "Cristian"
     assert_match(/\[ActiveJob\]/, @logger.messages)
   end
 
+  def test_uses_job_name_as_tag
+    LoggingJob.perform_later "Dummy"
+    assert_match(/\[LoggingJob\]/, @logger.messages)
+  end
+
+  def test_uses_job_id_as_tag
+    LoggingJob.perform_later "Dummy"
+    assert_match(/\[LOGGING-JOB-ID\]/, @logger.messages)
+  end
+
+  def test_logs_correct_queue_name
+    original_queue_name = LoggingJob.queue_name
+    LoggingJob.queue_as :php_jobs
+    LoggingJob.perform_later("Dummy")
+    assert_match(/to .*?\(php_jobs\).*/, @logger.messages)
+  ensure
+    LoggingJob.queue_name = original_queue_name
+  end
+
   def test_enqueue_job_logging
-    HelloJob.enqueue "Cristian"
+    HelloJob.perform_later "Cristian"
     assert_match(/Enqueued HelloJob \(Job ID: .*?\) to .*?:.*Cristian/, @logger.messages)
   end
 
   def test_perform_job_logging
-    LoggingJob.enqueue "Dummy"
+    LoggingJob.perform_later "Dummy"
     assert_match(/Performing LoggingJob from .*? with arguments:.*Dummy/, @logger.messages)
     assert_match(/Dummy, here is it: Dummy/, @logger.messages)
     assert_match(/Performed LoggingJob from .*? in .*ms/, @logger.messages)
   end
 
-  def test_perform_uses_job_name_job_logging
-    LoggingJob.enqueue "Dummy"
-    assert_match(/\[LoggingJob\]/, @logger.messages)
-  end
-
-  def test_perform_uses_job_id_job_logging
-    LoggingJob.enqueue "Dummy"
-    assert_match(/\[LOGGING-JOB-ID\]/, @logger.messages)
-  end
-
   def test_perform_nested_jobs_logging
-    NestedJob.enqueue
+    NestedJob.perform_later
     assert_match(/\[LoggingJob\] \[.*?\]/, @logger.messages)
     assert_match(/\[ActiveJob\] Enqueued NestedJob \(Job ID: .*\) to/, @logger.messages)
     assert_match(/\[ActiveJob\] \[NestedJob\] \[NESTED-JOB-ID\] Performing NestedJob from/, @logger.messages)
@@ -81,14 +90,14 @@ class AdapterTest < ActiveSupport::TestCase
   end
 
   def test_enqueue_at_job_logging
-    HelloJob.enqueue_at 1, "Cristian"
+    HelloJob.set(wait_until: 24.hours.from_now).perform_later "Cristian"
     assert_match(/Enqueued HelloJob \(Job ID: .*\) to .*? at.*Cristian/, @logger.messages)
   rescue NotImplementedError
     skip
   end
 
   def test_enqueue_in_job_logging
-    HelloJob.enqueue_in 2, "Cristian"
+    HelloJob.set(wait: 2.seconds).perform_later "Cristian"
     assert_match(/Enqueued HelloJob \(Job ID: .*\) to .*? at.*Cristian/, @logger.messages)
   rescue NotImplementedError
     skip