rspec-sidekiq 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ba307301b01ff432ddf0af3a8cbb8ec6e964841
-  data.tar.gz: 63c7be8e00350bbf61a3c33827d882cba90c13f3
+  metadata.gz: e6649639a5e74b4ef9f3693f45a01fb739e335c9
+  data.tar.gz: 2dc425b4dff7f7426a8273827f99649c02dffc5d
 SHA512:
-  metadata.gz: cfd1b9391aed34b66dfda591a88c95a6bfc0d5a06050bcef9bdca11d8d3a6fb2f99a68cd1a2040f180d9bbce41c01135343a1920db47d59e58864c8259de6fa8
-  data.tar.gz: 6b3ec3ca8c7caab2cbe270600f7b5312b039f7a213453630ab2c590854e102c8a9b9f611d6ff8d8fb11e8b36285c638591e6ff82fc5fcad2b1e6cf4162be2e1b
+  metadata.gz: 8d5049aa45f152d9a0800db686c9a5a40cc01aec66a9e60c97d2ce9cde572aa62b45270f767b4e7a5834067f01890ae428149b1ae4e66c13e456842d2c9c9b53
+  data.tar.gz: 4128b29a64d24c20532f35f9944c4c873f681e94b84c2a0b958a2ece53adf0ce28e7164a63f6738c7ac0a6bf3c52898ef0fffaaeb4d5106e566d2b87a4c8b9fa

data/README.md

@@ -52,7 +52,7 @@ end
 * [be_processed_in](#be_processed_in)
 * [be_retryable](#be_retryable)
 * [be_unique](#be_unique)
-* [have_enqueued_job](#have_enqueued_job)
+* [have_enqueued_sidekiq_job](#have_enqueued_sidekiq_job)
 
 ### be_delayed
 *Describes a method that should be invoked asynchronously (See [Sidekiq Delayed Extensions][sidekiq_wiki_delayed_extensions])*
@@ -136,11 +136,19 @@ it { is_expected.to be_expired_in 1.hour }
 it { is_expected.to_not be_expired_in 2.hours }
 ```
 
-### have_enqueued_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
+prevent a name clash with rspec-rails' ActiveJob matcher.
+
 ```ruby
 AwesomeJob.perform_async 'Awesome', true
 # test with...
+expect(AwesomeJob).to have_enqueued_sidekiq_job('Awesome', true)
+
+# Code written with older versions of the gem may use the deprecated
+# have_enqueued_job matcher.
 expect(AwesomeJob).to have_enqueued_job('Awesome', true)
 ```
 
@@ -149,12 +157,12 @@ expect(AwesomeJob).to have_enqueued_job('Awesome', true)
 ```ruby
 Awesomejob.perform_at 5.minutes.from_now, 'Awesome', true
 # test with...
-expect(AwesomeJob).to have_enqueued_job('Awesome', true).at(5.minutes.from_now)
+expect(AwesomeJob).to have_enqueued_sidekiq_job('Awesome', true).at(5.minutes.from_now)
 ```
 ```ruby
 Awesomejob.perform_in 5.minutes, 'Awesome', true
 # test with...
-expect(AwesomeJob).to have_enqueued_job('Awesome', true).in(5.minutes)
+expect(AwesomeJob).to have_enqueued_sidekiq_job('Awesome', true).in(5.minutes)
 ```
 
 ## Example matcher usage
@@ -170,7 +178,7 @@ describe AwesomeJob do
   it 'enqueues another awesome job' do
     subject.perform
 
-    expect(AnotherAwesomeJob).to have_enqueued_job('Awesome', true)
+    expect(AnotherAwesomeJob).to have_enqueued_sidekiq_job('Awesome', true)
   end
 end
 ```

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

@@ -11,7 +11,7 @@ module RSpec
         end
 
         def description
-          if @expected_retry.is_a?(Fixnum)
+          if @expected_retry.is_a?(Numeric)
             "retry #{@expected_retry} times"    # retry: 5
           elsif @expected_retry
             'retry the default number of times' # retry: true

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

@@ -1,13 +1,13 @@
 module RSpec
   module Sidekiq
     module Matchers
-      def have_enqueued_job(*expected_arguments)
+      def have_enqueued_sidekiq_job(*expected_arguments)
         HaveEnqueuedJob.new expected_arguments
       end
 
-      if Gem::Dependency.new('rspec-rails', '>= 3.4.0').matching_specs.max_by(&:version)
+      def have_enqueued_job(*expected_arguments)
         warn "[DEPRECATION] `have_enqueued_job` is deprecated.  Please use `have_enqueued_sidekiq_job` instead."
-        alias have_enqueued_sidekiq_job have_enqueued_job
+        have_enqueued_sidekiq_job(expected_arguments)
       end
 
       class JobOptionParser

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

@@ -11,7 +11,7 @@ module RSpec
         end
 
         def description
-          if @expected_backtrace.is_a?(Fixnum)
+          if @expected_backtrace.is_a?(Numeric)
             "save #{@expected_backtrace} lines of error backtrace" # backtrace: 5
           elsif @expected_backtrace
             'save error backtrace' # backtrace: true

data/lib/rspec/sidekiq/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module Sidekiq
-    VERSION = '3.0.1'
+    VERSION = '3.0.2'
   end
 end

data/rspec-sidekiq.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   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.files = Dir['.gitattributes'] +

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

@@ -21,11 +21,11 @@ RSpec.describe RSpec::Sidekiq::Matchers::HaveEnqueuedJob do
   describe 'expected usage' do
     context 'Sidekiq' do
       it 'matches' do
-        expect(worker).to have_enqueued_job *worker_args
+        expect(worker).to have_enqueued_sidekiq_job *worker_args
       end
 
       it 'matches on the global Worker queue' do
-        expect(Sidekiq::Worker).to have_enqueued_job *worker_args
+        expect(Sidekiq::Worker).to have_enqueued_sidekiq_job *worker_args
       end
 
       context 'perform_in' do
@@ -36,7 +36,7 @@ RSpec.describe RSpec::Sidekiq::Matchers::HaveEnqueuedJob do
         end
 
         it 'matches on an scheduled job with #perform_in' do
-          expect(worker).to have_enqueued_job(*worker_args_in).in(interval)
+          expect(worker).to have_enqueued_sidekiq_job(*worker_args_in).in(interval)
         end
       end
 
@@ -48,24 +48,24 @@ RSpec.describe RSpec::Sidekiq::Matchers::HaveEnqueuedJob do
         end
 
         it 'matches on an scheduled job with #perform_at' do
-          expect(worker).to have_enqueued_job(*worker_args_at).at(tomorrow)
+          expect(worker).to have_enqueued_sidekiq_job(*worker_args_at).at(tomorrow)
         end
       end
     end
 
     context 'ActiveJob' do
       it 'matches on an enqueued ActiveJob' do
-        expect(Sidekiq::Worker).to have_enqueued_job 'someResource'
+        expect(Sidekiq::Worker).to have_enqueued_sidekiq_job 'someResource'
       end
 
       it 'matches on an enqueued ActiveJob by global_id' do
-        expect(Sidekiq::Worker).to have_enqueued_job('_aj_globalid' => resource.to_global_id.uri.to_s)
+        expect(Sidekiq::Worker).to have_enqueued_sidekiq_job('_aj_globalid' => resource.to_global_id.uri.to_s)
       end
     end
 
     context 'ActionMailer' do
       it 'matches on ActionMailer Job' do
-        expect(Sidekiq::Worker).to have_enqueued_job(
+        expect(Sidekiq::Worker).to have_enqueued_sidekiq_job(
           'TestActionMailer',
           'testmail',
           'deliver_now'
@@ -73,7 +73,7 @@ RSpec.describe RSpec::Sidekiq::Matchers::HaveEnqueuedJob do
       end
 
       it 'matches on ActionMailer with a resource Job' do
-        expect(Sidekiq::Worker).to have_enqueued_job(
+        expect(Sidekiq::Worker).to have_enqueued_sidekiq_job(
           'TestActionMailer',
           'testmail',
           'deliver_now',
@@ -83,10 +83,20 @@ RSpec.describe RSpec::Sidekiq::Matchers::HaveEnqueuedJob do
     end
   end
 
+  describe '#have_enqueued_sidekiq_job' do
+    it 'returns instance' do
+      expect(have_enqueued_sidekiq_job).to be_a RSpec::Sidekiq::Matchers::HaveEnqueuedJob
+    end
+  end
+
   describe '#have_enqueued_job' do
     it 'returns instance' do
       expect(have_enqueued_job).to be_a RSpec::Sidekiq::Matchers::HaveEnqueuedJob
     end
+
+    it 'provides deprecation warning' do
+      expect { have_enqueued_job }.to output(/[DEPRECATION]/).to_stderr
+    end
   end
 
   describe '#description' do

data/spec/spec_helper.rb

@@ -9,10 +9,9 @@ require 'action_mailer'
 
 require_relative 'support/init'
 
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-  Coveralls::SimpleCov::Formatter,
-  SimpleCov::Formatter::HTMLFormatter
-]
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new(
+  [Coveralls::SimpleCov::Formatter, SimpleCov::Formatter::HTMLFormatter]
+)
 SimpleCov.start
 
 RSpec.configure do |config|
@@ -22,3 +21,9 @@ RSpec.configure do |config|
 end
 
 ActiveJob::Base.queue_adapter = :sidekiq
+
+if Gem::Dependency.new('sidekiq', '>= 5.0.0').matching_specs.any?
+  require 'active_record'
+  ActiveSupport.run_load_hooks(:active_record, ActiveRecord::Base)
+  Sidekiq::Extensions.enable_delay!
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-sidekiq
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Phil Ostler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-10 00:00:00.000000000 Z
+date: 2017-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
@@ -138,6 +138,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.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
 description: Simple testing of Sidekiq jobs via a collection of matchers and helpers
 email: github@philostler.com
 executables: []
@@ -178,7 +198,6 @@ files:
 - spec/rspec/sidekiq/matchers/have_enqueued_job_spec.rb
 - spec/rspec/sidekiq/matchers/save_backtrace_spec.rb
 - spec/rspec/sidekiq/sidekiq_spec.rb
-- spec/rspec/sidekiq/version_spec.rb
 - spec/spec_helper.rb
 - spec/support/factories.rb
 - spec/support/init.rb

data/spec/rspec/sidekiq/version_spec.rb

@@ -1,5 +0,0 @@
-require 'spec_helper'
-
-RSpec.describe RSpec::Sidekiq::VERSION do
-  it { is_expected.to eq('3.0.1') }
-end