Move past time check out of adapters

3 files changed, 6 insertions, 10 deletions

diff --git a/lib/active_job/enqueuing.rb b/lib/active_job/enqueuing.rb
index b2d142ee96..1e0dd58b59 100644
--- a/lib/active_job/enqueuing.rb
+++ b/lib/active_job/enqueuing.rb
@@ -32,7 +32,11 @@ module ActiveJob
     #
     # Returns truthy if a job was scheduled.
     def enqueue_at(timestamp, *args)
-      queue_adapter.queue_at self, timestamp.to_f, *Parameters.serialize(args)
+      if Time.now.to_f > timestamp
+        queue.adapter.queue self, *Parameters.serialize(args)
+      else
+        queue_adapter.queue_at self, timestamp.to_f, *Parameters.serialize(args)
+      end
     end
   end
 end
diff --git a/lib/active_job/queue_adapters/sidekiq_adapter.rb b/lib/active_job/queue_adapters/sidekiq_adapter.rb
index 41f58f554a..c6faf9d054 100644
--- a/lib/active_job/queue_adapters/sidekiq_adapter.rb
+++ b/lib/active_job/queue_adapters/sidekiq_adapter.rb
@@ -10,8 +10,6 @@ module ActiveJob
 
         def queue_at(job, timestamp, *args)
           job = { class: JobWrapper, queue: job.queue_name, args: [ job, *args ], at: timestamp }
-          # Optimization to enqueue something now that is scheduled to go out now or in the past
-          job.delete(:at) if timestamp <= Time.now.to_f
           JobWrapper.client_push(job)
         end
       end
diff --git a/lib/active_job/queue_adapters/sucker_punch_adapter.rb b/lib/active_job/queue_adapters/sucker_punch_adapter.rb
index e483c0844b..8125499695 100644
--- a/lib/active_job/queue_adapters/sucker_punch_adapter.rb
+++ b/lib/active_job/queue_adapters/sucker_punch_adapter.rb
@@ -9,13 +9,7 @@ module ActiveJob
         end
 
         def queue_at(job, timestamp, *args)
-          secs = Time.now.to_f - timestamp
-          if secs < 1
-            # Optimization to enqueue something now that is scheduled to go out now or in the past
-            JobWrapper.new.async.perform(job, *args)
-          else
-            JobWrapper.new.async.later(secs, job, *args)
-          end
+          JobWrapper.new.async.later(secs, job, *args)
         end
       end