Allow tests to override enqueued_at

sidekiq · Feb 28, 2019 · cfe53e5 · cfe53e5
1 parent 4f057c9
commit cfe53e5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/lib/sidekiq/client.rb b/lib/sidekiq/client.rb
@@ -198,7 +198,7 @@ def atomic_push(conn, payloads)
         q = payloads.first['queue']
         now = Time.now.to_f
         to_push = payloads.map do |entry|
-          entry['enqueued_at'] = now
+          entry['enqueued_at'] ||= now
           Sidekiq.dump_json(entry)
         end
         conn.sadd('queues', q)

diff --git a/test/test_web.rb b/test/test_web.rb
@@ -105,13 +105,22 @@ def perform(a, b)
   end
 
   it 'can display queues' do
-    assert Sidekiq::Client.push('queue' => :foo, 'class' => WebWorker, 'args' => [1, 3], 'enqueued_at' => Time.now.to_f - 65)
+    assert Sidekiq::Client.push('queue' => :foo, 'class' => WebWorker, 'args' => [1, 3])
 
     get '/queues'
     assert_equal 200, last_response.status
     assert_match(/foo/, last_response.body)
     refute_match(/HardWorker/, last_response.body)
-    assert_match(/seconds ago/, last_response.body)
+    refute_match(/datetime/, last_response.body)
+    Sidekiq::Queue.new("foo").clear
+
+    assert Sidekiq::Client.push('queue' => :foo, 'class' => WebWorker, 'args' => [1, 3], 'enqueued_at' => Time.now.to_f - 65)
+
+    get '/queues'
+    assert_equal 200, last_response.status
+    assert_match(/foo/, last_response.body)
+    refute_match(/WebWorker/, last_response.body)
+    assert_match(/datetime/, last_response.body)
   end
 
   it 'handles queue view' do