rspec-sidekiq 3.0.3 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: dd244416f99c35639675efb4b3473dd9741d512c
-  data.tar.gz: 6fa5eb3e029086fe4d316a6a9896b7acddb834de
+SHA256:
+  metadata.gz: 9521e2acad8dae8dc1c47afeb1a3f4f1052f44d2d512ae29866548f5cefdbb61
+  data.tar.gz: 4ce5c1b0a18cec884a1b023ae113f3e692afcc471c9e2dd067c762d6051a77d5
 SHA512:
-  metadata.gz: fe360471b5c79f74e4af320881d97d0d26ec0cf837a8309e8b898221d71c63bce2d2a750d32b9427dfb931dc4a83837e4c2e3e6b1ddd6a5ed17050205f7e4aa3
-  data.tar.gz: 1d0913303fbdd4c72aea0248e815d4842a5c8fe9d0a338c6cad7cf0dbd59fc7145899718d51185444c72023772605e30099326c8481345927f083c9db91df7e6
+  metadata.gz: e3501020bc4f14f5294b1cb67483c3018f608111e4c50ec74c193927e0dadf41ad7532e5c2a695f7d107cd435094eb59751ab23743f6b97a316059f8cc77ba7f
+  data.tar.gz: 79003f53fa67a71b288a2de8d35bdc65aeb123e5dedf929e8012cff2e999aadaa5f3830d9d4dc33889ff4a270adbf9b1045a81e0b7372882b577e8d9553e8e9c

data/CHANGES.md

@@ -1,3 +1,12 @@
+3.1.0
+---
+* Add support for latest ruby and Rails 5 (coding-bunny #156)
+* Support `Class#method` notation in batch callback (caalberts #155)
+* Fix bug with time comparison in delayed jobs (geeosh #153 with help from col)
+* remove usage of `Integer#blank?` (lanej #152)
+* Add `NullBatch#description` (dsantosmerino #139)
+* README updates (BenMusch #142, akihikodaki #141, wpolicarpo #160)
+
 3.0.3
 ---
 * Re-splat arguments for the have_enqueued_job alias (aprescott #136)

data/README.md

@@ -1,4 +1,4 @@
-**Welcome @wpolicarpo and @packrat386 as new maintainers for `rspec-sidekiq`!**
+**Welcome @packrat386 as new maintainer for `rspec-sidekiq`!**
 
 # RSpec for Sidekiq
 
@@ -87,7 +87,7 @@ it { is_expected.to be_processed_in :download }
 ```
 
 ### be_retryable
-*Describes if a job should retry when there is a failure in it's execution*
+*Describes if a job should retry when there is a failure in its execution*
 ```ruby
 sidekiq_options retry: 5
 # test with...
@@ -102,7 +102,7 @@ it { is_expected.to be_retryable false }
 ```
 
 ### save_backtrace
-*Describes if a job should save the error backtrace when there is a failure in it's execution*
+*Describes if a job should save the error backtrace when there is a failure in its execution*
 ```ruby
 sidekiq_options backtrace: 5
 # test with...
@@ -119,7 +119,7 @@ it { is_expected.to save_backtrace false }
 ```
 
 ### be_unique
-*Describes when a job should be unique within it's queue*
+*Describes when a job should be unique within its queue*
 ```ruby
 sidekiq_options unique: true
 # test with...
@@ -136,7 +136,7 @@ it { is_expected.to be_expired_in 1.hour }
 it { is_expected.to_not be_expired_in 2.hours }
 ```
 
-### have_enqueued__sidekiq_job
+### have_enqueued_sidekiq_job
 *Describes that there should be an enqueued job with the specified arguments*
 
 **Note:** When using rspec-rails >= 3.4, use `have_enqueued_sidekiq_job` instead to
@@ -155,9 +155,10 @@ expect(AwesomeJob).to have_enqueued_job('Awesome', true)
 #### Testing scheduled jobs
 *Use chainable matchers `#at` and `#in`*
 ```ruby
-Awesomejob.perform_at 5.minutes.from_now, 'Awesome', true
+time = 5.minutes.from_now
+Awesomejob.perform_at time, 'Awesome', true
 # test with...
-expect(AwesomeJob).to have_enqueued_sidekiq_job('Awesome', true).at(5.minutes.from_now)
+expect(AwesomeJob).to have_enqueued_sidekiq_job('Awesome', true).at(time)
 ```
 ```ruby
 Awesomejob.perform_in 5.minutes, 'Awesome', true
@@ -205,7 +206,6 @@ FooClass.within_sidekiq_retries_exhausted_block {
 ```bundle exec rspec spec```
 
 ## Maintainers
-* @wpolicarpo
 * @packrat386
 * @philostler
 

data/lib/rspec/sidekiq/batch.rb

@@ -10,6 +10,7 @@ if defined? Sidekiq::Batch
       end
 
       class NullBatch < NullObject
+        attr_accessor :description
         attr_reader :bid
 
         def initialize(bid = nil)
@@ -45,9 +46,17 @@ if defined? Sidekiq::Batch
         def join
           ::Sidekiq::Worker.drain_all
 
-          @callbacks.each do |event, callback_class, options|
+          @callbacks.each do |event, callback, options|
             if event != :success || failures == 0
-              callback_class.new.send("on_#{event}", self, options)
+              case callback
+              when Class    
+                callback.new.send("on_#{event}", self, options)
+              when String
+                klass, meth = callback.split('#')
+                klass.constantize.new.send(meth, self, options)
+              else
+                raise ArgumentError, 'Unsupported callback notation'
+              end
             end
           end
         end

data/lib/rspec/sidekiq/matchers/have_enqueued_job.rb

@@ -25,13 +25,13 @@ module RSpec
         private
 
         def at_evaluator(value)
-          return false if job['at'].blank?
-          value.to_time.to_s == Time.at(job['at']).to_s
+          return false if job['at'].to_s.empty?
+          value.to_time.to_i == Time.at(job['at']).to_i
         end
 
         def in_evaluator(value)
-          return false if job['at'].blank?
-          (Time.now + value).to_s == Time.at(job['at']).to_s
+          return false if job['at'].to_s.empty?
+          (Time.now + value).to_i == Time.at(job['at']).to_i
         end
       end
 

data/lib/rspec/sidekiq/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module Sidekiq
-    VERSION = '3.0.3'
+    VERSION = '3.1.0'
   end
 end

data/rspec-sidekiq.gemspec

@@ -14,12 +14,14 @@ Gem::Specification.new do |s|
   s.add_dependency 'rspec-core', '~> 3.0', '>= 3.0.0'
   s.add_dependency 'sidekiq', '>= 2.4.0'
 
-  s.add_development_dependency 'rspec', '~> 3.0'
-  s.add_development_dependency 'coveralls', '~> 0.8', '>= 0.8.0'
-  s.add_development_dependency 'fuubar', '~> 2.0', '>= 2.0.0'
-  s.add_development_dependency 'activejob', '~> 4.2', '>= 4.0.0'
-  s.add_development_dependency 'actionmailer', '~> 4.2', '>= 4.0.0'
-  s.add_development_dependency 'activerecord', '~> 4.2', '>= 4.0.0'
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'coveralls'
+  s.add_development_dependency 'fuubar'
+  s.add_development_dependency 'activejob'
+  s.add_development_dependency 'actionmailer'
+  s.add_development_dependency 'activerecord'
+  s.add_development_dependency 'activemodel'
+  s.add_development_dependency 'activesupport'
 
 
   s.files = Dir['.gitattributes'] +

data/spec/rspec/sidekiq/batch_spec.rb

@@ -58,12 +58,18 @@ RSpec.describe 'Batch' do
         def on_event(status, options); end
       end
 
+      class OtherCallback
+        def foo(status, options); end
+      end
+
       before(:each) do
         batch.on(:event, MyCallback, my_arg: 42)
+        batch.on(:event, 'OtherCallback#foo', my_arg: 23)
       end
 
       it 'executes callbacks' do
         expect_any_instance_of(MyCallback).to receive(:on_event).with(subject, { my_arg: 42 })
+        expect_any_instance_of(OtherCallback).to receive(:foo).with(subject, { my_arg: 23 })
         subject.join
       end
     end

data/spec/rspec/sidekiq/matchers/be_unique_spec.rb

@@ -108,7 +108,7 @@ RSpec.describe RSpec::Sidekiq::Matchers::BeUnique do
 
     context "without a uniquing solution" do
       it "raises an exception" do
-        expect{subject.unique_key}.to raise_error
+        expect{subject.unique_key}.to raise_error RuntimeError, 'No support found for Sidekiq unique jobs'
       end
     end
   end

data/spec/rspec/sidekiq/matchers/have_enqueued_job_spec.rb

@@ -4,13 +4,14 @@ RSpec.describe RSpec::Sidekiq::Matchers::HaveEnqueuedJob do
   let(:tomorrow) { DateTime.now + 1 }
   let(:interval) { 3.minutes }
   let(:argument_subject) { RSpec::Sidekiq::Matchers::HaveEnqueuedJob.new worker_args }
-  let(:matcher_subject) { RSpec::Sidekiq::Matchers::HaveEnqueuedJob.new [be_a(String), be_a(Fixnum), true, be_a(Hash)] }
+  let(:matcher_subject) { RSpec::Sidekiq::Matchers::HaveEnqueuedJob.new [be_a(String), be_a(Integer), true, be_a(Hash)] }
   let(:worker) { create_worker }
   let(:worker_args) { ['string', 1, true, { key: 'value', bar: :foo, nested: [{hash: true}] }] }
   let(:active_job) { create_active_job :mailers }
   let(:resource) { TestResource.new }
 
   before(:each) do
+    GlobalID.app = 'rspec-sidekiq'
     worker.perform_async *worker_args
     active_job.perform_later 'someResource'
     active_job.perform_later(resource)

data/spec/support/test_resource.rb

@@ -1,16 +1,10 @@
 class TestResource
   include GlobalID::Identification
 
-  attr_reader :global_id
-
-  def initialize
-    @global_id = GlobalID.create(self, { app: 'rspec-sidekiq' })
-  end
-
   def self.find(id)
   end
 
   def id
-    rand(36**10).to_s 36
+    @id ||= rand(36**10).to_s 36
   end
 end

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: rspec-sidekiq
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.1.0
 platform: ruby
 authors:
 - Phil Ostler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-23 00:00:00.000000000 Z
+date: 2020-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
@@ -48,116 +48,114 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fuubar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: actionmailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
 description: Simple testing of Sidekiq jobs via a collection of matchers and helpers
 email: github@philostler.com
 executables: []
@@ -225,8 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: RSpec for Sidekiq