3 files changed, 45 insertions, 11 deletions

diff --git a/activejob/test/cases/argument_serialization_test.rb b/activejob/test/cases/argument_serialization_test.rb
index 5a46c5cdef..dbe36fc572 100644
--- a/activejob/test/cases/argument_serialization_test.rb
+++ b/activejob/test/cases/argument_serialization_test.rb
@@ -31,12 +31,12 @@ class ArgumentSerializationTest < ActiveSupport::TestCase
   end
 
   test 'should convert records to Global IDs' do
-    assert_arguments_roundtrip [@person], [@person.to_gid.to_s]
+    assert_arguments_roundtrip [@person], ['_aj_globalid' => @person.to_gid.to_s]
   end
 
   test 'should dive deep into arrays and hashes' do
-    assert_arguments_roundtrip [3, [@person]], [3, [@person.to_gid.to_s]]
-    assert_arguments_roundtrip [{ 'a' => @person }], [{ 'a' => @person.to_gid.to_s }.with_indifferent_access]
+    assert_arguments_roundtrip [3, [@person]], [3, ['_aj_globalid' => @person.to_gid.to_s]]
+    assert_arguments_roundtrip [{ 'a' => @person }], [{ 'a' => { '_aj_globalid' => @person.to_gid.to_s }}.with_indifferent_access]
   end
 
   test 'should stringify symbol hash keys' do
@@ -51,6 +51,14 @@ class ArgumentSerializationTest < ActiveSupport::TestCase
     assert_raises ActiveJob::SerializationError do
       ActiveJob::Arguments.serialize [ { :a => [{ 2 => 3 }] } ]
     end
+
+    assert_raises ActiveJob::SerializationError do
+      ActiveJob::Arguments.serialize [ '_aj_globalid' => 1 ]
+    end
+
+    assert_raises ActiveJob::SerializationError do
+      ActiveJob::Arguments.serialize [ :_aj_globalid => 1 ]
+    end
   end
 
   test 'should not allow non-primitive objects' do
diff --git a/activejob/test/cases/queue_naming_test.rb b/activejob/test/cases/queue_naming_test.rb
index 4052477543..886f41271a 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
@@ -40,10 +65,10 @@ class QueueNamingTest < ActiveSupport::TestCase
   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
+    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
@@ -57,5 +82,4 @@ class QueueNamingTest < ActiveSupport::TestCase
     job = HelloJob.set(queue: :some_queue).perform_later
     assert_equal "some_queue", job.queue_name
   end
-
 end
diff --git a/activejob/test/cases/test_helper_test.rb b/activejob/test/cases/test_helper_test.rb
index eab540bb6c..71c505a65f 100644
--- a/activejob/test/cases/test_helper_test.rb
+++ b/activejob/test/cases/test_helper_test.rb
@@ -97,11 +97,13 @@ class EnqueuedJobsTest < ActiveJob::TestCase
       end
     end
 
-    assert_raise ActiveSupport::TestCase::Assertion do
+    error = assert_raise ActiveSupport::TestCase::Assertion do
       assert_enqueued_with(job: NestedJob, queue: 'low') do
         NestedJob.perform_later
       end
     end
+
+    assert_equal 'No enqueued job found with {:job=>NestedJob, :queue=>"low"}', error.message
   end
 
   def test_assert_enqueued_job_args