2 files changed, 148 insertions, 0 deletions
diff --git a/railties/test/queueing/test_queue_test.rb b/railties/test/queueing/test_queue_test.rb
new file mode 100644
index 0000000000..78c6c617fe
--- /dev/null
+++ b/railties/test/queueing/test_queue_test.rb
@@ -0,0 +1,67 @@
+require 'abstract_unit'
+require 'rails/queueing'
+
+class TestQueueTest < ActiveSupport::TestCase
+  class Job
+    def initialize(&block)
+      @block = block
+    end
+
+    def run
+      @block.call if @block
+    end
+  end
+
+  def setup
+    @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
+    @queue.push job
+    refute @queue.empty?
+    assert_equal job, @queue.pop
+  end
+
+  def test_order
+    processed = []
+
+    job1 = Job.new { processed << 1 }
+    job2 = Job.new { processed << 2 }
+
+    @queue.push job1
+    @queue.push job2
+    @queue.drain
+
+    assert_equal [1,2], processed
+  end
+
+  def test_drain
+    t = nil
+    ran = false
+
+    job = Job.new do
+      ran = true
+      t = Thread.current
+    end
+
+    @queue.push job
+    @queue.drain
+
+    assert @queue.empty?
+    assert ran, "The job runs synchronously when the queue is drained"
+    assert_not_equal t, Thread.current
+  end
+end
diff --git a/railties/test/queueing/threaded_consumer_test.rb b/railties/test/queueing/threaded_consumer_test.rb
new file mode 100644
index 0000000000..559de2a82d
--- /dev/null
+++ b/railties/test/queueing/threaded_consumer_test.rb
@@ -0,0 +1,81 @@
+require 'abstract_unit'
+require 'rails/queueing'
+
+class TestThreadConsumer < ActiveSupport::TestCase
+  class Job
+    attr_reader :id
+    def initialize(id, &block)
+      @id = id
+      @block = block
+    end
+
+    def run
+      @block.call if @block
+    end
+  end
+
+  def setup
+    @queue = Rails::Queueing::Queue.new
+    @consumer = Rails::Queueing::ThreadedConsumer.start(@queue)
+  end
+
+  def teardown
+    @queue.push nil
+  end
+
+  test "the jobs are executed" do
+    ran = false
+
+    job = Job.new(1) do
+      ran = true
+    end
+
+    @queue.push job
+    sleep 0.1
+    assert_equal true, ran
+  end
+
+  test "the jobs are not executed synchronously" do
+    ran = false
+
+    job = Job.new(1) do
+      sleep 0.1
+      ran = true
+    end
+
+    @queue.push job
+    assert_equal false, ran
+  end
+
+  test "shutting down the queue synchronously drains the jobs" do
+    ran = false
+
+    job = Job.new(1) do
+      sleep 0.1
+      ran = true
+    end
+
+    @queue.push job
+    assert_equal false, ran
+
+    @consumer.shutdown
+
+    assert_equal true, ran
+  end
+
+  test "log job that raises an exception" do
+    require "active_support/log_subscriber/test_helper"
+    logger = ActiveSupport::LogSubscriber::TestHelper::MockLogger.new
+    Rails.logger = logger
+
+    job = Job.new(1) do
+      raise "RuntimeError: Error!"
+    end
+
+    @queue.push job
+    sleep 0.1
+
+    assert_equal 1, logger.logged(:error).size
+    assert_match(/Job Error: RuntimeError: Error!/, logger.logged(:error).last)
+  end
+end