Merge branch 'master' of github.com:rails/rails

1 files changed, 23 insertions, 13 deletions

diff --git a/activejob/test/cases/test_helper_test.rb b/activejob/test/cases/test_helper_test.rb
index 71c505a65f..784ede3674 100644
--- a/activejob/test/cases/test_helper_test.rb
+++ b/activejob/test/cases/test_helper_test.rb
@@ -6,8 +6,6 @@ require 'jobs/logging_job'
 require 'jobs/nested_job'
 
 class EnqueuedJobsTest < ActiveJob::TestCase
-  setup { queue_adapter.perform_enqueued_at_jobs = true }
-
   def test_assert_enqueued_jobs
     assert_nothing_raised do
       assert_enqueued_jobs 1 do
@@ -44,11 +42,16 @@ class EnqueuedJobsTest < ActiveJob::TestCase
     end
   end
 
+  def test_assert_no_enqueued_jobs_with_no_block
+    assert_nothing_raised do
+      assert_no_enqueued_jobs
+    end
+  end
+
   def test_assert_no_enqueued_jobs
     assert_nothing_raised do
       assert_no_enqueued_jobs do
-        # Scheduled jobs are being performed in this context
-        HelloJob.set(wait_until: Date.tomorrow.noon).perform_later('godfrey')
+        HelloJob.perform_now
       end
     end
   end
@@ -86,7 +89,7 @@ class EnqueuedJobsTest < ActiveJob::TestCase
 
   def test_assert_enqueued_job
     assert_enqueued_with(job: LoggingJob, queue: 'default') do
-      NestedJob.set(wait_until: Date.tomorrow.noon).perform_later
+      LoggingJob.set(wait_until: Date.tomorrow.noon).perform_later
     end
   end
 
@@ -116,8 +119,6 @@ class EnqueuedJobsTest < ActiveJob::TestCase
 end
 
 class PerformedJobsTest < ActiveJob::TestCase
-  setup { queue_adapter.perform_enqueued_jobs = true }
-
   def test_assert_performed_jobs
     assert_nothing_raised do
       assert_performed_jobs 1 do
@@ -143,22 +144,31 @@ class PerformedJobsTest < ActiveJob::TestCase
 
   def test_assert_performed_jobs_with_no_block
     assert_nothing_raised do
-      HelloJob.perform_later('rafael')
+      perform_enqueued_jobs do
+        HelloJob.perform_later('rafael')
+      end
       assert_performed_jobs 1
     end
 
     assert_nothing_raised do
-      HelloJob.perform_later('aaron')
-      HelloJob.perform_later('matthew')
-      assert_performed_jobs 3
+      perform_enqueued_jobs do
+        HelloJob.perform_later('aaron')
+        HelloJob.perform_later('matthew')
+        assert_performed_jobs 3
+      end
+    end
+  end
+
+  def test_assert_no_performed_jobs_with_no_block
+    assert_nothing_raised do
+      assert_no_performed_jobs
     end
   end
 
   def test_assert_no_performed_jobs
     assert_nothing_raised do
       assert_no_performed_jobs do
-        # Scheduled jobs are being enqueued in this context
-        HelloJob.set(wait_until: Date.tomorrow.noon).perform_later('godfrey')
+        # empty block won't perform jobs
       end
     end
   end