3 files changed, 14 insertions, 3 deletions
diff --git a/activejob/test/adapters/que.rb b/activejob/test/adapters/que.rb
index 640061bf54..e6abc57457 100644
--- a/activejob/test/adapters/que.rb
+++ b/activejob/test/adapters/que.rb
@@ -1,2 +1,4 @@
+require 'support/que/inline'
+
 ActiveJob::Base.queue_adapter = :que
 Que.mode = :sync
diff --git a/activejob/test/cases/parameters_test.rb b/activejob/test/cases/parameters_test.rb
index 76e8a8059a..78853c51e1 100644
--- a/activejob/test/cases/parameters_test.rb
+++ b/activejob/test/cases/parameters_test.rb
@@ -19,7 +19,7 @@ class ParameterSerializationTest < ActiveSupport::TestCase
     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
+    err = assert_raises ActiveJob::SerializationError do
       ActiveJob::Arguments.serialize([ 1, self ])
     end
     assert_equal "Unsupported argument type: #{self.class.name}", err.message
@@ -31,14 +31,14 @@ class ParameterSerializationTest < ActiveSupport::TestCase
   end
 
   test 'should dive deep into arrays or hashes and raise exception on complex objects' do
-    err = assert_raises RuntimeError do
+    err = assert_raises ActiveJob::SerializationError 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
+    err = assert_raises ActiveJob::SerializationError do
       ActiveJob::Arguments.serialize([ [ { 1 => 2 } ] ])
     end
     assert_equal "Unsupported hash key type: Fixnum", err.message
diff --git a/activejob/test/support/que/inline.rb b/activejob/test/support/que/inline.rb
new file mode 100644
index 0000000000..2e210acb6b
--- /dev/null
+++ b/activejob/test/support/que/inline.rb
@@ -0,0 +1,9 @@
+require 'que'
+
+Que::Job.class_eval do
+  class << self; alias_method :original_enqueue, :enqueue; end
+  def self.enqueue(*args)
+    args.pop if args.last.is_a?(Hash)
+    self.run(*args)
+  end
+end