Correcting the forward-porting of resque#365

as it was (whoopsie!) lost in a rebase.
playup · Feb 18, 2014 · 812b0ed · 812b0ed
1 parent faee8b4
commit 812b0ed
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/lib/resque/scheduler/extension.rb b/lib/resque/scheduler/extension.rb
@@ -347,6 +347,15 @@ def count_all_scheduled_jobs
         total_jobs
       end
 
+      # Discover if a job has been delayed.
+      # Examples
+      #   Resque.delayed?(MyJob)
+      #   Resque.delayed?(MyJob, id: 1)
+      # Returns true if the job has been delayed
+      def delayed?(klass, *args)
+        !scheduled_at(klass, *args).empty?
+      end
+
       # Returns delayed jobs schedule timestamp for +klass+, +args+.
       def scheduled_at(klass, *args)
         search = encode(job_to_hash(klass, args))

diff --git a/test/delayed_queue_test.rb b/test/delayed_queue_test.rb
@@ -534,10 +534,10 @@
     Resque.enqueue_at Time.now + 1, SomeIvarJob
     Resque.enqueue_at Time.now + 1, SomeIvarJob, id: 1
 
-    assert(Resque.delayed?(SomeIvarJob, id: 1))
-    assert(!Resque.delayed?(SomeIvarJob, id: 2))
-    assert(Resque.delayed?(SomeIvarJob))
-    assert(!Resque.delayed?(SomeJob))
+    assert Resque.delayed?(SomeIvarJob, id: 1)
+    assert !Resque.delayed?(SomeIvarJob, id: 2)
+    assert Resque.delayed?(SomeIvarJob)
+    assert !Resque.delayed?(SomeJob)
 
   end