resque_spec 0.15.0 → 0.16.0

data/README.md

@@ -10,8 +10,8 @@ on
 
 ResqueSpec will also fire Resque hooks if you are using them. See below.
 
-The current version works with `Resque >~ v1.19` and up and `RSpec >= v2.5.0`
-(including the RSpec 3 beta).
+Version 0.16.0 works with `Resque >~ v1.19` and up and `rspec >= 3.0.0`.
+Version 0.15.0 works with `Resque >~ v1.19` and up and `rspec >= v2.5.0`
 
 Install
 -------
@@ -387,37 +387,38 @@ Follow me on [Github](https://github.com/leshill) and
 Contributors
 ============
 
-* Kenneth Kalmer     (@kennethkalmer) : rspec dependency fix
-* Brian Cardarella   (@bcardarella)   : fix mutation bug
-* Joshua Davey       (@joshdavey)     : with\_resque helper
-* Lar Van Der Jagt   (@supaspoida)    : with\_resque helper
-* Evan Sagge         (@evansagge)     : Hook in via Job.create, have\_queued.in
-* Jon Larkowski      (@l4rk)          : inline perform
-* James Conroy-Finn  (@jcf)           : spec fix
-* Dennis Walters     (@ess)           : enqueue\_in support
-*                    (@RipTheJacker)  : remove\_delayed support
-* Kurt Werle         (@kwerle)        : explicit require spec for v020
-*                    (@dwilkie)       : initial before\_enqueue support
-* Marcin Balinski    (@marcinb)       : 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
-* Mateusz Konikowski (@mkonikowski)   : support for anything matcher
-* Mathieu Ravaux     (@mathieuravaux) : without\_resque\_spec support
-* Arjan van der Gaag (@avdgaag)       : peek support
-*                    (@dtsiknis)      : Updated removed\_delayed
-* Li Ellis Gallardo  (@lellisga)      : fix inline/disable\_ext bug
-* Jeff Deville       (@jeffdeville)   : Resque.size
-* Frank Wambutt      (@opinel)        : Fix DST problem in `have_scheduled`
-* Luke Melia         (@lukemelia)     : Add `times` chained matcher
-* Pablo Fernandez    (@heelhook)      : 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
-* Ozéias Sant'ana    (@ozeias)        : Update specs to RSpec 2.10
-* Yuya Kitajima      (@yuyak)         : Add ResqueMailer examples to README
-* Andrés Bravo       (@andresbravog)  : Replace `rspec` dependency with explicit dependencies
-* Ben Woosley        (@Empact)        : Loosen rubygems version constraint
-* Jeff Dickey        (@dickeyxxx)     : Remove 2.0 warnings, added Travis
-* Earle Clubb        (@eclubb)        : `be_queued` matcher
-* Erkki Eilonen      (@erkki)         : RSpec 3 support
+* Kenneth Kalmer     (@kennethkalmer)  : rspec dependency fix
+* Brian Cardarella   (@bcardarella)    : fix mutation bug
+* Joshua Davey       (@joshdavey)      : with\_resque helper
+* Lar Van Der Jagt   (@supaspoida)     : with\_resque helper
+* Evan Sagge         (@evansagge)      : Hook in via Job.create, have\_queued.in
+* Jon Larkowski      (@l4rk)           : inline perform
+* James Conroy-Finn  (@jcf)            : spec fix
+* Dennis Walters     (@ess)            : enqueue\_in support
+*                    (@RipTheJacker)   : remove\_delayed support
+* Kurt Werle         (@kwerle)         : explicit require spec for v020
+*                    (@dwilkie)        : initial before\_enqueue support
+* Marcin Balinski    (@marcinb)        : 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
+* Mateusz Konikowski (@mkonikowski)    : support for anything matcher
+* Mathieu Ravaux     (@mathieuravaux)  : without\_resque\_spec support
+* Arjan van der Gaag (@avdgaag)        : peek support
+*                    (@dtsiknis)       : Updated removed\_delayed
+* Li Ellis Gallardo  (@lellisga)       : fix inline/disable\_ext bug
+* Jeff Deville       (@jeffdeville)    : Resque.size
+* Frank Wambutt      (@opinel)         : Fix DST problem in `have_scheduled`
+* Luke Melia         (@lukemelia)      : Add `times` chained matcher
+* Pablo Fernandez    (@heelhook)       : 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
+* Ozéias Sant'ana    (@ozeias)         : Update specs to RSpec 2.10
+* Yuya Kitajima      (@yuyak)          : Add ResqueMailer examples to README
+* Andrés Bravo       (@andresbravog)   : Replace `rspec` dependency with explicit dependencies
+* Ben Woosley        (@Empact)         : Loosen rubygems version constraint
+* Jeff Dickey        (@dickeyxxx)      : Remove 2.0 warnings, added Travis
+* Earle Clubb        (@eclubb)         : `be_queued` matcher
+* Erkki Eilonen      (@erkki)          : RSpec 3 support
+* Gavin Heavyside    (@gavinheavyside) : RSpec three warnings
 
 Copyright
 =========

data/lib/resque_spec/matchers.rb

@@ -2,7 +2,18 @@ require 'rspec/core'
 require 'rspec/expectations'
 require 'rspec/mocks'
 
+module ArgsHelper
+  private
+
+  def match_args(expected_args, args)
+    arg_list_matcher = RSpec::Mocks::ArgumentListMatcher.new(expected_args)
+    arg_list_matcher.args_match?(args)
+  end
+end
+
 module InQueueHelper
+  include ArgsHelper
+
   def self.included(klass)
     klass.class_eval do
       attr_accessor :queue_name
@@ -21,7 +32,6 @@ module InQueueHelper
       ResqueSpec.queue_for(actual)
     end
   end
-
 end
 
 RSpec::Matchers.define :be_queued do |*expected_args|
@@ -41,7 +51,7 @@ RSpec::Matchers.define :be_queued do |*expected_args|
     matched = queue(actual).select do |entry|
       klass = entry.fetch(:class)
       args = entry.fetch(:args)
-      klass.to_s == actual.to_s && expected_args == args
+      klass.to_s == actual.to_s && match_args(expected_args, args)
     end
 
     if @times
@@ -51,17 +61,18 @@ RSpec::Matchers.define :be_queued do |*expected_args|
     end
   end
 
-  failure_message_for_should do |actual|
+  failure_message do |actual|
     "expected that #{actual} would be queued with [#{expected_args.join(', ')}]#{@times_info}"
   end
 
-  failure_message_for_should_not do |actual|
+  failure_message_when_negated do |actual|
     "expected that #{actual} would not be queued with [#{expected_args.join(', ')}]#{@times_info}"
   end
 
   description do
     "be queued with arguments of [#{expected_args.join(', ')}]#{@times_info}"
   end
+
 end
 
 RSpec::Matchers.define :have_queued do |*expected_args|
@@ -81,7 +92,7 @@ RSpec::Matchers.define :have_queued do |*expected_args|
     matched = queue(actual).select do |entry|
       klass = entry.fetch(:class)
       args = entry.fetch(:args)
-      klass.to_s == actual.to_s && expected_args == args
+      klass.to_s == actual.to_s && match_args(expected_args, args)
     end
 
     if @times
@@ -91,11 +102,11 @@ RSpec::Matchers.define :have_queued do |*expected_args|
     end
   end
 
-  failure_message_for_should do |actual|
+  failure_message do |actual|
     "expected that #{actual} would have [#{expected_args.join(', ')}] queued#{@times_info}"
   end
 
-  failure_message_for_should_not do |actual|
+  failure_message_when_negated do |actual|
     "expected that #{actual} would not have [#{expected_args.join(', ')}] queued#{@times_info}"
   end
 
@@ -111,11 +122,11 @@ RSpec::Matchers.define :have_queue_size_of do |size|
     queue(actual).size == size
   end
 
-  failure_message_for_should do |actual|
+  failure_message do |actual|
     "expected that #{actual} would have #{size} entries queued, but got #{queue(actual).size} instead"
   end
 
-  failure_message_for_should_not do |actual|
+  failure_message_when_negated do |actual|
     "expected that #{actual} would not have #{size} entries queued, but got #{queue(actual).size} instead"
   end
 
@@ -131,11 +142,11 @@ RSpec::Matchers.define :have_queue_size_of_at_least do |size|
     queue(actual).size >= size
   end
 
-  failure_message_for_should do |actual|
+  failure_message do |actual|
     "expected that #{actual} would have at least #{size} entries queued, but got #{queue(actual).size} instead"
   end
 
-  failure_message_for_should_not do |actual|
+  failure_message_when_negated do |actual|
     "expected that #{actual} would not have at least #{size} entries queued, but got #{queue(actual).size} instead"
   end
 
@@ -145,6 +156,8 @@ RSpec::Matchers.define :have_queue_size_of_at_least do |size|
 end
 
 module ScheduleQueueHelper
+  include ArgsHelper
+
   def self.included(klass)
     klass.class_eval do
       attr_accessor :queue_name
@@ -184,7 +197,7 @@ RSpec::Matchers.define :have_scheduled do |*expected_args|
   match do |actual|
     schedule_queue_for(actual).any? do |entry|
       class_matches = entry[:class].to_s == actual.to_s
-      args_match = expected_args == entry[:args]
+      args_match = match_args(expected_args, entry[:args])
 
       time_matches = if @time
         entry[:time] == @time
@@ -198,11 +211,11 @@ RSpec::Matchers.define :have_scheduled do |*expected_args|
     end
   end
 
-  failure_message_for_should do |actual|
+  failure_message do |actual|
     ["expected that #{actual} would have [#{expected_args.join(', ')}] scheduled", @time_info].join(' ')
   end
 
-  failure_message_for_should_not do |actual|
+  failure_message_when_negated do |actual|
     ["expected that #{actual} would not have [#{expected_args.join(', ')}] scheduled", @time_info].join(' ')
   end
 
@@ -218,14 +231,14 @@ RSpec::Matchers.define :have_scheduled_at do |*expected_args|
   match do |actual|
     time = expected_args.first
     other_args = expected_args[1..-1]
-    schedule_queue_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 && match_args(other_args, entry[:args]) }
   end
 
-  failure_message_for_should do |actual|
+  failure_message do |actual|
     "expected that #{actual} would have [#{expected_args.join(', ')}] scheduled"
   end
 
-  failure_message_for_should_not do |actual|
+  failure_message_when_negated do |actual|
     "expected that #{actual} would not have [#{expected_args.join(', ')}] scheduled"
   end
 
@@ -241,11 +254,11 @@ RSpec::Matchers.define :have_schedule_size_of do |size|
     schedule_queue_for(actual).size == size
   end
 
-  failure_message_for_should do |actual|
+  failure_message do |actual|
     "expected that #{actual} would have #{size} scheduled entries, but got #{schedule_queue_for(actual).size} instead"
   end
 
-  failure_message_for_should_not do |actual|
+  failure_message_when_negated do |actual|
     "expected that #{actual} would have #{size} scheduled entries."
   end
 
@@ -261,11 +274,11 @@ RSpec::Matchers.define :have_schedule_size_of_at_least do |size|
     schedule_queue_for(actual).size >= size
   end
 
-  failure_message_for_should do |actual|
+  failure_message do |actual|
     "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|
+  failure_message_when_negated do |actual|
     "expected that #{actual} would have at least #{size} scheduled entries."
   end
 

data/lib/resque_spec/version.rb

@@ -1,3 +1,3 @@
 module ResqueSpec
-  VERSION = "0.15.0"
+  VERSION = "0.16.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque_spec
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-02 00:00:00.000000000 Z
+date: 2014-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: resque-scheduler
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +162,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -170,7 +170,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 3.0.0
 description: RSpec matchers for Resque
 email: leshill@gmail.com
 executables: []