resque_spec 0.15.0 → 0.18.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 38399f5b3aacdb7864ae1101449c6503fa67227a032ea86a7e3447410cedbbf5
+  data.tar.gz: 348ebcfe24c589c9c02d956d5f7e4e654384ff7d5f76cd51f4e3c98515863b33
+SHA512:
+  metadata.gz: '0609f884100cc19e2862500a76cd7794f78ae3ec4e663ae3b0854fec63ee5e369b5571ac273130ece8f2e556df0a831f80bdb5f0517d2b488dd46ad75bc65170'
+  data.tar.gz: 6a204ca5dd6089f424ef34acbd52ac6bf5e80722bcc5d4f88ec85b64c8649f3a4d994dac578cd7779bc1a31df21436890c916e6fa9a4d3de50e7321dc0a3d16f

data/README.md

@@ -10,9 +10,6 @@ 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).
-
 Install
 -------
 
@@ -21,9 +18,11 @@ using `bundler`? Do the necessary thing for your app's gem management and use
 `bundler`. `resque_spec` monkey patches `resque` it should only be used with
 your tests!)
 
-    group :test do
-      gem 'resque_spec'
-    end
+```ruby
+group :test do
+  gem 'resque_spec'
+end
+```
 
 Cucumber
 --------
@@ -32,8 +31,9 @@ By default, the above will add the `ResqueSpec` module and make it available in
 Cucumber. If you want the `with_resque` and `without_resque` helpers, manually
 require the `resque_spec/cucumber` module:
 
-    require 'resque_spec/cucumber'
-
+```ruby
+require 'resque_spec/cucumber'
+```
 This can be done in `features/support/env.rb` or in a specific support file
 such as `features/support/resque.rb`.
 
@@ -59,64 +59,72 @@ Given this scenario
 
 And I write this spec using the `resque_spec` matcher
 
-    describe "#recalculate" do
-      before do
-        ResqueSpec.reset!
-      end
-
-      it "adds person.calculate to the Person queue" do
-        person.recalculate
-        Person.should have_queued(person.id, :calculate)
-      end
-    end
+```ruby
+describe "#recalculate" do
+  before do
+    ResqueSpec.reset!
+  end
 
+  it "adds person.calculate to the Person queue" do
+    person.recalculate
+    expect(Person).to have_queued(person.id, :calculate)
+  end
+end
+```
 
 And I see that the `have_queued` assertion is asserting that the `Person` queue has a job with arguments `person.id` and `:calculate`
 
 And I take note of the `before` block that is calling `reset!` for every spec
 
 And I might use the `in` statement to specify the queue:
-
-    describe "#recalculate" do
-      before do
-        ResqueSpec.reset!
-      end
-
-      it "adds person.calculate to the Person queue" do
-        person.recalculate
-        Person.should have_queued(person.id, :calculate).in(:people)
-      end
-    end
+```ruby
+describe "#recalculate" do
+  before do
+    ResqueSpec.reset!
+  end
+
+  it "adds person.calculate to the Person queue" do
+    person.recalculate
+    expect(Person).to have_queued(person.id, :calculate).in(:people)
+  end
+end
+```
 
 And I might write this as a Cucumber step
 
-    Then /the (\w?) has (\w?) queued/ do |thing, method|
-      thing_obj = instance_variable_get("@#{thing}")
-      thing_obj.class.should have_queued(thing_obj.id, method.to_sym)
-    end
+```ruby
+Then /the (\w?) has (\w?) queued/ do |thing, method|
+  thing_obj = instance_variable_get("@#{thing}")
+  expect(thing_obj.class).to have_queued(thing_obj.id, method.to_sym)
+end
+```
 
 Then I write some code to make it pass:
 
-    class Person
-      @queue = :people
+```ruby
+class Person
+  @queue = :people
 
-      def recalculate
-        Resque.enqueue(Person, id, :calculate)
-      end
-    end
+  def recalculate
+    Resque.enqueue(Person, id, :calculate)
+  end
+end
+```
 
 You can check the size of the queue in your specs too.
 
-    describe "#recalculate" do
-      before do
-        ResqueSpec.reset!
-      end
+```ruby
+describe "#recalculate" do
+  before do
+    ResqueSpec.reset!
+  end
 
-      it "adds an entry to the Person queue" do
-        person.recalculate
-        Person.should have_queue_size_of(1)
-      end
-    end
+  it "adds an entry to the Person queue" do
+    person.recalculate
+    expect(Person).to have_queue_size_of(1)
+  end
+end
+```
 
 Turning off ResqueSpec and calling directly to Resque
 -----------------------------------------------------
@@ -125,20 +133,24 @@ Occasionally, you want to run your specs directly against Resque instead of
 ResqueSpec. For one at a time use, pass a block to the `without_resque_spec`
 helper:
 
-    describe "#recalculate" do
-      it "recalculates the persons score" do
-        without_resque_spec do
-          person.recalculate
-        end
-        ... assert recalculation after job done
-      end
+```ruby
+describe "#recalculate" do
+  it "recalculates the persons score" do
+    without_resque_spec do
+      person.recalculate
     end
+    ... assert recalculation after job done
+  end
+end
+```
 
 Or you can manage when ResqueSpec is disabled by flipping the
 `ResqueSpec.disable_ext` flag:
 
-    # disable ResqueSpec
-    ResqueSpec.disable_ext = true
+```ruby
+# disable ResqueSpec
+ResqueSpec.disable_ext = true
+```
 
 You will most likely (but not always, see the Resque docs) need to ensure that
 you have `redis` running.
@@ -150,39 +162,47 @@ To use with [ResqueMailer](https://github.com/zapnap/resque_mailer) you should
 have an initializer that does *not* exclude the `test` (or `cucumber`)
 environment. Your initializer will probably end up looking like:
 
-    # config/initializers/resque_mailer.rb
-    Resque::Mailer.excluded_environments = []
+```ruby
+# config/initializers/resque_mailer.rb
+Resque::Mailer.excluded_environments = []
+```
 
 If you have a mailer like this:
 
-    class ExampleMailer < ActionMailer::Base
-      include Resque::Mailer
+```ruby
+class ExampleMailer < ActionMailer::Base
+  include Resque::Mailer
 
-      def welcome_email(user_id)
-      end
-    end
+  def welcome_email(user_id)
+  end
+end
+```
 
 You can write a spec like this:
 
-    describe "#welcome_email" do
-      before do
-        ResqueSpec.reset!
-        Examplemailer.welcome_email(user.id).deliver
-      end
+```ruby
+describe "#welcome_email" do
+  before do
+    ResqueSpec.reset!
+    Examplemailer.welcome_email(user.id).deliver
+  end
 
-      subject { described_class }
-      it { should have_queue_size_of(1) }
-      it { should have_queued(:welcome_email, user.id) }
-    end
+  subject { described_class }
+  it { should have_queue_size_of(1) }
+  it { should have_queued(:welcome_email, [user.id]) }
+end
+```
 
 resque-scheduler with Specs
 ==========================
 
-To use with resque-scheduler, add this require `require 'resque_spec/scheduler'`
-
-*n.b.* Yes, you also need to require resque-scheduler, this works (check the docs for other ways):
+Update the Gemfile to enable the `resque-schedular` matchers:
 
-    gem "resque-scheduler", :require => "resque_scheduler"
+```ruby
+group :test do
+  gem 'resque_spec', require: 'resque_spec/scheduler'
+end
+```
 
 Given this scenario
 
@@ -192,98 +212,112 @@ Given this scenario
 
 And I write this spec using the `resque_spec` matcher
 
-    describe "#recalculate" do
-      before do
-        ResqueSpec.reset!
-      end
+```ruby
+describe "#recalculate" do
+  before do
+    ResqueSpec.reset!
+  end
 
-      it "adds person.calculate to the Person queue" do
-        person.recalculate
-        Person.should have_scheduled(person.id, :calculate)
-      end
-    end
+  it "adds person.calculate to the Person queue" do
+    person.recalculate
+    expect(Person).to have_scheduled(person.id, :calculate)
+  end
+end
+```
 
 And I might use the `at` statement to specify the time:
 
-    describe "#recalculate" do
-      before do
-        ResqueSpec.reset!
-      end
+```ruby
+describe "#recalculate" do
+  before do
+    ResqueSpec.reset!
+  end
 
-      it "adds person.calculate to the Person queue" do
-        person.recalculate
+  it "adds person.calculate to the Person queue" do
+    person.recalculate
 
-        # Is it scheduled to be executed at 2010-02-14 06:00:00 ?
-        Person.should have_scheduled(person.id, :calculate).at(Time.mktime(2010,2,14,6,0,0))
-      end
-    end
+    # Is it scheduled to be executed at 2010-02-14 06:00:00 ?
+    expect(Person).to have_scheduled(person.id, :calculate).at(Time.mktime(2010,2,14,6,0,0))
+  end
+end
+```
 
 And I might use the `in` statement to specify time interval (in seconds):
 
-    describe "#recalculate" do
-      before do
-        ResqueSpec.reset!
-      end
+```ruby
+describe "#recalculate" do
+  before do
+    ResqueSpec.reset!
+  end
 
-      it "adds person.calculate to the Person queue" do
-        person.recalculate
+  it "adds person.calculate to the Person queue" do
+    person.recalculate
 
-        # Is it scheduled to be executed in 5 minutes?
-        Person.should have_scheduled(person.id, :calculate).in(5 * 60)
-      end
-    end
+    # Is it scheduled to be executed in 5 minutes?
+    expect(Person).to have_scheduled(person.id, :calculate).in(5 * 60)
+  end
+end
+```
 
 You can also check the size of the schedule:
 
-    describe "#recalculate" do
-      before do
-        ResqueSpec.reset!
-      end
+```ruby
+describe "#recalculate" do
+  before do
+    ResqueSpec.reset!
+  end
 
-      it "adds person.calculate to the Person queue" do
-        person.recalculate
+  it "adds person.calculate to the Person queue" do
+    person.recalculate
 
-        Person.should have_schedule_size_of(1)
-      end
-    end
+    expect(Person).to have_schedule_size_of(1)
+  end
+end
+```
 
 (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
+```ruby
+describe "#recalculate_in_future" do
+  before do
+    ResqueSpec.reset!
+  end
 
-      it "adds person.calculate to the :future queue" do
-        person.recalculate_in_future
+  it "adds person.calculate to the :future queue" do
+    person.recalculate_in_future
 
-        Person.should have_schedule_size_of(1).queue(:future)
-      end
-    end
+    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|
-      thing_obj = instance_variable_get("@#{thing}")
-      thing_obj.class.should have_scheduled(thing_obj.id, method.to_sym)
-    end
+```ruby
+Then /the (\w?) has (\w?) scheduled/ do |thing, method|
+  thing_obj = instance_variable_get("@#{thing}")
+  expect(thing_obj.class).to have_scheduled(thing_obj.id, method.to_sym)
+end
+```
 
 Then I write some code to make it pass:
 
-    class Person
-      @queue = :people
+```ruby
+class Person
+  @queue = :people
 
-      def recalculate
-        Resque.enqueue_at(Time.now + 3600, Person, id, :calculate)
-      end
+  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
+  def recalculate_in_future
+    Resque.enqueue_at_with_queue(:future, Time.now + 3600, Person, id, :calculate)
+  end
+end
+```
 
 Performing Jobs in Specs
 ========================
@@ -305,27 +339,31 @@ Given this scenario
 
 I might write this as a Cucumber step
 
-    When /I score/ do
-      with_resque do
-        visit game_path
-        click_link 'Score!'
-      end
-    end
+```ruby
+When /I score/ do
+  with_resque do
+    visit game_path
+    click_link 'Score!'
+  end
+end
+```
 
 Or I write this spec using the `with_resque` helper
 
-    describe "#score!" do
-      before do
-        ResqueSpec.reset!
-      end
-
-      it "increases the score" do
-        with_resque do
-          game.score!
-        end
-        game.score.should == 10
-      end
+```ruby
+describe "#score!" do
+  before do
+    ResqueSpec.reset!
+  end
+
+  it "increases the score" do
+    with_resque do
+      game.score!
     end
+    expect(game.score).to == 10
+  end
+end
+```
 
 You can turn this behavior on by setting `ResqueSpec.inline = true`.
 
@@ -345,9 +383,11 @@ Given this scenario:
 
 I might write this as a Cucumber step
 
-    When /the (\w+) queue runs/ do |queue_name|
-      ResqueSpec.perform_all(queue_name)
-    end
+```ruby
+When /the (\w+) queue runs/ do |queue_name|
+  ResqueSpec.perform_all(queue_name)
+end
+```
 
 Hooks
 =====
@@ -387,39 +427,45 @@ 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
+* Pavel Khrulev                 (@PaulSchuher)    : Resque 2 and RSpec 3 support
+* Ilya Katz                     (@ilyakatz)       : Cleanup README.md for RSpec 3
+*                               (@addbrick)       : Compare times as integers in `have_scheduled` matcher
+* Serious Haircut               (@serioushaircut) : Fix ArgumentListMatcher to make it work with any\_args
+* Harry Lascelles               (@hlascelles)     : Fix error when resque-spec is disabled
 
 Copyright
 =========
 
-Copyright (c) 2010-2014 Les Hill. See LICENSE for details.
+Copyright (c) 2010-2015 Les Hill. See LICENSE for details.

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,59 +61,22 @@ 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|
-  include InQueueHelper
-
-  chain :times do |num_times_queued|
-    @times = num_times_queued
-    @times_info = @times == 1 ? ' once' : " #{@times} times"
-  end
-
-  chain :once do
-    @times = 1
-    @times_info = ' once'
-  end
-
-  match do |actual|
-    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#{@times_info}"
-  end
-
-  failure_message_for_should_not do |actual|
-    "expected that #{actual} would not have [#{expected_args.join(', ')}] queued#{@times_info}"
-  end
 
-  description do
-    "have queued arguments of [#{expected_args.join(', ')}]#{@times_info}"
-  end
 end
 
+RSpec::Matchers.alias_matcher :have_queued, :be_queued
+
 RSpec::Matchers.define :have_queue_size_of do |size|
   include InQueueHelper
 
@@ -111,11 +84,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 +104,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 +118,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,10 +159,10 @@ 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
+        entry[:time].to_i == @time.to_i
       elsif @interval
         entry[:time].to_i == (entry[:stored_at] + @interval).to_i
       else
@@ -198,11 +173,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 +193,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 +216,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 +236,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/scheduler.rb

@@ -1,4 +1,5 @@
 require 'resque_spec'
+require 'resque-scheduler'
 
 module ResqueSpec
   module SchedulerExt
@@ -7,6 +8,8 @@ module ResqueSpec
         klass.instance_eval do
           alias :enqueue_at_without_resque_spec :enqueue_at
           alias :enqueue_in_without_resque_spec :enqueue_in
+          alias :enqueue_at_with_queue_without_resque_spec :enqueue_at_with_queue
+          alias :enqueue_in_with_queue_without_resque_spec :enqueue_in_with_queue
           alias :remove_delayed_without_resque_spec :remove_delayed
         end
       end
@@ -22,7 +25,7 @@ module ResqueSpec
     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)
+      return enqueue_at_with_queue_without_resque_spec(queue, time, klass, *args) if ResqueSpec.disable_ext
 
       ResqueSpec.enqueue_at_with_queue(queue, time, klass, *args)
     end
@@ -34,7 +37,7 @@ module ResqueSpec
     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)
+      return enqueue_in_with_queue_without_resque_spec(queue, time, klass, *args) if ResqueSpec.disable_ext
 
       ResqueSpec.enqueue_in_with_queue(queue, time, klass, *args)
     end

data/lib/resque_spec/version.rb

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

metadata

@@ -1,216 +1,193 @@
 --- !ruby/object:Gem::Specification
 name: resque_spec
 version: !ruby/object:Gem::Version
-  version: 0.15.0
-  prerelease: 
+  version: 0.18.1
 platform: ruby
 authors:
 - Les Hill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-02 00:00:00.000000000 Z
+date: 2018-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 1.26.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 1.26.0
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     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
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     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
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     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
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.3.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-debugger
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 3.0.0
 description: RSpec matchers for Resque
 email: leshill@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- README.md
+- Rakefile
+- lib/resque_spec.rb
 - lib/resque_spec/cucumber.rb
 - lib/resque_spec/ext.rb
 - lib/resque_spec/helpers.rb
 - lib/resque_spec/matchers.rb
 - lib/resque_spec/scheduler.rb
 - lib/resque_spec/version.rb
-- lib/resque_spec.rb
-- LICENSE
-- README.md
-- Rakefile
 homepage: http://github.com/leshill/resque_spec
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.7.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: RSpec matchers for Resque
 test_files: []
-has_rdoc: