resque_spec 0.17.0 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5851f97704a23a220da8bdcef78b30cba194f350
-  data.tar.gz: 05b5b1028e62a7beaf9208b066c044dc97f09d29
+SHA256:
+  metadata.gz: 38399f5b3aacdb7864ae1101449c6503fa67227a032ea86a7e3447410cedbbf5
+  data.tar.gz: 348ebcfe24c589c9c02d956d5f7e4e654384ff7d5f76cd51f4e3c98515863b33
 SHA512:
-  metadata.gz: 5914dad21263102011ea4c243958c64bde82fe1a413b88cae2145145eee6b10eac1eb7995cfe010156795e19897e062dda9dccd069cb9135b7927bf4c28117ed
-  data.tar.gz: e9b2a997a01428dd11661d88f96da48ccc9688e0abb42c810c53a3c6db794d9ab23c32fd6886a2d7ad1436a311de23a73b398addbf33e2cd29870eeb78427b47
+  metadata.gz: '0609f884100cc19e2862500a76cd7794f78ae3ec4e663ae3b0854fec63ee5e369b5571ac273130ece8f2e556df0a831f80bdb5f0517d2b488dd46ad75bc65170'
+  data.tar.gz: 6a204ca5dd6089f424ef34acbd52ac6bf5e80722bcc5d4f88ec85b64c8649f3a4d994dac578cd7779bc1a31df21436890c916e6fa9a4d3de50e7321dc0a3d16f

data/README.md

@@ -10,19 +10,6 @@ on
 
 ResqueSpec will also fire Resque hooks if you are using them. See below.
 
-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`
-
-Resque 2
-========
-
-Use the `resque_2` branch via your `Gemfile` to use with v2.0.0.pre.1+ of
-`resque`.
-
-```ruby
-gem 'resque', github: 'leshill/resque_spec', ref: 'resque_2'
-```
-
 Install
 -------
 
@@ -202,19 +189,19 @@ describe "#welcome_email" do
 
   subject { described_class }
   it { should have_queue_size_of(1) }
-  it { should have_queued(:welcome_email, user.id) }
+  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:
 
 ```ruby
-gem "resque-scheduler", :require => "resque_scheduler"
+group :test do
+  gem 'resque_spec', require: 'resque_spec/scheduler'
+end
 ```
 
 Given this scenario
@@ -476,6 +463,7 @@ Contributors
 * 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
 =========

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.17.0"
+  VERSION = "0.18.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resque_spec
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.1
 platform: ruby
 authors:
 - Les Hill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-27 00:00:00.000000000 Z
+date: 2018-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 1.26.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     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
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.3.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: RSpec matchers for Resque