resque_unit 0.4.2 → 0.4.3

data/lib/resque_unit/scheduler.rb

@@ -1,5 +1,5 @@
 module ResqueUnit
-  
+
   # ResqueUnit::Scheduler is a group of functions mocking the behavior
   # of resque-scheduler. It is included into Resque when
   # 'resque_unit_scheduler' is required.
@@ -11,13 +11,13 @@ module ResqueUnit
     def enqueue_at(timestamp, klass, *args)
       enqueue_with_timestamp(timestamp, klass, *args)
     end
-    
+
     # Identical to enqueue_at but takes number_of_seconds_from_now
     # instead of a timestamp.
     def enqueue_in(number_of_seconds_from_now, klass, *args)
       enqueue_at(Time.now + number_of_seconds_from_now, klass, *args)
     end
-    
+
     def enqueue_with_timestamp(timestamp, klass, *args)
       enqueue_unit(queue_for(klass), {"class" => klass.name, "args" => args, "timestamp" => timestamp})
     end
@@ -32,10 +32,9 @@ module ResqueUnit
     def remove_delayed_job_from_timestamp(timestamp, klass, *args)
       encoded_job_payloads = Resque.queue(queue_for(klass))
       args ||= []
-      encoded_job_payloads.delete_if { |e| e = Resque.decode(e); e["class"] == klass.to_s && e["timestamp"] == timestamp.to_s && e["args"] == args }
+      encoded_job_payloads.delete_if { |e| e = Resque.decode(e); e["class"] == klass.to_s && Time.parse(e["timestamp"]).to_i == Time.parse(timestamp.to_s).to_i && e["args"] == args }
     end
   end
 
   Resque.send(:extend, Scheduler)
 end
-

data/test/resque_unit_scheduler_test.rb

@@ -129,7 +129,7 @@ class ResqueUnitSchedulerTest < Test::Unit::TestCase
       end
     end
 
-    context "and then the job is removed with #remove_delayed_job_with_timestamp" do
+    context "and then the job is removed with #remove_delayed_job_from_timestamp" do
       setup do
         Resque.remove_delayed_job_from_timestamp(@time, MediumPriorityJob)
       end
@@ -144,6 +144,22 @@ class ResqueUnitSchedulerTest < Test::Unit::TestCase
         end
       end
     end
+
+    context "and then the job is removed with #remove_delayed_job_from_timestamp with timestamp specified in another timezone" do
+      setup do
+        Resque.remove_delayed_job_from_timestamp(@time.utc, 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
 
   context "A task that schedules a resque job with arguments on on Sept. 6, 2016 at 6am" do
@@ -197,5 +213,21 @@ class ResqueUnitSchedulerTest < Test::Unit::TestCase
         end
       end
     end
+
+    context "and then the job is removed with #remove_delayed_job_from_timestamp with timestamp in another timezone" do
+      setup do
+        Resque.remove_delayed_job_from_timestamp(@time.utc, JobWithArguments, 1, "test")
+      end
+
+      should "pass the assert_not_queued_at(@time, JobWithArguments, *args) assertion" do
+        assert_not_queued_at(@time, JobWithArguments, [1, "test"])
+      end
+
+      should "fail the assert_queued_at(@time, MediumPriorityJob, *args) assertion" do
+        assert_raise Test::Unit::AssertionFailedError do
+          assert_queued_at(@time, JobWithArguments, [1, "test"])
+        end
+      end
+    end
   end
 end

data/test/resque_unit_test.rb

@@ -26,9 +26,9 @@ class ResqueUnitTest < Test::Unit::TestCase
       assert_equal 1, Resque.queue(:a_non_class_determined_queue).length
     end
   end
-  
+
   context "A task that spawns multiple jobs on a single queue" do
-    setup do 
+    setup do
       3.times {Resque.enqueue(HighPriorityJob)}
     end
 
@@ -52,7 +52,7 @@ class ResqueUnitTest < Test::Unit::TestCase
   end
 
   context "A task that schedules a resque job" do
-    setup do 
+    setup do
       @returned = Resque.enqueue(LowPriorityJob)
     end
 
@@ -60,12 +60,12 @@ class ResqueUnitTest < Test::Unit::TestCase
       assert @returned
     end
 
-    should "pass the assert_queued(job) assertion" do 
+    should "pass the assert_queued(job) assertion" do
       assert_queued(LowPriorityJob)
     end
 
-    should "fail the assert_not_queued(job) assertion" do 
-      assert_raise Test::Unit::AssertionFailedError do 
+    should "fail the assert_not_queued(job) assertion" do
+      assert_raise Test::Unit::AssertionFailedError do
         assert_not_queued(LowPriorityJob)
       end
     end
@@ -74,17 +74,17 @@ class ResqueUnitTest < Test::Unit::TestCase
       assert_equal 1, Resque.size(:low)
     end
 
-    context ", when Resque.run! is called," do 
-      setup do 
+    context ", when Resque.run! is called," do
+      setup do
         assert !LowPriorityJob.run?, "The job should not have been run yet"
         Resque.run!
       end
-      
-      teardown do 
+
+      teardown do
         LowPriorityJob.run = false
       end
 
-      should "run the job" do 
+      should "run the job" do
         assert LowPriorityJob.run?, "The job should have run"
       end
 
@@ -97,7 +97,7 @@ class ResqueUnitTest < Test::Unit::TestCase
   end
 
   context "A task that schedules a resque job with hooks" do
-    setup do 
+    setup do
       Resque.enable_hooks!
     end
 
@@ -106,22 +106,22 @@ class ResqueUnitTest < Test::Unit::TestCase
     end
 
     context "before, around, after, failure, after_enqueue" do
-      setup do 
+      setup do
         JobWithHooks.clear_markers
         Resque.enqueue(JobWithHooks)
       end
 
-      should "have run the after_enqueue hook" do 
+      should "have run the after_enqueue hook" do
         assert_queued(JobWithHooks)
         assert(JobWithHooks.markers[:after_enqueue], 'no after_queue marker set')
       end
 
-      should "have run the before_enqueue hook" do 
+      should "have run the before_enqueue hook" do
         assert(JobWithHooks.markers[:before_enqueue], 'no before_queue marker set')
         assert_queued(JobWithHooks)
       end
 
-      should "run the before and after hooks during a run" do 
+      should "run the before and after hooks during a run" do
         Resque.run!
         assert(JobWithHooks.markers[:before], 'no before marker set')
         assert(JobWithHooks.markers[:around], 'no around marker set')
@@ -253,12 +253,12 @@ class ResqueUnitTest < Test::Unit::TestCase
   end
 
   context "An empty queue" do
-    should "pass the assert_not_queued(job) assertion" do 
+    should "pass the assert_not_queued(job) assertion" do
       assert_not_queued(LowPriorityJob)
     end
 
     should "fail the assert_queued(job) assertion" do
-      assert_raise Test::Unit::AssertionFailedError do 
+      assert_raise Test::Unit::AssertionFailedError do
         assert_queued(LowPriorityJob)
       end
     end
@@ -267,16 +267,16 @@ class ResqueUnitTest < Test::Unit::TestCase
       assert_equal 0, Resque.size(:low)
     end
   end
-  
-  context "A task that schedules a resque job with arguments" do 
-    setup do 
+
+  context "A task that schedules a resque job with arguments" do
+    setup do
       Resque.enqueue(JobWithArguments, 1, :test, {:symbol => :symbol})
     end
-    
+
     should "pass the assert_queued(job, *args) assertion if the args match and sees enqueued symbols as strings" do
       assert_queued(JobWithArguments, [1, "test", {"symbol"=>"symbol"}])
     end
-    
+
     should "pass the assert_queued(job, *args) assertion if the args match using symbols" do
       assert_queued(JobWithArguments, [1, :test, {:symbol => :symbol}])
     end
@@ -285,8 +285,8 @@ class ResqueUnitTest < Test::Unit::TestCase
       assert_queued(JobWithArguments)
     end
 
-    should "fail the assert_queued(job) assertion if the args don't match" do 
-      assert_raise Test::Unit::AssertionFailedError do 
+    should "fail the assert_queued(job) assertion if the args don't match" do
+      assert_raise Test::Unit::AssertionFailedError do
         assert_queued(JobWithArguments, [2, "test"])
       end
     end
@@ -296,23 +296,23 @@ class ResqueUnitTest < Test::Unit::TestCase
     end
 
     should "fail the assert_not_queued(job) assertion if the args match" do
-      assert_raise Test::Unit::AssertionFailedError do 
+      assert_raise Test::Unit::AssertionFailedError do
         assert_not_queued(JobWithArguments, [1, "test", {"symbol"=>"symbol"}])
       end
     end
   end
 
   context "A job that schedules a new resque job" do
-    setup do 
+    setup do
       Resque.enqueue(JobThatCreatesANewJob)
     end
 
-    should "pass the assert_queued(job) assertion" do 
+    should "pass the assert_queued(job) assertion" do
       assert_queued(JobThatCreatesANewJob)
     end
 
-    should "fail the assert_not_queued(job) assertion" do 
-      assert_raise Test::Unit::AssertionFailedError do 
+    should "fail the assert_not_queued(job) assertion" do
+      assert_raise Test::Unit::AssertionFailedError do
         assert_not_queued(JobThatCreatesANewJob)
       end
     end
@@ -321,8 +321,8 @@ class ResqueUnitTest < Test::Unit::TestCase
       assert_not_queued(LowPriorityJob)
     end
 
-    context ", when Resque.run! is called," do 
-      setup do 
+    context ", when Resque.run! is called," do
+      setup do
         Resque.run!
       end
 
@@ -341,7 +341,7 @@ class ResqueUnitTest < Test::Unit::TestCase
         Resque.full_run!
       end
 
-      teardown do 
+      teardown do
         LowPriorityJob.run = false
       end
 
@@ -370,10 +370,10 @@ class ResqueUnitTest < Test::Unit::TestCase
       assert_queued(HighPriorityJob)
     end
 
-    context ", when Resque.run_for! is called," do 
+    context ", when Resque.run_for! is called," do
       should "run only tasks in the high priority queue" do
         Resque.run_for!(Resque.queue_for(HighPriorityJob))
-  
+
         assert_queued(LowPriorityJob)
         assert_not_queued(HighPriorityJob)
       end
@@ -389,7 +389,7 @@ class ResqueUnitTest < Test::Unit::TestCase
           assert_equal "LowPriorityJob should have been queued in low: [].", error.message
         end
       end
-      
+
       should "include job arguments if provided" do
         begin
           assert_not_queued(JobWithArguments, [1, "test"])
@@ -408,7 +408,7 @@ class ResqueUnitTest < Test::Unit::TestCase
             assert_equal "LowPriorityJob should not have been queued in low.", error.message
         end
       end
-      
+
       should "include job arguments if provided" do
         begin
           Resque.enqueue(JobWithArguments, 1, "test")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque_unit
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-08 00:00:00.000000000Z
+date: 2012-04-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70334013235640 !ruby/object:Gem::Requirement
+  requirement: &70357498000140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *70334013235640
+  version_requirements: *70357498000140
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70334013235240 !ruby/object:Gem::Requirement
+  requirement: &70357497999740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70334013235240
+  version_requirements: *70357497999740
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70334013234780 !ruby/object:Gem::Requirement
+  requirement: &70357497999280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70334013234780
+  version_requirements: *70357497999280
 description: 
 email: justin@uberweiss.org
 executables: []
@@ -80,7 +80,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 504436930256171136
+      hash: 2837385060471172776
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 504436930256171136
+      hash: 2837385060471172776
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10