Merge branch 'master' into fix_unscope_where_column_with_or

1 files changed, 359 insertions, 0 deletions

diff --git a/activejob/test/cases/test_helper_test.rb b/activejob/test/cases/test_helper_test.rb
index 2e1d8cf81d..e27c7eff26 100644
--- a/activejob/test/cases/test_helper_test.rb
+++ b/activejob/test/cases/test_helper_test.rb
@@ -108,8 +108,31 @@ class EnqueuedJobsTest < ActiveJob::TestCase
       assert_enqueued_jobs 1, only: HelloJob do
         HelloJob.perform_later("jeremy")
         LoggingJob.perform_later
+        LoggingJob.perform_later
+      end
+    end
+  end
+
+  def test_assert_enqueued_jobs_with_except_option
+    assert_nothing_raised do
+      assert_enqueued_jobs 1, except: LoggingJob do
+        HelloJob.perform_later("jeremy")
+        LoggingJob.perform_later
+        LoggingJob.perform_later
+      end
+    end
+  end
+
+  def test_assert_enqueued_jobs_with_only_and_except_option
+    error = assert_raise ActiveJob::TestHelper::InvalidOptionsError do
+      assert_enqueued_jobs 1, only: HelloJob, except: HelloJob do
+        HelloJob.perform_later("jeremy")
+        LoggingJob.perform_later
+        LoggingJob.perform_later
       end
     end
+
+    assert_match(/`:only` and `:except`/, error.message)
   end
 
   def test_assert_enqueued_jobs_with_only_and_queue_option
@@ -122,6 +145,28 @@ class EnqueuedJobsTest < ActiveJob::TestCase
     end
   end
 
+  def test_assert_enqueued_jobs_with_except_and_queue_option
+    assert_nothing_raised do
+      assert_enqueued_jobs 1, except: LoggingJob, queue: :some_queue do
+        HelloJob.set(queue: :some_queue).perform_later
+        HelloJob.set(queue: :other_queue).perform_later
+        LoggingJob.perform_later
+      end
+    end
+  end
+
+  def test_assert_enqueued_jobs_with_only_and_except_and_queue_option
+    error = assert_raise ActiveJob::TestHelper::InvalidOptionsError do
+      assert_enqueued_jobs 1, only: HelloJob, except: HelloJob, queue: :some_queue do
+        HelloJob.set(queue: :some_queue).perform_later
+        HelloJob.set(queue: :other_queue).perform_later
+        LoggingJob.perform_later
+      end
+    end
+
+    assert_match(/`:only` and `:except`/, error.message)
+  end
+
   def test_assert_enqueued_jobs_with_queue_option
     assert_nothing_raised do
       assert_enqueued_jobs 2, queue: :default do
@@ -143,6 +188,26 @@ class EnqueuedJobsTest < ActiveJob::TestCase
     assert_match(/1 .* but 0/, error.message)
   end
 
+  def test_assert_enqueued_jobs_with_except_option_and_none_sent
+    error = assert_raise ActiveSupport::TestCase::Assertion do
+      assert_enqueued_jobs 1, except: LoggingJob do
+        LoggingJob.perform_later
+      end
+    end
+
+    assert_match(/1 .* but 0/, error.message)
+  end
+
+  def test_assert_enqueued_jobs_with_only_and_except_option_and_none_sent
+    error = assert_raise ActiveJob::TestHelper::InvalidOptionsError do
+      assert_enqueued_jobs 1, only: HelloJob, except: HelloJob do
+        LoggingJob.perform_later
+      end
+    end
+
+    assert_match(/`:only` and `:except`/, error.message)
+  end
+
   def test_assert_enqueued_jobs_with_only_option_and_too_few_sent
     error = assert_raise ActiveSupport::TestCase::Assertion do
       assert_enqueued_jobs 5, only: HelloJob do
@@ -154,6 +219,28 @@ class EnqueuedJobsTest < ActiveJob::TestCase
     assert_match(/5 .* but 1/, error.message)
   end
 
+  def test_assert_enqueued_jobs_with_except_option_and_too_few_sent
+    error = assert_raise ActiveSupport::TestCase::Assertion do
+      assert_enqueued_jobs 5, except: LoggingJob do
+        HelloJob.perform_later("jeremy")
+        4.times { LoggingJob.perform_later }
+      end
+    end
+
+    assert_match(/5 .* but 1/, error.message)
+  end
+
+  def test_assert_enqueued_jobs_with_only_and_except_option_and_too_few_sent
+    error = assert_raise ActiveJob::TestHelper::InvalidOptionsError do
+      assert_enqueued_jobs 5, only: HelloJob, except: HelloJob do
+        HelloJob.perform_later("jeremy")
+        4.times { LoggingJob.perform_later }
+      end
+    end
+
+    assert_match(/`:only` and `:except`/, error.message)
+  end
+
   def test_assert_enqueued_jobs_with_only_option_and_too_many_sent
     error = assert_raise ActiveSupport::TestCase::Assertion do
       assert_enqueued_jobs 1, only: HelloJob do
@@ -164,6 +251,26 @@ class EnqueuedJobsTest < ActiveJob::TestCase
     assert_match(/1 .* but 2/, error.message)
   end
 
+  def test_assert_enqueued_jobs_with_except_option_and_too_many_sent
+    error = assert_raise ActiveSupport::TestCase::Assertion do
+      assert_enqueued_jobs 1, except: LoggingJob do
+        2.times { HelloJob.perform_later("jeremy") }
+      end
+    end
+
+    assert_match(/1 .* but 2/, error.message)
+  end
+
+  def test_assert_enqueued_jobs_with_only_and_except_option_and_too_many_sent
+    error = assert_raise ActiveJob::TestHelper::InvalidOptionsError do
+      assert_enqueued_jobs 1, only: HelloJob, except: HelloJob do
+        2.times { HelloJob.perform_later("jeremy") }
+      end
+    end
+
+    assert_match(/`:only` and `:except`/, error.message)
+  end
+
   def test_assert_enqueued_jobs_with_only_option_as_array
     assert_nothing_raised do
       assert_enqueued_jobs 2, only: [HelloJob, LoggingJob] do
@@ -174,6 +281,28 @@ class EnqueuedJobsTest < ActiveJob::TestCase
     end
   end
 
+  def test_assert_enqueued_jobs_with_except_option_as_array
+    assert_nothing_raised do
+      assert_enqueued_jobs 1, except: [HelloJob, LoggingJob] do
+        HelloJob.perform_later("jeremy")
+        LoggingJob.perform_later("stewie")
+        RescueJob.perform_later("david")
+      end
+    end
+  end
+
+  def test_assert_enqueued_jobs_with_only_and_except_option_as_array
+    error = assert_raise ActiveJob::TestHelper::InvalidOptionsError do
+      assert_enqueued_jobs 2, only: [HelloJob, LoggingJob], except: [HelloJob, LoggingJob] do
+        HelloJob.perform_later("jeremy")
+        LoggingJob.perform_later("stewie")
+        RescueJob.perform_later("david")
+      end
+    end
+
+    assert_match(/`:only` and `:except`/, error.message)
+  end
+
   def test_assert_no_enqueued_jobs_with_only_option
     assert_nothing_raised do
       assert_no_enqueued_jobs only: HelloJob do
@@ -182,6 +311,24 @@ class EnqueuedJobsTest < ActiveJob::TestCase
     end
   end
 
+  def test_assert_no_enqueued_jobs_with_except_option
+    assert_nothing_raised do
+      assert_no_enqueued_jobs except: LoggingJob do
+        LoggingJob.perform_later
+      end
+    end
+  end
+
+  def test_assert_no_enqueued_jobs_with_only_and_except_option
+    error = assert_raise ActiveJob::TestHelper::InvalidOptionsError do
+      assert_no_enqueued_jobs only: HelloJob, except: HelloJob do
+        LoggingJob.perform_later
+      end
+    end
+
+    assert_match(/`:only` and `:except`/, error.message)
+  end
+
   def test_assert_no_enqueued_jobs_with_only_option_failure
     error = assert_raise ActiveSupport::TestCase::Assertion do
       assert_no_enqueued_jobs only: HelloJob do
@@ -193,6 +340,28 @@ class EnqueuedJobsTest < ActiveJob::TestCase
     assert_match(/0 .* but 1/, error.message)
   end
 
+  def test_assert_no_enqueued_jobs_with_except_option_failure
+    error = assert_raise ActiveSupport::TestCase::Assertion do
+      assert_no_enqueued_jobs except: LoggingJob do
+        HelloJob.perform_later("jeremy")
+        LoggingJob.perform_later
+      end
+    end
+
+    assert_match(/0 .* but 1/, error.message)
+  end
+
+  def test_assert_no_enqueued_jobs_with_only_and_except_option_failure
+    error = assert_raise ActiveJob::TestHelper::InvalidOptionsError do
+      assert_no_enqueued_jobs only: HelloJob, except: HelloJob do
+        HelloJob.perform_later("jeremy")
+        LoggingJob.perform_later
+      end
+    end
+
+    assert_match(/`:only` and `:except`/, error.message)
+  end
+
   def test_assert_no_enqueued_jobs_with_only_option_as_array
     assert_nothing_raised do
       assert_no_enqueued_jobs only: [HelloJob, RescueJob] do
@@ -201,6 +370,25 @@ class EnqueuedJobsTest < ActiveJob::TestCase
     end
   end
 
+  def test_assert_no_enqueued_jobs_with_except_option_as_array
+    assert_nothing_raised do
+      assert_no_enqueued_jobs except: [HelloJob, RescueJob] do
+        HelloJob.perform_later
+        RescueJob.perform_later
+      end
+    end
+  end
+
+  def test_assert_no_enqueued_jobs_with_only_and_except_option_as_array
+    error = assert_raise ActiveJob::TestHelper::InvalidOptionsError do
+      assert_no_enqueued_jobs only: [HelloJob, RescueJob], except: [HelloJob, RescueJob] do
+        LoggingJob.perform_later
+      end
+    end
+
+    assert_match(/`:only` and `:except`/, error.message)
+  end
+
   def test_assert_enqueued_job
     assert_enqueued_with(job: LoggingJob, queue: "default") do
       LoggingJob.set(wait_until: Date.tomorrow.noon).perform_later
@@ -286,6 +474,14 @@ class PerformedJobsTest < ActiveJob::TestCase
     assert_nil queue_adapter.filter
   end
 
+  def test_performed_enqueue_jobs_with_except_option_doesnt_leak_outside_the_block
+    assert_nil queue_adapter.reject
+    perform_enqueued_jobs except: HelloJob do
+      assert_equal HelloJob, queue_adapter.reject
+    end
+    assert_nil queue_adapter.reject
+  end
+
   def test_assert_performed_jobs
     assert_nothing_raised do
       assert_performed_jobs 1 do
@@ -391,6 +587,26 @@ class PerformedJobsTest < ActiveJob::TestCase
     end
   end
 
+  def test_assert_performed_jobs_with_except_option
+    assert_nothing_raised do
+      assert_performed_jobs 1, except: LoggingJob do
+        HelloJob.perform_later("jeremy")
+        LoggingJob.perform_later
+      end
+    end
+  end
+
+  def test_assert_performed_jobs_with_only_and_except_option
+    error = assert_raise ActiveJob::TestHelper::InvalidOptionsError do
+      assert_performed_jobs 1, only: HelloJob, except: HelloJob do
+        HelloJob.perform_later("jeremy")
+        LoggingJob.perform_later
+      end
+    end
+
+    assert_match(/`:only` and `:except`/, error.message)
+  end
+
   def test_assert_performed_jobs_with_only_option_as_array
     assert_nothing_raised do
       assert_performed_jobs 2, only: [HelloJob, LoggingJob] do
@@ -401,6 +617,28 @@ class PerformedJobsTest < ActiveJob::TestCase
     end
   end
 
+  def test_assert_performed_jobs_with_except_option_as_array
+    assert_nothing_raised do
+      assert_performed_jobs 1, except: [LoggingJob, RescueJob] do
+        HelloJob.perform_later("jeremy")
+        LoggingJob.perform_later("stewie")
+        RescueJob.perform_later("david")
+      end
+    end
+  end
+
+  def test_assert_performed_jobs_with_only_and_except_option_as_array
+    error = assert_raise ActiveJob::TestHelper::InvalidOptionsError do
+      assert_performed_jobs 2, only: [HelloJob, LoggingJob], except: [HelloJob, LoggingJob] do
+        HelloJob.perform_later("jeremy")
+        LoggingJob.perform_later("stewie")
+        RescueJob.perform_later("david")
+      end
+    end
+
+    assert_match(/`:only` and `:except`/, error.message)
+  end
+
   def test_assert_performed_jobs_with_only_option_and_none_sent
     error = assert_raise ActiveSupport::TestCase::Assertion do
       assert_performed_jobs 1, only: HelloJob do
@@ -411,6 +649,26 @@ class PerformedJobsTest < ActiveJob::TestCase
     assert_match(/1 .* but 0/, error.message)
   end
 
+  def test_assert_performed_jobs_with_except_option_and_none_sent
+    error = assert_raise ActiveSupport::TestCase::Assertion do
+      assert_performed_jobs 1, except: LoggingJob do
+        LoggingJob.perform_later
+      end
+    end
+
+    assert_match(/1 .* but 0/, error.message)
+  end
+
+  def test_assert_performed_jobs_with_only_and_except_option_and_none_sent
+    error = assert_raise ActiveJob::TestHelper::InvalidOptionsError do
+      assert_performed_jobs 1, only: HelloJob, except: HelloJob do
+        LoggingJob.perform_later
+      end
+    end
+
+    assert_match(/`:only` and `:except`/, error.message)
+  end
+
   def test_assert_performed_jobs_with_only_option_and_too_few_sent
     error = assert_raise ActiveSupport::TestCase::Assertion do
       assert_performed_jobs 5, only: HelloJob do
@@ -422,6 +680,28 @@ class PerformedJobsTest < ActiveJob::TestCase
     assert_match(/5 .* but 1/, error.message)
   end
 
+  def test_assert_performed_jobs_with_except_option_and_too_few_sent
+    error = assert_raise ActiveSupport::TestCase::Assertion do
+      assert_performed_jobs 5, except: LoggingJob do
+        HelloJob.perform_later("jeremy")
+        4.times { LoggingJob.perform_later }
+      end
+    end
+
+    assert_match(/5 .* but 1/, error.message)
+  end
+
+  def test_assert_performed_jobs_with_only_and_except_option_and_too_few_sent
+    error = assert_raise ActiveJob::TestHelper::InvalidOptionsError do
+      assert_performed_jobs 5, only: HelloJob, except: HelloJob do
+        HelloJob.perform_later("jeremy")
+        4.times { LoggingJob.perform_later }
+      end
+    end
+
+    assert_match(/`:only` and `:except`/, error.message)
+  end
+
   def test_assert_performed_jobs_with_only_option_and_too_many_sent
     error = assert_raise ActiveSupport::TestCase::Assertion do
       assert_performed_jobs 1, only: HelloJob do
@@ -432,6 +712,26 @@ class PerformedJobsTest < ActiveJob::TestCase
     assert_match(/1 .* but 2/, error.message)
   end
 
+  def test_assert_performed_jobs_with_except_option_and_too_many_sent
+    error = assert_raise ActiveSupport::TestCase::Assertion do
+      assert_performed_jobs 1, except: LoggingJob do
+        2.times { HelloJob.perform_later("jeremy") }
+      end
+    end
+
+    assert_match(/1 .* but 2/, error.message)
+  end
+
+  def test_assert_performed_jobs_with_only_and_except_option_and_too_many_sent
+    error = assert_raise ActiveJob::TestHelper::InvalidOptionsError do
+      assert_performed_jobs 1, only: HelloJob, except: HelloJob do
+        2.times { HelloJob.perform_later("jeremy") }
+      end
+    end
+
+    assert_match(/`:only` and `:except`/, error.message)
+  end
+
   def test_assert_no_performed_jobs_with_only_option
     assert_nothing_raised do
       assert_no_performed_jobs only: HelloJob do
@@ -440,6 +740,24 @@ class PerformedJobsTest < ActiveJob::TestCase
     end
   end
 
+  def test_assert_no_performed_jobs_with_except_option
+    assert_nothing_raised do
+      assert_no_performed_jobs except: LoggingJob do
+        LoggingJob.perform_later
+      end
+    end
+  end
+
+  def test_assert_no_performed_jobs_with_only_and_except_option
+    error = assert_raise ActiveJob::TestHelper::InvalidOptionsError do
+      assert_no_performed_jobs only: HelloJob, except: HelloJob do
+        LoggingJob.perform_later
+      end
+    end
+
+    assert_match(/`:only` and `:except`/, error.message)
+  end
+
   def test_assert_no_performed_jobs_with_only_option_as_array
     assert_nothing_raised do
       assert_no_performed_jobs only: [HelloJob, RescueJob] do
@@ -448,6 +766,25 @@ class PerformedJobsTest < ActiveJob::TestCase
     end
   end
 
+  def test_assert_no_performed_jobs_with_except_option_as_array
+    assert_nothing_raised do
+      assert_no_performed_jobs except: [HelloJob, RescueJob] do
+        HelloJob.perform_later
+        RescueJob.perform_later
+      end
+    end
+  end
+
+  def test_assert_no_performed_jobs_with_only_and_except_option_as_array
+    error = assert_raise ActiveJob::TestHelper::InvalidOptionsError do
+      assert_no_performed_jobs only: [HelloJob, RescueJob], except: [HelloJob, RescueJob] do
+        LoggingJob.perform_later
+      end
+    end
+
+    assert_match(/`:only` and `:except`/, error.message)
+  end
+
   def test_assert_no_performed_jobs_with_only_option_failure
     error = assert_raise ActiveSupport::TestCase::Assertion do
       assert_no_performed_jobs only: HelloJob do
@@ -459,6 +796,28 @@ class PerformedJobsTest < ActiveJob::TestCase
     assert_match(/0 .* but 1/, error.message)
   end
 
+  def test_assert_no_performed_jobs_with_except_option_failure
+    error = assert_raise ActiveSupport::TestCase::Assertion do
+      assert_no_performed_jobs except: LoggingJob do
+        HelloJob.perform_later("jeremy")
+        LoggingJob.perform_later
+      end
+    end
+
+    assert_match(/0 .* but 1/, error.message)
+  end
+
+  def test_assert_no_performed_jobs_with_only_and_except_option_failure
+    error = assert_raise ActiveJob::TestHelper::InvalidOptionsError do
+      assert_no_performed_jobs only: HelloJob, except: HelloJob do
+        HelloJob.perform_later("jeremy")
+        LoggingJob.perform_later
+      end
+    end
+
+    assert_match(/`:only` and `:except`/, error.message)
+  end
+
   def test_assert_performed_job
     assert_performed_with(job: NestedJob, queue: "default") do
       NestedJob.perform_later