resque_spec 0.12.6 → 0.12.7

data/README.md

@@ -208,6 +208,21 @@ You can also check the size of the schedule:
 
 (And I take note of the `before` block that is calling `reset!` for every spec)
 
+You can explicitly specify the queue when using enqueue_at_with_queue and
+enqueue_in_with_queue:
+
+    describe "#recalculate_in_future" do
+      before do
+        ResqueSpec.reset!
+      end
+
+      it "adds person.calculate to the :future queue" do
+        person.recalculate_in_future
+
+        Person.should have_schedule_size_of(1).queue(:future)
+      end
+    end
+
 And I might write this as a Cucumber step
 
     Then /the (\w?) has (\w?) scheduled/ do |thing, method|
@@ -223,6 +238,10 @@ Then I write some code to make it pass:
       def recalculate
         Resque.enqueue_at(Time.now + 3600, Person, id, :calculate)
       end
+
+      def recalculate_in_future
+        Resque.enqueue_at_with_queue(:future, Time.now + 3600, Person, id, :calculate)
+      end
     end
 
 Performing Jobs in Specs
@@ -350,6 +369,7 @@ Contributors
 * @opinel        (Frank Wambutt)      :Fix DST problem in `have\_scheduled`
 * @lukemelia     (Luke Melia)         :Add `times` chained matcher
 * @heelhook      (Pablo Fernandez)    :Add `have_queue_size_of_at_least` and `have_schedule_size_of_at_least` matchers
+* @k1w1                               :Add support for enqueue_at_with_queue/enqueue_in_with_queue
 
 Copyright
 =========

data/lib/resque_spec/matchers.rb

@@ -104,7 +104,33 @@ RSpec::Matchers.define :have_queue_size_of_at_least do |size|
   end
 end
 
+module ScheduleQueueHelper
+  def self.extended(klass)
+    klass.instance_eval do
+      self.queue_name = nil
+      chain :queue do |queue_name|
+        self.queue_name = queue_name
+      end
+    end
+  end
+
+  private
+
+  attr_accessor :queue_name
+
+  def schedule_queue_for(actual)
+    if @queue_name
+      ResqueSpec.queue_by_name(@queue_name)
+    else
+      ResqueSpec.schedule_for(actual)
+    end
+  end
+
+end
+
 RSpec::Matchers.define :have_scheduled do |*expected_args|
+  extend ScheduleQueueHelper
+
   chain :at do |timestamp|
     @interval = nil
     @time = timestamp
@@ -118,7 +144,7 @@ RSpec::Matchers.define :have_scheduled do |*expected_args|
   end
 
   match do |actual|
-    ResqueSpec.schedule_for(actual).any? do |entry|
+    schedule_queue_for(actual).any? do |entry|
       class_matches = entry[:class].to_s == actual.to_s
       args_match = expected_args == entry[:args]
 
@@ -148,12 +174,13 @@ RSpec::Matchers.define :have_scheduled do |*expected_args|
 end
 
 RSpec::Matchers.define :have_scheduled_at do |*expected_args|
+  extend ScheduleQueueHelper
   warn "DEPRECATION WARNING: have_scheduled_at(time, *args) is deprecated and will be removed in future. Please use have_scheduled(*args).at(time) instead."
 
   match do |actual|
     time = expected_args.first
     other_args = expected_args[1..-1]
-    ResqueSpec.schedule_for(actual).any? { |entry| entry[:class].to_s == actual.to_s && entry[:time] == time && other_args == entry[:args] }
+    schedule_queue_for(actual).any? { |entry| entry[:class].to_s == actual.to_s && entry[:time] == time && other_args == entry[:args] }
   end
 
   failure_message_for_should do |actual|
@@ -170,12 +197,14 @@ RSpec::Matchers.define :have_scheduled_at do |*expected_args|
 end
 
 RSpec::Matchers.define :have_schedule_size_of do |size|
+  extend ScheduleQueueHelper
+
   match do |actual|
-    ResqueSpec.schedule_for(actual).size == size
+    schedule_queue_for(actual).size == size
   end
 
   failure_message_for_should do |actual|
-    "expected that #{actual} would have #{size} scheduled entries, but got #{ResqueSpec.schedule_for(actual).size} instead"
+    "expected that #{actual} would have #{size} scheduled entries, but got #{schedule_queue_for(actual).size} instead"
   end
 
   failure_message_for_should_not do |actual|
@@ -188,12 +217,14 @@ RSpec::Matchers.define :have_schedule_size_of do |size|
 end
 
 RSpec::Matchers.define :have_schedule_size_of_at_least do |size|
+  extend ScheduleQueueHelper
+
   match do |actual|
-    ResqueSpec.schedule_for(actual).size >= size
+    schedule_queue_for(actual).size >= size
   end
 
   failure_message_for_should do |actual|
-    "expected that #{actual} would have at least #{size} scheduled entries, but got #{ResqueSpec.schedule_for(actual).size} instead"
+    "expected that #{actual} would have at least #{size} scheduled entries, but got #{schedule_queue_for(actual).size} instead"
   end
 
   failure_message_for_should_not do |actual|
@@ -203,4 +234,4 @@ RSpec::Matchers.define :have_schedule_size_of_at_least do |size|
   description do
     "have schedule size of #{size}"
   end
-end
+end

data/lib/resque_spec/scheduler.rb

@@ -21,12 +21,24 @@ module ResqueSpec
       ResqueSpec.enqueue_at(time, klass, *args)
     end
 
+    def enqueue_at_with_queue(queue, time, klass, *args)
+      return enqueue_at_with_queue_without_resque_spec(time, klass, *args) if ResqueSpec.disable_ext && respond_to?(:enqueue_at_with_queue_without_resque_spec)
+
+      ResqueSpec.enqueue_at_with_queue(queue, time, klass, *args)
+    end
+
     def enqueue_in(time, klass, *args)
       return enqueue_in_without_resque_spec(time, klass, *args) if ResqueSpec.disable_ext && respond_to?(:enqueue_in_without_resque_spec)
 
       ResqueSpec.enqueue_in(time, klass, *args)
     end
 
+    def enqueue_in_with_queue(queue, time, klass, *args)
+      return enqueue_in_with_queue_without_resque_spec(time, klass, *args) if ResqueSpec.disable_ext && respond_to?(:enqueue_in_with_queue_without_resque_spec)
+
+      ResqueSpec.enqueue_in_with_queue(queue, time, klass, *args)
+    end
+
     def remove_delayed(klass, *args)
       return remove_delayed_without_resque_spec(klass, *args) if ResqueSpec.disable_ext && respond_to?(:remove_delayed_without_resque_spec)
 
@@ -35,14 +47,22 @@ module ResqueSpec
   end
 
   def enqueue_at(time, klass, *args)
+    enqueue_at_with_queue(schedule_queue_name(klass), time, klass, *args)
+  end
+
+  def enqueue_at_with_queue(queue, time, klass, *args)
     is_time?(time)
-    perform_or_store(schedule_queue_name(klass), :class => klass.to_s, :time  => time, :stored_at => Time.now, :args => args)
+    perform_or_store(queue, :class => klass.to_s, :time  => time, :stored_at => Time.now, :args => args)
   end
 
   def enqueue_in(time, klass, *args)
     enqueue_at(Time.now + time, klass, *args)
   end
 
+  def enqueue_in_with_queue(queue, time, klass, *args)
+    enqueue_at_with_queue(queue, Time.now + time, klass, *args)
+  end
+
   def remove_delayed(klass, *args)
     sched_queue = queue_by_name(schedule_queue_name(klass))
     count_before_remove = sched_queue.length

data/lib/resque_spec/version.rb

@@ -1,3 +1,3 @@
 module ResqueSpec
-  VERSION = "0.12.6"
+  VERSION = "0.12.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque_spec
 version: !ruby/object:Gem::Version
-  version: 0.12.6
+  version: 0.12.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-21 00:00:00.000000000 Z
+date: 2012-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque