resque_unit 0.3.4 → 0.3.5

data/lib/resque_unit/resque.rb

@@ -109,6 +109,7 @@ module Resque
         hash[:klass].send(hook, *hash[:args])
       end
     end
+    queue(queue_name).size
   end
 
   # Call perform on the job class

data/lib/resque_unit/scheduler.rb

@@ -22,6 +22,15 @@ module ResqueUnit
       enqueue_unit(queue_for(klass), {:klass => klass, :args => decode(encode(args)), :timestamp => timestamp})
     end
 
+    def remove_delayed(klass, *args)
+      queue = Resque.queue(queue_for(klass))
+      if args # retrieve the elements that match klass and args in the queue
+        args = Resque.normalized_args(args)
+        queue.delete_if { |e| e[:klass] == klass && e[:args] == args }
+      else # if no args were passed, retrieve all queued jobs that match klass
+        queue.delete_if {|e| e[:klass] == klass}
+      end
+    end
   end
 
   Resque.send(:extend, Scheduler)

data/test/resque_unit_scheduler_test.rb

@@ -27,6 +27,20 @@ class ResqueUnitSchedulerTest < Test::Unit::TestCase
       assert_not_queued_in(300, MediumPriorityJob)
     end
 
+    context "and then the job is removed with #remove_delayed" do
+      setup do
+        Resque.remove_delayed(MediumPriorityJob)
+      end
+      should "pass the assert_not_queued_at(@time, MediumPriorityJob) assertion" do 
+        assert_not_queued_at(300, MediumPriorityJob)
+      end
+
+      should "fail the assert_queued_at(@time, MediumPriorityJob) assertion" do
+        assert_raise Test::Unit::AssertionFailedError do
+          assert_queued_at(300, MediumPriorityJob)
+        end
+      end
+    end
   end
   
   context "A task that schedules a resque job in 5 minutes with arguments" do
@@ -44,6 +58,40 @@ class ResqueUnitSchedulerTest < Test::Unit::TestCase
         assert_queued_in(600, JobWithArguments, [2, 'test'])
       end
     end
+
+    context "and then the job is removed with #remove_delayed" do
+      setup do
+        Resque.remove_delayed(JobWithArguments, 1, 'test')
+      end
+      should "pass the assert_not_queued_at(@time, JobWithArguments, 1, 'test') assertion" do 
+        assert_not_queued_at(600, JobWithArguments, 1, 'test')
+      end
+
+      should "fail the assert_queued_at(@time, JobWithArguments, 1, 'test') assertion" do
+        assert_raise Test::Unit::AssertionFailedError do
+          assert_queued_at(600, JobWithArguments, 1, 'test')
+        end
+      end
+    end
+
+    context "and a job of the same class but with different arguments is removed with #remove_delayed" do
+      setup do
+        Resque.remove_delayed(JobWithArguments, 2, 'test')
+      end
+      should "still pass the assert_queued_in(600, JobWithArguments) assertion" do
+        assert_queued_in(600, JobWithArguments)
+      end
+
+      should "still pass the assert_queued_in(600, JobWithArguments, [1, 'test']) assertion" do
+        assert_queued_in(600, JobWithArguments, [1, 'test'])
+      end
+
+      should "still fail the assert_queued_in(600, JobWithArguments, [2, 'test']) assertion" do 
+        assert_raise Test::Unit::AssertionFailedError do 
+          assert_queued_in(600, JobWithArguments, [2, 'test'])
+        end
+      end
+    end
   end
     
   context "A task that schedules a resque job on Sept. 6, 2016 at 6am" do
@@ -65,6 +113,20 @@ class ResqueUnitSchedulerTest < Test::Unit::TestCase
     should "pass the assert_not_queued_at(@time - 100, MediumPriorityJob) assertion" do
       assert_not_queued_at(@time - 100, MediumPriorityJob)
     end
-  end
 
+    context "and then the job is removed with #remove_delayed" do
+      setup do
+        Resque.remove_delayed(MediumPriorityJob)
+      end
+      should "pass the assert_not_queued_at(@time, MediumPriorityJob) assertion" do 
+        assert_not_queued_at(@time, MediumPriorityJob)
+      end
+
+      should "fail the assert_queued_at(@time, MediumPriorityJob) assertion" do
+        assert_raise Test::Unit::AssertionFailedError do
+          assert_queued_at(@time, MediumPriorityJob)
+        end
+      end
+    end
+  end
 end

data/test/resque_unit_test.rb

@@ -18,7 +18,11 @@ class ResqueUnitTest < Test::Unit::TestCase
 
   context "A task that schedules a resque job" do
     setup do 
-      Resque.enqueue(LowPriorityJob)
+      @returned = Resque.enqueue(LowPriorityJob)
+    end
+
+    should 'return a value that evaluates to true' do
+      assert @returned
     end
 
     should "pass the assert_queued(job) assertion" do 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Justin Weiss
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-14 00:00:00 -08:00
+date: 2011-02-24 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -95,7 +95,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1471830878985269609
+      hash: -3582999941534003168
       segments: 
       - 0
       version: "0"
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1471830878985269609
+      hash: -3582999941534003168
       segments: 
       - 0
       version: "0"