guard job queue for no request_id

 - only add a request_id to the job if there is a request_id
   specs tend not to stub out request_id

Author: jason-raitz

app/jobs/application_job.rb

@@ -2,11 +2,13 @@ class ApplicationJob < ActiveJob::Base
   attr_reader :request_id
 
   before_enqueue do
-    arguments << { request_id: Current.request_id }
+    arguments << { request_id: Current.request_id } if Current.request_id
   end
 
   around_perform do |job, block|
-    @request_id = job.arguments.pop[:request_id] || ''
+    if job.arguments.last.is_a?(Hash) && job.arguments.last.key?(:request_id)
+      @request_id = job.arguments.pop[:request_id]
+    end
     block.call
   end