8 files changed, 331 insertions, 0 deletions
diff --git a/activejob/test/cases/adapter_test.rb b/activejob/test/cases/adapter_test.rb
new file mode 100644
index 0000000000..4fc235ae40
--- /dev/null
+++ b/activejob/test/cases/adapter_test.rb
@@ -0,0 +1,8 @@
+require 'helper'
+
+class AdapterTest < ActiveSupport::TestCase
+  test "should load #{ENV['AJADAPTER']} adapter" do
+    ActiveJob::Base.queue_adapter = ENV['AJADAPTER'].to_sym
+    assert_equal ActiveJob::Base.queue_adapter, "active_job/queue_adapters/#{ENV['AJADAPTER']}_adapter".classify.constantize
+  end
+end
diff --git a/activejob/test/cases/callbacks_test.rb b/activejob/test/cases/callbacks_test.rb
new file mode 100644
index 0000000000..9a0657ee89
--- /dev/null
+++ b/activejob/test/cases/callbacks_test.rb
@@ -0,0 +1,22 @@
+require 'helper'
+require 'jobs/callback_job'
+
+require 'active_support/core_ext/object/inclusion'
+
+class CallbacksTest < ActiveSupport::TestCase
+  test 'perform callbacks' do
+    performed_callback_job = CallbackJob.new.tap { |j| j.execute("A-JOB-ID") }
+    assert "CallbackJob ran before_perform".in? performed_callback_job.history
+    assert "CallbackJob ran after_perform".in? performed_callback_job.history
+    assert "CallbackJob ran around_perform_start".in? performed_callback_job.history
+    assert "CallbackJob ran around_perform_stop".in? performed_callback_job.history
+  end
+
+  test 'enqueue callbacks' do
+    enqueued_callback_job = CallbackJob.enqueue
+    assert "CallbackJob ran before_enqueue".in? enqueued_callback_job.history
+    assert "CallbackJob ran after_enqueue".in? enqueued_callback_job.history
+    assert "CallbackJob ran around_enqueue_start".in? enqueued_callback_job.history
+    assert "CallbackJob ran around_enqueue_stop".in? enqueued_callback_job.history
+  end
+end
diff --git a/activejob/test/cases/job_serialization_test.rb b/activejob/test/cases/job_serialization_test.rb
new file mode 100644
index 0000000000..fc1b77744c
--- /dev/null
+++ b/activejob/test/cases/job_serialization_test.rb
@@ -0,0 +1,15 @@
+require 'helper'
+require 'jobs/gid_job'
+require 'models/person'
+
+class JobSerializationTest < ActiveSupport::TestCase
+  setup do
+    JobBuffer.clear
+    @person = Person.find(5)
+  end
+
+  test 'serialize job with gid' do
+    GidJob.enqueue @person
+    assert_equal "Person with ID: 5", JobBuffer.last_value
+  end
+end
diff --git a/activejob/test/cases/logging_test.rb b/activejob/test/cases/logging_test.rb
new file mode 100644
index 0000000000..888c183a0b
--- /dev/null
+++ b/activejob/test/cases/logging_test.rb
@@ -0,0 +1,96 @@
+require 'helper'
+require "active_support/log_subscriber/test_helper"
+require 'active_support/core_ext/numeric/time'
+require 'jobs/hello_job'
+require 'jobs/logging_job'
+require 'jobs/nested_job'
+
+class AdapterTest < ActiveSupport::TestCase
+  include ActiveSupport::LogSubscriber::TestHelper
+  include ActiveSupport::Logger::Severity
+
+  class TestLogger < ActiveSupport::Logger
+    def initialize
+      @file = StringIO.new
+      super(@file)
+    end
+
+    def messages
+      @file.rewind
+      @file.read
+    end
+  end
+
+  def setup
+    super
+    JobBuffer.clear
+    @old_logger = ActiveJob::Base.logger
+    @logger = ActiveSupport::TaggedLogging.new(TestLogger.new)
+    set_logger @logger
+    ActiveJob::Logging::LogSubscriber.attach_to :active_job
+  end
+
+  def teardown
+    super
+    ActiveJob::Logging::LogSubscriber.log_subscribers.pop
+    ActiveJob::Base.logger = @old_logger
+  end
+
+  def set_logger(logger)
+    ActiveJob::Base.logger = logger
+  end
+
+
+  def test_uses_active_job_as_tag
+    HelloJob.enqueue "Cristian"
+    assert_match(/\[ActiveJob\]/, @logger.messages)
+  end
+
+  def test_enqueue_job_logging
+    HelloJob.enqueue "Cristian"
+    assert_match(/Enqueued HelloJob \(Job ID: .*?\) to .*?:.*Cristian/, @logger.messages)
+  end
+
+  def test_perform_job_logging
+    LoggingJob.enqueue "Dummy"
+    assert_match(/Performing LoggingJob from .*? with arguments:.*Dummy/, @logger.messages)
+    assert_match(/Dummy, here is it: Dummy/, @logger.messages)
+    assert_match(/Performed LoggingJob from .*? in .*ms/, @logger.messages)
+  end
+
+  def test_perform_uses_job_name_job_logging
+    LoggingJob.enqueue "Dummy"
+    assert_match(/\[LoggingJob\]/, @logger.messages)
+  end
+
+  def test_perform_uses_job_id_job_logging
+    LoggingJob.enqueue "Dummy"
+    assert_match(/\[LOGGING-JOB-ID\]/, @logger.messages)
+  end
+
+  def test_perform_nested_jobs_logging
+    NestedJob.enqueue
+    assert_match(/\[LoggingJob\] \[.*?\]/, @logger.messages)
+    assert_match(/\[ActiveJob\] Enqueued NestedJob \(Job ID: .*\) to/, @logger.messages)
+    assert_match(/\[ActiveJob\] \[NestedJob\] \[NESTED-JOB-ID\] Performing NestedJob from/, @logger.messages)
+    assert_match(/\[ActiveJob\] \[NestedJob\] \[NESTED-JOB-ID\] Enqueued LoggingJob \(Job ID: .*?\) to .* with arguments: "NestedJob"/, @logger.messages)
+    assert_match(/\[ActiveJob\].*\[LoggingJob\] \[LOGGING-JOB-ID\] Performing LoggingJob from .* with arguments: "NestedJob"/, @logger.messages)
+    assert_match(/\[ActiveJob\].*\[LoggingJob\] \[LOGGING-JOB-ID\] Dummy, here is it: NestedJob/, @logger.messages)
+    assert_match(/\[ActiveJob\].*\[LoggingJob\] \[LOGGING-JOB-ID\] Performed LoggingJob from .* in/, @logger.messages)
+    assert_match(/\[ActiveJob\] \[NestedJob\] \[NESTED-JOB-ID\] Performed NestedJob from .* in/, @logger.messages)
+  end
+
+  def test_enqueue_at_job_logging
+    HelloJob.enqueue_at 1, "Cristian"
+    assert_match(/Enqueued HelloJob \(Job ID: .*\) to .*? at.*Cristian/, @logger.messages)
+  rescue NotImplementedError
+    skip
+  end
+
+  def test_enqueue_in_job_logging
+    HelloJob.enqueue_in 2, "Cristian"
+    assert_match(/Enqueued HelloJob \(Job ID: .*\) to .*? at.*Cristian/, @logger.messages)
+  rescue NotImplementedError
+    skip
+  end
+end
diff --git a/activejob/test/cases/parameters_test.rb b/activejob/test/cases/parameters_test.rb
new file mode 100644
index 0000000000..76e8a8059a
--- /dev/null
+++ b/activejob/test/cases/parameters_test.rb
@@ -0,0 +1,77 @@
+require 'helper'
+require 'active_job/arguments'
+require 'models/person'
+require 'active_support/core_ext/hash/indifferent_access'
+
+class ParameterSerializationTest < ActiveSupport::TestCase
+  test 'should make no change to regular values' do
+    assert_equal [ 1, "something" ], ActiveJob::Arguments.serialize([ 1, "something" ])
+  end
+
+  test 'should not allow complex objects' do
+    assert_equal [ nil ], ActiveJob::Arguments.serialize([ nil ])
+    assert_equal [ 1 ], ActiveJob::Arguments.serialize([ 1 ])
+    assert_equal [ 1.0 ], ActiveJob::Arguments.serialize([ 1.0 ])
+    assert_equal [ 'a' ], ActiveJob::Arguments.serialize([ 'a' ])
+    assert_equal [ true ], ActiveJob::Arguments.serialize([ true ])
+    assert_equal [ false ], ActiveJob::Arguments.serialize([ false ])
+    assert_equal [ { "a" => 1, "b" => 2 } ], ActiveJob::Arguments.serialize([ { a: 1, "b" => 2 } ])
+    assert_equal [ [ 1 ] ], ActiveJob::Arguments.serialize([ [ 1 ] ])
+    assert_equal [ 1_000_000_000_000_000_000_000 ], ActiveJob::Arguments.serialize([ 1_000_000_000_000_000_000_000 ])
+
+    err = assert_raises RuntimeError do
+      ActiveJob::Arguments.serialize([ 1, self ])
+    end
+    assert_equal "Unsupported argument type: #{self.class.name}", err.message
+  end
+
+  test 'should dive deep into arrays or hashes' do
+    assert_equal [ { "a" => Person.find(5).gid.to_s }.with_indifferent_access ], ActiveJob::Arguments.serialize([ { a: Person.find(5) } ])
+    assert_equal [ [ Person.find(5).gid.to_s ] ], ActiveJob::Arguments.serialize([ [ Person.find(5) ] ])
+  end
+
+  test 'should dive deep into arrays or hashes and raise exception on complex objects' do
+    err = assert_raises RuntimeError do
+      ActiveJob::Arguments.serialize([ 1, [self] ])
+    end
+    assert_equal "Unsupported argument type: #{self.class.name}", err.message
+  end
+
+  test 'shoud dive deep into hashes and allow raise exception on not string/symbol keys' do
+    err = assert_raises RuntimeError do
+      ActiveJob::Arguments.serialize([ [ { 1 => 2 } ] ])
+    end
+    assert_equal "Unsupported hash key type: Fixnum", err.message
+  end
+
+  test 'should serialize records with global id' do
+    assert_equal [ Person.find(5).gid.to_s ], ActiveJob::Arguments.serialize([ Person.find(5) ])
+  end
+
+  test 'should serialize values and records together' do
+    assert_equal [ 3, Person.find(5).gid.to_s ], ActiveJob::Arguments.serialize([ 3, Person.find(5) ])
+  end
+end
+
+class ParameterDeserializationTest < ActiveSupport::TestCase
+  test 'should make no change to regular values' do
+    assert_equal [ 1, "something" ], ActiveJob::Arguments.deserialize([ 1, "something" ])
+  end
+
+  test 'should deserialize records with global id' do
+    assert_equal [ Person.find(5) ], ActiveJob::Arguments.deserialize([ Person.find(5).gid ])
+  end
+
+  test 'should serialize values and records together' do
+    assert_equal [ 3, Person.find(5) ], ActiveJob::Arguments.deserialize([ 3, Person.find(5).gid ])
+  end
+
+  test 'should dive deep when deserialising arrays' do
+    assert_equal [ [ 3, Person.find(5) ] ], ActiveJob::Arguments.deserialize([ [ 3, Person.find(5).gid ] ])
+  end
+
+  test 'should dive deep when deserialising hashes' do
+    assert_equal [ { "5" => Person.find(5) } ], ActiveJob::Arguments.deserialize([ { "5" => Person.find(5).gid } ])
+  end
+
+end
diff --git a/activejob/test/cases/queue_naming_test.rb b/activejob/test/cases/queue_naming_test.rb
new file mode 100644
index 0000000000..fdfd1afceb
--- /dev/null
+++ b/activejob/test/cases/queue_naming_test.rb
@@ -0,0 +1,38 @@
+require 'helper'
+require 'jobs/hello_job'
+require 'jobs/logging_job'
+require 'jobs/nested_job'
+
+class QueueNamingTest < ActiveSupport::TestCase
+  test 'name derived from base' do
+    assert_equal "default", HelloJob.queue_name
+  end
+
+  test 'name appended in job' do
+    begin
+      HelloJob.queue_as :greetings
+      LoggingJob.queue_as :bookkeeping
+
+      assert_equal "default", NestedJob.queue_name
+      assert_equal "greetings", HelloJob.queue_name
+      assert_equal "bookkeeping", LoggingJob.queue_name
+    ensure
+      HelloJob.queue_name = LoggingJob.queue_name = ActiveJob::Base.default_queue_name
+    end
+  end
+
+  test 'should prefix the queue name' do
+    begin
+      original_queue_name_prefix = ActiveJob::Base.queue_name_prefix
+      original_queue_name = HelloJob.queue_name
+
+      ActiveJob::Base.queue_name_prefix = 'aj'
+      HelloJob.queue_as :low
+      assert_equal 'aj_low', HelloJob.queue_name
+    ensure
+      ActiveJob::Base.queue_name_prefix = original_queue_name_prefix
+      HelloJob.queue_name = original_queue_name
+    end
+  end
+
+end
diff --git a/activejob/test/cases/queuing_test.rb b/activejob/test/cases/queuing_test.rb
new file mode 100644
index 0000000000..f020316d7e
--- /dev/null
+++ b/activejob/test/cases/queuing_test.rb
@@ -0,0 +1,44 @@
+require 'helper'
+require 'jobs/hello_job'
+require 'active_support/core_ext/numeric/time'
+
+
+class QueuingTest < ActiveSupport::TestCase
+  setup do
+    JobBuffer.clear
+  end
+
+  test 'run queued job' do
+    HelloJob.enqueue
+    assert_equal "David says hello", JobBuffer.last_value
+  end
+
+  test 'run queued job with arguments' do
+    HelloJob.enqueue "Jamie"
+    assert_equal "Jamie says hello", JobBuffer.last_value
+  end
+
+  test 'run queued job later' do
+    begin
+      result = HelloJob.enqueue_at 1.second.ago, "Jamie"
+      assert result
+    rescue NotImplementedError
+      skip
+    end
+  end
+
+  test 'job returned by enqueue has the arguments available' do
+    job = HelloJob.enqueue "Jamie"
+    assert_equal [ "Jamie" ], job.arguments
+  end
+
+
+  test 'job returned by enqueue_at has the timestamp available' do
+    begin
+      job = HelloJob.enqueue_at Time.utc(2014, 1, 1)
+      assert_equal Time.utc(2014, 1, 1), job.enqueued_at
+    rescue NotImplementedError
+      skip
+    end
+  end
+end
diff --git a/activejob/test/cases/rescue_test.rb b/activejob/test/cases/rescue_test.rb
new file mode 100644
index 0000000000..d9ea3c91d7
--- /dev/null
+++ b/activejob/test/cases/rescue_test.rb
@@ -0,0 +1,31 @@
+require 'helper'
+require 'jobs/rescue_job'
+require 'models/person'
+
+require 'active_support/core_ext/object/inclusion'
+
+class RescueTest < ActiveSupport::TestCase
+  setup do
+    JobBuffer.clear
+  end
+
+  test 'rescue perform exception with retry' do
+    job = RescueJob.new
+    job.execute(SecureRandom.uuid, "david")
+    assert_equal [ "rescued from ArgumentError", "performed beautifully" ], JobBuffer.values
+  end
+
+  test 'let through unhandled perform exception' do
+    job = RescueJob.new
+    assert_raises(RescueJob::OtherError) do
+      job.execute(SecureRandom.uuid, "other")
+    end
+  end
+
+  test 'rescue from deserialization errors' do
+    RescueJob.enqueue Person.new(404)
+    assert_includes JobBuffer.values, 'rescued from DeserializationError'
+    assert_includes JobBuffer.values, 'DeserializationError original exception was Person::RecordNotFound'
+    assert_not_includes JobBuffer.values, 'performed beautifully'
+  end
+end