diff options
| -rw-r--r-- | railties/lib/rails/queueing.rb | 8 | ||||
| -rw-r--r-- | railties/test/queueing/test_queue_test.rb | 11 |
2 files changed, 19 insertions, 0 deletions
diff --git a/railties/lib/rails/queueing.rb b/railties/lib/rails/queueing.rb index fb5519f827..81cc12b7aa 100644 --- a/railties/lib/rails/queueing.rb +++ b/railties/lib/rails/queueing.rb @@ -8,6 +8,14 @@ module Rails # Jobs are run in a separate thread to catch mistakes where code # assumes that the job is run in the same thread. class TestQueue < ::Queue + # Get a list of the jobs off this queue. This method may not be + # available on production queues. + def jobs + @que.dup + end + + # Drain the queue, running all jobs in a different thread. This method + # may not be available on production queues. def drain # run the jobs in a separate thread so assumptions of synchronous # jobs are caught in test mode. diff --git a/railties/test/queueing/test_queue_test.rb b/railties/test/queueing/test_queue_test.rb index fdceb5d1b5..78c6c617fe 100644 --- a/railties/test/queueing/test_queue_test.rb +++ b/railties/test/queueing/test_queue_test.rb @@ -16,6 +16,17 @@ class TestQueueTest < ActiveSupport::TestCase @queue = Rails::Queueing::TestQueue.new end + def test_drain_raises + @queue.push Job.new { raise } + assert_raises(RuntimeError) { @queue.drain } + end + + def test_jobs + @queue.push 1 + @queue.push 2 + assert_equal [1,2], @queue.jobs + end + def test_contents assert @queue.empty? job = Job.new |