3 files changed, 233 insertions, 0 deletions
diff --git a/activejob/test/cases/rescue_test.rb b/activejob/test/cases/rescue_test.rb
index d9ea3c91d7..3af147383e 100644
--- a/activejob/test/cases/rescue_test.rb
+++ b/activejob/test/cases/rescue_test.rb
@@ -28,4 +28,9 @@ class RescueTest < ActiveSupport::TestCase
     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)]
+    assert_includes JobBuffer.values, 'DeserializationError original exception was Person::RecordNotFound'
+  end
 end
diff --git a/activejob/test/cases/test_case_test.rb b/activejob/test/cases/test_case_test.rb
new file mode 100644
index 0000000000..1d0fdbd22d
--- /dev/null
+++ b/activejob/test/cases/test_case_test.rb
@@ -0,0 +1,14 @@
+require 'helper'
+require 'jobs/hello_job'
+require 'jobs/logging_job'
+require 'jobs/nested_job'
+
+class ActiveJobTestCaseTest < ActiveJob::TestCase
+  def test_include_helper
+    assert_includes self.class.ancestors, ActiveJob::TestHelper
+  end
+
+  def test_set_test_adapter
+    assert_instance_of ActiveJob::QueueAdapters::TestAdapter, self.queue_adapter
+  end
+end
diff --git a/activejob/test/cases/test_helper_test.rb b/activejob/test/cases/test_helper_test.rb
new file mode 100644
index 0000000000..240aa23ce3
--- /dev/null
+++ b/activejob/test/cases/test_helper_test.rb
@@ -0,0 +1,214 @@
+require 'helper'
+require 'active_support/core_ext/time'
+require 'active_support/core_ext/date'
+require 'jobs/hello_job'
+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
+        HelloJob.enqueue('david')
+      end
+    end
+  end
+
+  def test_repeated_enqueued_jobs_calls
+    assert_nothing_raised do
+      assert_enqueued_jobs 1 do
+        HelloJob.enqueue('abdelkader')
+      end
+    end
+
+    assert_nothing_raised do
+      assert_enqueued_jobs 2 do
+        HelloJob.enqueue('sean')
+        HelloJob.enqueue('yves')
+      end
+    end
+  end
+
+  def test_assert_enqueued_jobs_with_no_block
+    assert_nothing_raised do
+      HelloJob.enqueue('rafael')
+      assert_enqueued_jobs 1
+    end
+
+    assert_nothing_raised do
+      HelloJob.enqueue('aaron')
+      HelloJob.enqueue('matthew')
+      assert_enqueued_jobs 3
+    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.enqueue_at(Date.tomorrow.noon, 'godfrey')
+      end
+    end
+  end
+
+  def test_assert_enqueued_jobs_too_few_sent
+    error = assert_raise ActiveSupport::TestCase::Assertion do
+      assert_enqueued_jobs 2 do
+        HelloJob.enqueue('xavier')
+      end
+    end
+
+    assert_match(/2 .* but 1/, error.message)
+  end
+
+  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')
+      end
+    end
+
+    assert_match(/1 .* but 2/, error.message)
+  end
+
+  def test_assert_no_enqueued_jobs_failure
+    error = assert_raise ActiveSupport::TestCase::Assertion do
+      assert_no_enqueued_jobs do
+        HelloJob.enqueue('jeremy')
+      end
+    end
+
+    assert_match(/0 .* but 1/, error.message)
+  end
+
+  def test_assert_enqueued_job
+    assert_enqueued_with(job: LoggingJob, queue: 'default') do
+      NestedJob.enqueue_at(Date.tomorrow.noon)
+    end
+  end
+
+  def test_assert_enqueued_job_failure
+    assert_raise ActiveSupport::TestCase::Assertion do
+      assert_enqueued_with(job: LoggingJob, queue: 'default') do
+        NestedJob.enqueue
+      end
+    end
+
+    assert_raise ActiveSupport::TestCase::Assertion do
+      assert_enqueued_with(job: NestedJob, queue: 'low') do
+        NestedJob.enqueue
+      end
+    end
+  end
+
+  def test_assert_enqueued_job_args
+    assert_raise ArgumentError do
+      assert_enqueued_with(class: LoggingJob) do
+        NestedJob.enqueue_at(Date.tomorrow.noon)
+      end
+    end
+  end
+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
+        HelloJob.enqueue('david')
+      end
+    end
+  end
+
+  def test_repeated_performed_jobs_calls
+    assert_nothing_raised do
+      assert_performed_jobs 1 do
+        HelloJob.enqueue('abdelkader')
+      end
+    end
+
+    assert_nothing_raised do
+      assert_performed_jobs 2 do
+        HelloJob.enqueue('sean')
+        HelloJob.enqueue('yves')
+      end
+    end
+  end
+
+  def test_assert_performed_jobs_with_no_block
+    assert_nothing_raised do
+      HelloJob.enqueue('rafael')
+      assert_performed_jobs 1
+    end
+
+    assert_nothing_raised do
+      HelloJob.enqueue('aaron')
+      HelloJob.enqueue('matthew')
+      assert_performed_jobs 3
+    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.enqueue_at(Date.tomorrow.noon, 'godfrey')
+      end
+    end
+  end
+
+  def test_assert_performed_jobs_too_few_sent
+    error = assert_raise ActiveSupport::TestCase::Assertion do
+      assert_performed_jobs 2 do
+        HelloJob.enqueue('xavier')
+      end
+    end
+
+    assert_match(/2 .* but 1/, error.message)
+  end
+
+  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')
+      end
+    end
+
+    assert_match(/1 .* but 2/, error.message)
+  end
+
+  def test_assert_no_performed_jobs_failure
+    error = assert_raise ActiveSupport::TestCase::Assertion do
+      assert_no_performed_jobs do
+        HelloJob.enqueue('jeremy')
+      end
+    end
+
+    assert_match(/0 .* but 1/, error.message)
+  end
+
+  def test_assert_performed_job
+    assert_performed_with(job: NestedJob, queue: 'default') do
+      NestedJob.enqueue
+    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)
+      end
+    end
+
+    assert_raise ActiveSupport::TestCase::Assertion do
+      assert_performed_with(job: NestedJob, queue: 'low') do
+        NestedJob.enqueue_at(Date.tomorrow.noon)
+      end
+    end
+  end
+end