resque_spec 0.12.4 → 0.12.5

data/README.md

@@ -327,26 +327,28 @@ Follow me on [Github](https://github.com/leshill) and
 Contributors
 ============
 
-* @kennethkalmer (Kenneth Kalmer)     : rspec dependency fix
-* @bcardarella   (Brian Cardarella)   : fix mutation bug
-* @joshdavey     (Joshua Davey)       : with\_resque helper
-* @supaspoida    (Lar Van Der Jagt)   : with\_resque helper
-* @evansagge     (Evan Sagge)         : Hook in via Job.create, have\_queued.in
-* @l4rk          (Jon Larkowski)      : inline perform
-* @jcf           (James Conroy-Finn)  : spec fix
-* @ess           (Dennis Walters)     : enqueue\_in support
-* @RipTheJacker                       : remove\_delayed support
-* @kwerle        (Kurt Werle)         : explicit require spec for v020
-* @dwilkie                            : initial before\_enqueue support
-* @marcinb       (Marcin Balinski)    : have\_schedule\_size\_of matcher, schedule matcher at, in
-* @alexeits                           : fix matcher in bug with RSpec 2.8.0
-* @ToadJamb                           : encode/decode of Resque job arguments
-* @mkonikowski   (Mateusz Konikowski) : support for anything matcher
-* @mathieuravaux (Mathieu Ravaux)     : without\_resque\_spec support
-* @avdgaag       (Arjan van der Gaag) : peek support
-* @dtsiknis                           : Updated removed\_delayed
-* @lellisga      (Li Ellis Gallardo)  : fix inline/disable\_ext bug
-* @jeffdeville   (Jeff Deville)       : Resque.size
+* @kennethkalmer (Kenneth Kalmer)     :rspec dependency fix
+* @bcardarella   (Brian Cardarella)   :fix mutation bug
+* @joshdavey     (Joshua Davey)       :with\_resque helper
+* @supaspoida    (Lar Van Der Jagt)   :with\_resque helper
+* @evansagge     (Evan Sagge)         :Hook in via Job.create, have\_queued.in
+* @l4rk          (Jon Larkowski)      :inline perform
+* @jcf           (James Conroy-Finn)  :spec fix
+* @ess           (Dennis Walters)     :enqueue\_in support
+* @RipTheJacker                       :remove\_delayed support
+* @kwerle        (Kurt Werle)         :explicit require spec for v020
+* @dwilkie                            :initial before\_enqueue support
+* @marcinb       (Marcin Balinski)    :have\_schedule\_size\_of matcher, schedule matcher at, in
+* @alexeits                           :fix matcher in bug with RSpec 2.8.0
+* @ToadJamb                           :encode/decode of Resque job arguments
+* @mkonikowski   (Mateusz Konikowski) :support for anything matcher
+* @mathieuravaux (Mathieu Ravaux)     :without\_resque\_spec support
+* @avdgaag       (Arjan van der Gaag) :peek support
+* @dtsiknis                           :Updated removed\_delayed
+* @lellisga      (Li Ellis Gallardo)  :fix inline/disable\_ext bug
+* @jeffdeville   (Jeff Deville)       :Resque.size
+* @opinel        (Frank Wambutt)      :Fix DST problem in `have\_scheduled`
+* @lukemelia     (Luke Melia)         :Add `times` chained matcher
 
 Copyright
 =========

data/lib/resque_spec/matchers.rb

@@ -27,20 +27,40 @@ end
 RSpec::Matchers.define :have_queued do |*expected_args|
   extend InQueueHelper
 
+  chain :times do |num_times_queued|
+    @times = num_times_queued
+    @times_info = @times == 1 ? ' once' : " #{@times} times"
+  end
+
+  chain :once do |num_times_queued|
+    @times = 1
+    @times_info = ' once'
+  end
+
   match do |actual|
-    queue(actual).any? { |entry| entry[:class].to_s == actual.to_s && expected_args == entry[:args] }
+    matched = queue(actual).select do |entry|
+      klass = entry.fetch(:class)
+      args = entry.fetch(:args)
+      klass.to_s == actual.to_s && expected_args == args
+    end
+
+    if @times
+      matched.size == @times
+    else
+      matched.size > 0
+    end
   end
 
   failure_message_for_should do |actual|
-    "expected that #{actual} would have [#{expected_args.join(', ')}] queued"
+    "expected that #{actual} would have [#{expected_args.join(', ')}] queued#{@times_info}"
   end
 
   failure_message_for_should_not do |actual|
-    "expected that #{actual} would not have [#{expected_args.join(', ')}] queued"
+    "expected that #{actual} would not have [#{expected_args.join(', ')}] queued#{@times_info}"
   end
 
   description do
-    "have queued arguments of [#{expected_args.join(', ')}]"
+    "have queued arguments of [#{expected_args.join(', ')}]#{@times_info}"
   end
 end
 
@@ -85,7 +105,7 @@ RSpec::Matchers.define :have_scheduled do |*expected_args|
       time_matches = if @time
         entry[:time] == @time
       elsif @interval
-        entry[:time].to_i == entry[:stored_at].to_i + @interval
+        entry[:time].to_i == (entry[:stored_at] + @interval).to_i
       else
         true
       end

data/lib/resque_spec/version.rb

@@ -1,3 +1,3 @@
 module ResqueSpec
-  VERSION = "0.12.4"
+  VERSION = "0.12.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque_spec
 version: !ruby/object:Gem::Version
-  version: 0.12.4
+  version: 0.12.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-20 00:00:00.000000000 Z
+date: 2012-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque