9 files changed, 107 insertions, 74 deletions
diff --git a/activejob/test/cases/callbacks_test.rb b/activejob/test/cases/callbacks_test.rb
index 9a0657ee89..9af2380767 100644
--- a/activejob/test/cases/callbacks_test.rb
+++ b/activejob/test/cases/callbacks_test.rb
@@ -5,7 +5,8 @@ require 'active_support/core_ext/object/inclusion'
 
 class CallbacksTest < ActiveSupport::TestCase
   test 'perform callbacks' do
-    performed_callback_job = CallbackJob.new.tap { |j| j.execute("A-JOB-ID") }
+    performed_callback_job = CallbackJob.new("A-JOB-ID")
+    performed_callback_job.perform_now
     assert "CallbackJob ran before_perform".in? performed_callback_job.history
     assert "CallbackJob ran after_perform".in? performed_callback_job.history
     assert "CallbackJob ran around_perform_start".in? performed_callback_job.history
@@ -13,7 +14,7 @@ class CallbacksTest < ActiveSupport::TestCase
   end
 
   test 'enqueue callbacks' do
-    enqueued_callback_job = CallbackJob.enqueue
+    enqueued_callback_job = CallbackJob.perform_later
     assert "CallbackJob ran before_enqueue".in? enqueued_callback_job.history
     assert "CallbackJob ran after_enqueue".in? enqueued_callback_job.history
     assert "CallbackJob ran around_enqueue_start".in? enqueued_callback_job.history
diff --git a/activejob/test/cases/job_serialization_test.rb b/activejob/test/cases/job_serialization_test.rb
index fc1b77744c..db22783030 100644
--- a/activejob/test/cases/job_serialization_test.rb
+++ b/activejob/test/cases/job_serialization_test.rb
@@ -9,7 +9,7 @@ class JobSerializationTest < ActiveSupport::TestCase
   end
 
   test 'serialize job with gid' do
-    GidJob.enqueue @person
+    GidJob.perform_later @person
     assert_equal "Person with ID: 5", JobBuffer.last_value
   end
 end
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
diff --git a/activejob/test/cases/queue_naming_test.rb b/activejob/test/cases/queue_naming_test.rb
index fdfd1afceb..4052477543 100644
--- a/activejob/test/cases/queue_naming_test.rb
+++ b/activejob/test/cases/queue_naming_test.rb
@@ -8,20 +8,38 @@ class QueueNamingTest < ActiveSupport::TestCase
     assert_equal "default", HelloJob.queue_name
   end
 
-  test 'name appended in job' do
+  test 'uses given queue name job' do
     begin
+      original_queue_name = HelloJob.queue_name
       HelloJob.queue_as :greetings
-      LoggingJob.queue_as :bookkeeping
+      assert_equal "greetings", HelloJob.new.queue_name
+    ensure
+      HelloJob.queue_name = original_queue_name
+    end
+  end
 
-      assert_equal "default", NestedJob.queue_name
-      assert_equal "greetings", HelloJob.queue_name
-      assert_equal "bookkeeping", LoggingJob.queue_name
+  test 'evals block given to queue_as to determine queue' do
+    begin
+      original_queue_name = HelloJob.queue_name
+      HelloJob.queue_as { :another }
+      assert_equal "another", HelloJob.new.queue_name
     ensure
-      HelloJob.queue_name = LoggingJob.queue_name = ActiveJob::Base.default_queue_name
+      HelloJob.queue_name = original_queue_name
     end
   end
 
-  test 'should prefix the queue name' do
+  test 'can use arguments to determine queue_name in queue_as block' do
+    begin
+      original_queue_name = HelloJob.queue_name
+      HelloJob.queue_as { self.arguments.first=='1' ? :one : :two }
+      assert_equal "one", HelloJob.new('1').queue_name
+      assert_equal "two", HelloJob.new('3').queue_name
+    ensure
+      HelloJob.queue_name = original_queue_name
+    end
+  end
+
+  test 'queu_name_prefix prepended to the queue name' do
     begin
       original_queue_name_prefix = ActiveJob::Base.queue_name_prefix
       original_queue_name = HelloJob.queue_name
@@ -35,4 +53,9 @@ class QueueNamingTest < ActiveSupport::TestCase
     end
   end
 
+  test 'uses queue passed to #set' do
+    job = HelloJob.set(queue: :some_queue).perform_later
+    assert_equal "some_queue", job.queue_name
+  end
+
 end
diff --git a/activejob/test/cases/queuing_test.rb b/activejob/test/cases/queuing_test.rb
index f020316d7e..0eeabbf693 100644
--- a/activejob/test/cases/queuing_test.rb
+++ b/activejob/test/cases/queuing_test.rb
@@ -9,18 +9,18 @@ class QueuingTest < ActiveSupport::TestCase
   end
 
   test 'run queued job' do
-    HelloJob.enqueue
+    HelloJob.perform_later
     assert_equal "David says hello", JobBuffer.last_value
   end
 
   test 'run queued job with arguments' do
-    HelloJob.enqueue "Jamie"
+    HelloJob.perform_later "Jamie"
     assert_equal "Jamie says hello", JobBuffer.last_value
   end
 
   test 'run queued job later' do
     begin
-      result = HelloJob.enqueue_at 1.second.ago, "Jamie"
+      result = HelloJob.set(wait_until: 1.second.ago).perform_later "Jamie"
       assert result
     rescue NotImplementedError
       skip
@@ -28,15 +28,15 @@ class QueuingTest < ActiveSupport::TestCase
   end
 
   test 'job returned by enqueue has the arguments available' do
-    job = HelloJob.enqueue "Jamie"
+    job = HelloJob.perform_later "Jamie"
     assert_equal [ "Jamie" ], job.arguments
   end
 
 
-  test 'job returned by enqueue_at has the timestamp available' do
+  test 'job returned by perform_at has the timestamp available' do
     begin
-      job = HelloJob.enqueue_at Time.utc(2014, 1, 1)
-      assert_equal Time.utc(2014, 1, 1), job.enqueued_at
+      job = HelloJob.set(wait_until: Time.utc(2014, 1, 1)).perform_later
+      assert_equal Time.utc(2014, 1, 1).to_f, job.scheduled_at
     rescue NotImplementedError
       skip
     end
diff --git a/activejob/test/cases/rescue_test.rb b/activejob/test/cases/rescue_test.rb
index 3af147383e..1b6c2e9fac 100644
--- a/activejob/test/cases/rescue_test.rb
+++ b/activejob/test/cases/rescue_test.rb
@@ -10,27 +10,27 @@ class RescueTest < ActiveSupport::TestCase
   end
 
   test 'rescue perform exception with retry' do
-    job = RescueJob.new
-    job.execute(SecureRandom.uuid, "david")
+    job = RescueJob.new("david")
+    job.perform_now
     assert_equal [ "rescued from ArgumentError", "performed beautifully" ], JobBuffer.values
   end
 
   test 'let through unhandled perform exception' do
-    job = RescueJob.new
+    job = RescueJob.new("other")
     assert_raises(RescueJob::OtherError) do
-      job.execute(SecureRandom.uuid, "other")
+      job.perform_now
     end
   end
 
   test 'rescue from deserialization errors' do
-    RescueJob.enqueue Person.new(404)
+    RescueJob.perform_later Person.new(404)
     assert_includes JobBuffer.values, 'rescued from DeserializationError'
     assert_includes JobBuffer.values, 'DeserializationError original exception was Person::RecordNotFound'
     assert_not_includes JobBuffer.values, 'performed beautifully'
   end
 
   test "should not wrap DeserializationError in DeserializationError" do
-    RescueJob.enqueue [Person.new(404)]
+    RescueJob.perform_later [Person.new(404)]
     assert_includes JobBuffer.values, 'DeserializationError original exception was Person::RecordNotFound'
   end
 end
diff --git a/activejob/test/cases/test_helper_test.rb b/activejob/test/cases/test_helper_test.rb
index 240aa23ce3..eab540bb6c 100644
--- a/activejob/test/cases/test_helper_test.rb
+++ b/activejob/test/cases/test_helper_test.rb
@@ -11,7 +11,7 @@ class EnqueuedJobsTest < ActiveJob::TestCase
   def test_assert_enqueued_jobs
     assert_nothing_raised do
       assert_enqueued_jobs 1 do
-        HelloJob.enqueue('david')
+        HelloJob.perform_later('david')
       end
     end
   end
@@ -19,27 +19,27 @@ class EnqueuedJobsTest < ActiveJob::TestCase
   def test_repeated_enqueued_jobs_calls
     assert_nothing_raised do
       assert_enqueued_jobs 1 do
-        HelloJob.enqueue('abdelkader')
+        HelloJob.perform_later('abdelkader')
       end
     end
 
     assert_nothing_raised do
       assert_enqueued_jobs 2 do
-        HelloJob.enqueue('sean')
-        HelloJob.enqueue('yves')
+        HelloJob.perform_later('sean')
+        HelloJob.perform_later('yves')
       end
     end
   end
 
   def test_assert_enqueued_jobs_with_no_block
     assert_nothing_raised do
-      HelloJob.enqueue('rafael')
+      HelloJob.perform_later('rafael')
       assert_enqueued_jobs 1
     end
 
     assert_nothing_raised do
-      HelloJob.enqueue('aaron')
-      HelloJob.enqueue('matthew')
+      HelloJob.perform_later('aaron')
+      HelloJob.perform_later('matthew')
       assert_enqueued_jobs 3
     end
   end
@@ -48,7 +48,7 @@ class EnqueuedJobsTest < ActiveJob::TestCase
     assert_nothing_raised do
       assert_no_enqueued_jobs do
         # Scheduled jobs are being performed in this context
-        HelloJob.enqueue_at(Date.tomorrow.noon, 'godfrey')
+        HelloJob.set(wait_until: Date.tomorrow.noon).perform_later('godfrey')
       end
     end
   end
@@ -56,7 +56,7 @@ class EnqueuedJobsTest < ActiveJob::TestCase
   def test_assert_enqueued_jobs_too_few_sent
     error = assert_raise ActiveSupport::TestCase::Assertion do
       assert_enqueued_jobs 2 do
-        HelloJob.enqueue('xavier')
+        HelloJob.perform_later('xavier')
       end
     end
 
@@ -66,8 +66,8 @@ class EnqueuedJobsTest < ActiveJob::TestCase
   def test_assert_enqueued_jobs_too_many_sent
     error = assert_raise ActiveSupport::TestCase::Assertion do
       assert_enqueued_jobs 1 do
-        HelloJob.enqueue('cristian')
-        HelloJob.enqueue('guillermo')
+        HelloJob.perform_later('cristian')
+        HelloJob.perform_later('guillermo')
       end
     end
 
@@ -77,7 +77,7 @@ class EnqueuedJobsTest < ActiveJob::TestCase
   def test_assert_no_enqueued_jobs_failure
     error = assert_raise ActiveSupport::TestCase::Assertion do
       assert_no_enqueued_jobs do
-        HelloJob.enqueue('jeremy')
+        HelloJob.perform_later('jeremy')
       end
     end
 
@@ -86,20 +86,20 @@ class EnqueuedJobsTest < ActiveJob::TestCase
 
   def test_assert_enqueued_job
     assert_enqueued_with(job: LoggingJob, queue: 'default') do
-      NestedJob.enqueue_at(Date.tomorrow.noon)
+      NestedJob.set(wait_until: Date.tomorrow.noon).perform_later
     end
   end
 
   def test_assert_enqueued_job_failure
     assert_raise ActiveSupport::TestCase::Assertion do
       assert_enqueued_with(job: LoggingJob, queue: 'default') do
-        NestedJob.enqueue
+        NestedJob.perform_later
       end
     end
 
     assert_raise ActiveSupport::TestCase::Assertion do
       assert_enqueued_with(job: NestedJob, queue: 'low') do
-        NestedJob.enqueue
+        NestedJob.perform_later
       end
     end
   end
@@ -107,7 +107,7 @@ class EnqueuedJobsTest < ActiveJob::TestCase
   def test_assert_enqueued_job_args
     assert_raise ArgumentError do
       assert_enqueued_with(class: LoggingJob) do
-        NestedJob.enqueue_at(Date.tomorrow.noon)
+        NestedJob.set(wait_until: Date.tomorrow.noon).perform_later
       end
     end
   end
@@ -119,7 +119,7 @@ class PerformedJobsTest < ActiveJob::TestCase
   def test_assert_performed_jobs
     assert_nothing_raised do
       assert_performed_jobs 1 do
-        HelloJob.enqueue('david')
+        HelloJob.perform_later('david')
       end
     end
   end
@@ -127,27 +127,27 @@ class PerformedJobsTest < ActiveJob::TestCase
   def test_repeated_performed_jobs_calls
     assert_nothing_raised do
       assert_performed_jobs 1 do
-        HelloJob.enqueue('abdelkader')
+        HelloJob.perform_later('abdelkader')
       end
     end
 
     assert_nothing_raised do
       assert_performed_jobs 2 do
-        HelloJob.enqueue('sean')
-        HelloJob.enqueue('yves')
+        HelloJob.perform_later('sean')
+        HelloJob.perform_later('yves')
       end
     end
   end
 
   def test_assert_performed_jobs_with_no_block
     assert_nothing_raised do
-      HelloJob.enqueue('rafael')
+      HelloJob.perform_later('rafael')
       assert_performed_jobs 1
     end
 
     assert_nothing_raised do
-      HelloJob.enqueue('aaron')
-      HelloJob.enqueue('matthew')
+      HelloJob.perform_later('aaron')
+      HelloJob.perform_later('matthew')
       assert_performed_jobs 3
     end
   end
@@ -156,7 +156,7 @@ class PerformedJobsTest < ActiveJob::TestCase
     assert_nothing_raised do
       assert_no_performed_jobs do
         # Scheduled jobs are being enqueued in this context
-        HelloJob.enqueue_at(Date.tomorrow.noon, 'godfrey')
+        HelloJob.set(wait_until: Date.tomorrow.noon).perform_later('godfrey')
       end
     end
   end
@@ -164,7 +164,7 @@ class PerformedJobsTest < ActiveJob::TestCase
   def test_assert_performed_jobs_too_few_sent
     error = assert_raise ActiveSupport::TestCase::Assertion do
       assert_performed_jobs 2 do
-        HelloJob.enqueue('xavier')
+        HelloJob.perform_later('xavier')
       end
     end
 
@@ -174,8 +174,8 @@ class PerformedJobsTest < ActiveJob::TestCase
   def test_assert_performed_jobs_too_many_sent
     error = assert_raise ActiveSupport::TestCase::Assertion do
       assert_performed_jobs 1 do
-        HelloJob.enqueue('cristian')
-        HelloJob.enqueue('guillermo')
+        HelloJob.perform_later('cristian')
+        HelloJob.perform_later('guillermo')
       end
     end
 
@@ -185,7 +185,7 @@ class PerformedJobsTest < ActiveJob::TestCase
   def test_assert_no_performed_jobs_failure
     error = assert_raise ActiveSupport::TestCase::Assertion do
       assert_no_performed_jobs do
-        HelloJob.enqueue('jeremy')
+        HelloJob.perform_later('jeremy')
       end
     end
 
@@ -194,20 +194,20 @@ class PerformedJobsTest < ActiveJob::TestCase
 
   def test_assert_performed_job
     assert_performed_with(job: NestedJob, queue: 'default') do
-      NestedJob.enqueue
+      NestedJob.perform_later
     end
   end
 
   def test_assert_performed_job_failure
     assert_raise ActiveSupport::TestCase::Assertion do
-      assert_performed_with(job: LoggingJob, queue: 'default') do
-        NestedJob.enqueue_at(Date.tomorrow.noon)
+      assert_performed_with(job: LoggingJob, at: Date.tomorrow.noon, queue: 'default') do
+        NestedJob.set(wait_until: Date.tomorrow.noon).perform_later
       end
     end
 
     assert_raise ActiveSupport::TestCase::Assertion do
-      assert_performed_with(job: NestedJob, queue: 'low') do
-        NestedJob.enqueue_at(Date.tomorrow.noon)
+      assert_performed_with(job: NestedJob, at: Date.tomorrow.noon, queue: 'low') do
+        NestedJob.set(queue: 'low', wait_until: Date.tomorrow.noon).perform_later
       end
     end
   end
diff --git a/activejob/test/jobs/nested_job.rb b/activejob/test/jobs/nested_job.rb
index fd66f68991..8c4ec549a6 100644
--- a/activejob/test/jobs/nested_job.rb
+++ b/activejob/test/jobs/nested_job.rb
@@ -1,6 +1,6 @@
 class NestedJob < ActiveJob::Base
   def perform
-    LoggingJob.enqueue "NestedJob"
+    LoggingJob.perform_later "NestedJob"
   end
 
   def job_id
diff --git a/activejob/test/jobs/rescue_job.rb b/activejob/test/jobs/rescue_job.rb
index 6b6e74e9d0..f1b9c9349e 100644
--- a/activejob/test/jobs/rescue_job.rb
+++ b/activejob/test/jobs/rescue_job.rb
@@ -6,7 +6,7 @@ class RescueJob < ActiveJob::Base
   rescue_from(ArgumentError) do
     JobBuffer.add('rescued from ArgumentError')
     arguments[0] = "DIFFERENT!"
-    retry_now
+    retry_job
   end
 
   rescue_from(ActiveJob::DeserializationError) do |e|