11 files changed, 73 insertions, 37 deletions
diff --git a/activejob/test/cases/logging_test.rb b/activejob/test/cases/logging_test.rb
index 9c56ee08b6..3d4e561117 100644
--- a/activejob/test/cases/logging_test.rb
+++ b/activejob/test/cases/logging_test.rb
@@ -33,7 +33,7 @@ class AdapterTest < ActiveSupport::TestCase
   def teardown
     super
     ActiveJob::Logging::LogSubscriber.log_subscribers.pop
-    ActiveJob::Base.logger = @old_logger
+    set_logger @old_logger
   end
 
   def set_logger(logger)
diff --git a/activejob/test/cases/queue_naming_test.rb b/activejob/test/cases/queue_naming_test.rb
index 4052477543..898016a704 100644
--- a/activejob/test/cases/queue_naming_test.rb
+++ b/activejob/test/cases/queue_naming_test.rb
@@ -9,8 +9,9 @@ class QueueNamingTest < ActiveSupport::TestCase
   end
 
   test 'uses given queue name job' do
+    original_queue_name = HelloJob.queue_name
+
     begin
-      original_queue_name = HelloJob.queue_name
       HelloJob.queue_as :greetings
       assert_equal "greetings", HelloJob.new.queue_name
     ensure
@@ -18,9 +19,32 @@ class QueueNamingTest < ActiveSupport::TestCase
     end
   end
 
+  test 'allows a blank queue name' do
+    original_queue_name = HelloJob.queue_name
+
+    begin
+      HelloJob.queue_as ""
+      assert_equal "", HelloJob.new.queue_name
+    ensure
+      HelloJob.queue_name = original_queue_name
+    end
+  end
+
+  test 'does not use a nil queue name' do
+    original_queue_name = HelloJob.queue_name
+
+    begin
+      HelloJob.queue_as nil
+      assert_equal "default", HelloJob.new.queue_name
+    ensure
+      HelloJob.queue_name = original_queue_name
+    end
+  end
+
   test 'evals block given to queue_as to determine queue' do
+    original_queue_name = HelloJob.queue_name
+
     begin
-      original_queue_name = HelloJob.queue_name
       HelloJob.queue_as { :another }
       assert_equal "another", HelloJob.new.queue_name
     ensure
@@ -29,8 +53,9 @@ class QueueNamingTest < ActiveSupport::TestCase
   end
 
   test 'can use arguments to determine queue_name in queue_as block' do
+    original_queue_name = HelloJob.queue_name
+
     begin
-      original_queue_name = HelloJob.queue_name
       HelloJob.queue_as { self.arguments.first=='1' ? :one : :two }
       assert_equal "one", HelloJob.new('1').queue_name
       assert_equal "two", HelloJob.new('3').queue_name
@@ -39,11 +64,11 @@ class QueueNamingTest < ActiveSupport::TestCase
     end
   end
 
-  test 'queu_name_prefix prepended to the queue name' do
-    begin
-      original_queue_name_prefix = ActiveJob::Base.queue_name_prefix
-      original_queue_name = HelloJob.queue_name
+  test 'queue_name_prefix prepended to the queue name with default delimiter' do
+    original_queue_name_prefix = ActiveJob::Base.queue_name_prefix
+    original_queue_name = HelloJob.queue_name
 
+    begin
       ActiveJob::Base.queue_name_prefix = 'aj'
       HelloJob.queue_as :low
       assert_equal 'aj_low', HelloJob.queue_name
@@ -53,9 +78,25 @@ class QueueNamingTest < ActiveSupport::TestCase
     end
   end
 
+  test 'queue_name_prefix prepended to the queue name with custom delimiter' do
+    original_queue_name_prefix = ActiveJob::Base.queue_name_prefix
+    original_queue_name_delimiter = ActiveJob::Base.queue_name_delimiter
+    original_queue_name = HelloJob.queue_name
+
+    begin
+      ActiveJob::Base.queue_name_delimiter = '.'
+      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
+      ActiveJob::Base.queue_name_delimiter = original_queue_name_delimiter
+      HelloJob.queue_name = original_queue_name
+    end
+  end
+
   test 'uses queue passed to #set' do
     job = HelloJob.set(queue: :some_queue).perform_later
     assert_equal "some_queue", job.queue_name
   end
-
 end
diff --git a/activejob/test/cases/rescue_test.rb b/activejob/test/cases/rescue_test.rb
index 1b6c2e9fac..58c9ca8992 100644
--- a/activejob/test/cases/rescue_test.rb
+++ b/activejob/test/cases/rescue_test.rb
@@ -2,8 +2,6 @@ require 'helper'
 require 'jobs/rescue_job'
 require 'models/person'
 
-require 'active_support/core_ext/object/inclusion'
-
 class RescueTest < ActiveSupport::TestCase
   setup do
     JobBuffer.clear
diff --git a/activejob/test/helper.rb b/activejob/test/helper.rb
index ce22833b11..ec0c8a8ede 100644
--- a/activejob/test/helper.rb
+++ b/activejob/test/helper.rb
@@ -26,5 +26,4 @@ end
 
 require 'active_support/testing/autorun'
 
-ActiveJob::Base.logger.level = Logger::DEBUG
 ActiveSupport::TestCase.test_order = :random
diff --git a/activejob/test/integration/queuing_test.rb b/activejob/test/integration/queuing_test.rb
index 779dedb53f..38874b51a8 100644
--- a/activejob/test/integration/queuing_test.rb
+++ b/activejob/test/integration/queuing_test.rb
@@ -3,16 +3,17 @@ require 'jobs/logging_job'
 require 'active_support/core_ext/numeric/time'
 
 class QueuingTest < ActiveSupport::TestCase
-  test 'should run jobs enqueued on a listenting queue' do
+  test 'should run jobs enqueued on a listening queue' do
     TestJob.perform_later @id
     wait_for_jobs_to_finish_for(5.seconds)
     assert job_executed
   end
 
-  test 'should not run jobs queued on a non-listenting queue' do
+  test 'should not run jobs queued on a non-listening queue' do
+    skip if adapter_is?(:inline) || adapter_is?(:sucker_punch)
+    old_queue = TestJob.queue_name
+
     begin
-      skip if adapter_is?(:inline) || adapter_is?(:sucker_punch)
-      old_queue = TestJob.queue_name
       TestJob.queue_as :some_other_queue
       TestJob.perform_later @id
       wait_for_jobs_to_finish_for(2.seconds)
diff --git a/activejob/test/jobs/callback_job.rb b/activejob/test/jobs/callback_job.rb
index 056dd073e8..891ed9464e 100644
--- a/activejob/test/jobs/callback_job.rb
+++ b/activejob/test/jobs/callback_job.rb
@@ -1,12 +1,21 @@
 class CallbackJob < ActiveJob::Base
   before_perform ->(job) { job.history << "CallbackJob ran before_perform" }
-  after_perform  ->(job) { job.history << "CallbackJob ran after_perform"  }
+  after_perform ->(job) { job.history << "CallbackJob ran after_perform" }
 
   before_enqueue ->(job) { job.history << "CallbackJob ran before_enqueue" }
-  after_enqueue  ->(job) { job.history << "CallbackJob ran after_enqueue"  }
+  after_enqueue ->(job) { job.history << "CallbackJob ran after_enqueue" }
 
-  around_perform :around_perform
-  around_enqueue :around_enqueue
+  around_perform do |job, block|
+    job.history << "CallbackJob ran around_perform_start"
+    block.call
+    job.history << "CallbackJob ran around_perform_stop"
+  end
+
+  around_enqueue do |job, block|
+    job.history << "CallbackJob ran around_enqueue_start"
+    block.call
+    job.history << "CallbackJob ran around_enqueue_stop"
+  end
 
 
   def perform(person = "david")
@@ -17,16 +26,4 @@ class CallbackJob < ActiveJob::Base
     @history ||= []
   end
 
-  # FIXME: Not sure why these can't be declared inline like before/after
-  def around_perform
-    history << "CallbackJob ran around_perform_start"
-    yield
-    history << "CallbackJob ran around_perform_stop"
-  end
-
-  def around_enqueue
-    history << "CallbackJob ran around_enqueue_start"
-    yield
-    history << "CallbackJob ran around_enqueue_stop"
-  end
 end
diff --git a/activejob/test/support/integration/adapters/backburner.rb b/activejob/test/support/integration/adapters/backburner.rb
index 0cda36a273..2e82562948 100644
--- a/activejob/test/support/integration/adapters/backburner.rb
+++ b/activejob/test/support/integration/adapters/backburner.rb
@@ -29,7 +29,7 @@ module BackburnerJobsManager
   def can_run?
     begin
       Backburner::Worker.connection.send :connect!
-    rescue => e
+    rescue
       return false
     end
     true
diff --git a/activejob/test/support/integration/adapters/qu.rb b/activejob/test/support/integration/adapters/qu.rb
index e913f04a24..3a5b66a057 100644
--- a/activejob/test/support/integration/adapters/qu.rb
+++ b/activejob/test/support/integration/adapters/qu.rb
@@ -30,7 +30,7 @@ module QuJobsManager
   def can_run?
     begin
       Qu.backend.connection.client.connect
-    rescue => e
+    rescue
       return false
     end
     true
diff --git a/activejob/test/support/integration/adapters/resque.rb b/activejob/test/support/integration/adapters/resque.rb
index 9de3e7c879..82acb17b2b 100644
--- a/activejob/test/support/integration/adapters/resque.rb
+++ b/activejob/test/support/integration/adapters/resque.rb
@@ -41,7 +41,7 @@ module ResqueJobsManager
   def can_run?
     begin
       Resque.redis.client.connect
-    rescue => e
+    rescue
       return false
     end
     true
diff --git a/activejob/test/support/integration/adapters/sidekiq.rb b/activejob/test/support/integration/adapters/sidekiq.rb
index 0a0a549c9e..3cc9a34993 100644
--- a/activejob/test/support/integration/adapters/sidekiq.rb
+++ b/activejob/test/support/integration/adapters/sidekiq.rb
@@ -49,7 +49,7 @@ module SidekiqJobsManager
   def can_run?
     begin
       Sidekiq.redis { |conn| conn.connect }
-    rescue => e
+    rescue
       return false
     end
     true
diff --git a/activejob/test/support/integration/adapters/sneakers.rb b/activejob/test/support/integration/adapters/sneakers.rb
index f21bb38a32..875803a2d8 100644
--- a/activejob/test/support/integration/adapters/sneakers.rb
+++ b/activejob/test/support/integration/adapters/sneakers.rb
@@ -68,7 +68,7 @@ module SneakersJobsManager
   def can_run?
     begin
       bunny_publisher
-    rescue => e
+    rescue
       return false
     end
     true