rspec-enqueue_sidekiq_job 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de3c1c3128e120821b811fcfeaa8d4e5e2b5de23b4fe65ef104e3dfb6289ded9
-  data.tar.gz: e09df3e10ee5d249719525957f9880e5cf2cb8429d423d97f0db5285c85df428
+  metadata.gz: b97b2ee706f603920828b8ee122a3b47b2beb5099dd7ae95e3d5f007508c7948
+  data.tar.gz: 69e34ea50e0cdd337c5aadd9d7cc87742946d950b3fcc69045ca4b5c130e3538
 SHA512:
-  metadata.gz: 12c4b8b29f0eb0f4ffd720cee62143aa7a991a26a1b0df52c52133fbba31333706a3e0f47559ed188dbdfa39fc8629dd1eb0850ccd3131da02441327fba7929c
-  data.tar.gz: 83308d8e0298d057b116d0718623d0575c2323a3c3a29fc7a4c6e9fe7527b3b91b3a16b56c1c20c53023a6e5bff618211c4d836da5612566ca3743113b279b4c
+  metadata.gz: 3f689afe37fa8ae98e30081f0873bc735b9a4a91793597651818efb1c18378e05ceb7fa1d361663bcc9307117037067e0ec6fc7ee04036dfa5701c902c9d28c9
+  data.tar.gz: 185e782c55203982ee913571d2dfacfd645129402b602b5e6af939bd95ce7a6268606f8e15a06e7c076a1198828daba90552dfc7c9d4170693c8b5771310b7c1

data/README.md

@@ -5,7 +5,7 @@
 ```ruby
 # Gemfile
 group :test do
-  gem 'rspec-enqueue_sidekiq_job', require: 'rspec/enqueue_sidekiq_job'
+  gem 'rspec-enqueue_sidekiq_job'
 end
 ```
 

data/lib/rspec/enqueue_sidekiq_job.rb

@@ -1,9 +1,9 @@
-require 'rspec'
 require 'sidekiq/testing'
+require 'active_support/core_ext/hash/indifferent_access'
 
 module RSpec
   # An includable module that provides `enqueue_sidekiq_job` matcher
-  module EnqueuedSidekiqJob
+  module EnqueueSidekiqJob
     # Checks if a certain job was enqueued in a block.
     #
     # expect { AwesomeWorker.perform_async }
@@ -31,11 +31,14 @@ module RSpec
 
       def initialize(worker_class)
         @worker_class = worker_class
+        @expected_count = nil
       end
 
-      def with(*expected_arguments, **kwargs)
-        raise 'keyword arguments serialization is not supported by Sidekiq' unless kwargs.empty?
-
+      def with(*expected_arguments)
+        if expected_arguments.last.is_a?(Hash)
+          options = expected_arguments.pop
+          expected_arguments.push(options.with_indifferent_access)
+        end
         @expected_arguments = expected_arguments
         self
       end
@@ -54,11 +57,26 @@ module RSpec
         self
       end
 
+      def times
+        self
+      end
+
+      def exactly(times)
+        @expected_count = times
+        self
+      end
+
+      def twice
+        exactly(2).times
+      end
+
       def matches?(block)
-        filter(enqueued_in_block(block)).one?
+        filter(enqueued_in_block(block)).count == (expected_count || 1)
       end
 
       def does_not_match?(block)
+        raise 'counts are not supported with negation' if expected_count
+
         filter(enqueued_in_block(block)).none?
       end
 
@@ -67,6 +85,7 @@ module RSpec
         message << "  arguments: #{expected_arguments}" if expected_arguments
         message << "  in: #{expected_in.inspect}" if expected_in
         message << "  at: #{expected_at}" if expected_at
+        message << "  exactly #{expected_count} times" if expected_count
         message.join("\n")
       end
 
@@ -75,6 +94,7 @@ module RSpec
         message << "  arguments: #{expected_arguments}" if expected_arguments
         message << "  in: #{expected_in.inspect}" if expected_in
         message << "  at: #{expected_at}" if expected_at
+        message << "  exactly #{expected_count} times" if expected_count
         message.join("\n")
       end
 
@@ -120,7 +140,7 @@ module RSpec
         expected_in.from_now.to_i == actual_time.to_i
       end
 
-      attr_reader :worker_class, :expected_arguments, :expected_at, :expected_in
+      attr_reader :worker_class, :expected_arguments, :expected_at, :expected_in, :expected_count
     end
 
     private_constant :Matcher
@@ -128,5 +148,5 @@ module RSpec
 end
 
 RSpec.configure do |config|
-  config.include RSpec::EnqueuedSidekiqJob
+  config.include RSpec::EnqueueSidekiqJob
 end

data/lib/rspec/enqueue_sidekiq_job/version.rb

@@ -1,5 +1,5 @@
 module RSpec
-  module EnqueuedSidekiqJob
-    VERSION = '1.0.0'.freeze
+  module EnqueueSidekiqJob
+    VERSION = '1.2.0'.freeze
   end
 end

data/rspec-enqueue_sidekiq_job.gemspec

@@ -2,7 +2,7 @@ require File.expand_path('lib/rspec/enqueue_sidekiq_job/version', __dir__)
 
 Gem::Specification.new do |s|
   s.name        = 'rspec-enqueue_sidekiq_job'
-  s.version     = RSpec::EnqueuedSidekiqJob::VERSION
+  s.version     = RSpec::EnqueueSidekiqJob::VERSION
   s.platform    = Gem::Platform::RUBY
   s.author      = 'Phil Pirozhkov'
   s.email       = 'hello@fili.pp.ru'
@@ -13,15 +13,15 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.4.0'
 
+  s.add_dependency 'activesupport', '> 5.2'
   s.add_dependency 'rspec-core', '~> 3'
   s.add_dependency 'rspec-expectations', '~> 3'
-  s.add_dependency 'sidekiq', '>= 2.4.0'
+  s.add_dependency 'sidekiq', '> 3'
 
-  s.add_development_dependency 'activesupport'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rubocop'
   s.add_development_dependency 'rubocop-rspec'
 
-  s.files = %w[LICENSE README.md rspec-enqueue_sidekiq_job.gemspec] + Dir['**/*.rb']
+  s.files = %w[LICENSE README.md rspec-enqueue_sidekiq_job.gemspec] + Dir['lib/**/*.rb']
   s.require_paths = ['lib']
 end

metadata

@@ -1,31 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: rspec-enqueue_sidekiq_job
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Phil Pirozhkov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-21 00:00:00.000000000 Z
+date: 2021-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec-core
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
-  name: rspec-expectations
+  name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -39,33 +39,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
-  name: sidekiq
+  name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '3'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -119,8 +119,6 @@ files:
 - lib/rspec/enqueue_sidekiq_job.rb
 - lib/rspec/enqueue_sidekiq_job/version.rb
 - rspec-enqueue_sidekiq_job.gemspec
-- spec/rspec/enqueue_sidekiq_job_spec.rb
-- spec/spec_helper.rb
 homepage: http://github.com/pirj/rspec-enqueue_sidekiq_job
 licenses:
 - MIT

data/spec/rspec/enqueue_sidekiq_job_spec.rb

@@ -1,203 +0,0 @@
-require 'spec_helper'
-
-RSpec.describe RSpec::EnqueuedSidekiqJob do
-  let(:worker) do
-    Class.new do
-      include ::Sidekiq::Worker
-    end
-  end
-
-  let(:another_worker) do
-    Class.new do
-      include ::Sidekiq::Worker
-    end
-  end
-
-  it 'raises ArgumentError when used in value expectation', pending: 'only fails with ArgumentError on RSpec 4' do
-    expect {
-      expect(worker.perform_async).to enqueue_sidekiq_job(worker)
-    }.to raise_error(ArgumentError)
-  end
-
-  it 'fails when no worker class is specified' do
-    expect {
-      expect { worker.perform_async }.to enqueue_sidekiq_job
-    }.to raise_error(ArgumentError)
-  end
-
-  it 'passes' do
-    expect { worker.perform_async }
-      .to enqueue_sidekiq_job(worker)
-  end
-
-  it 'fails when negated and job is enqueued' do
-    expect {
-      expect { worker.perform_async }.not_to enqueue_sidekiq_job(worker)
-    }.to raise_error(/expected not to enqueue/)
-  end
-
-  context 'when no jobs were enqueued' do
-    it 'fails' do
-      expect {
-        expect {} # nop
-          .to enqueue_sidekiq_job(worker)
-      }.to raise_error(/expected to enqueue/)
-    end
-
-    it 'passes with negation' do
-      expect {} # nop
-        .not_to enqueue_sidekiq_job(worker)
-    end
-  end
-
-  context 'with another worker' do
-    it 'fails' do
-      expect {
-        expect { worker.perform_async }
-          .to enqueue_sidekiq_job(another_worker)
-      }.to raise_error(/expected to enqueue/)
-    end
-
-    it 'passes with negation' do
-      expect { worker.perform_async }
-        .not_to enqueue_sidekiq_job(another_worker)
-    end
-  end
-
-  it 'counts only jobs enqueued in block' do
-    worker.perform_async
-    expect {}.not_to enqueue_sidekiq_job(worker)
-  end
-
-  it 'counts jobs enqueued in block' do
-    worker.perform_async
-    expect { worker.perform_async }.to enqueue_sidekiq_job(worker)
-  end
-
-  it 'fails when too many jobs enqueued' do
-    expect {
-      expect {
-        worker.perform_async
-        worker.perform_async
-      }.to enqueue_sidekiq_job(worker)
-    }.to raise_error(/expected to enqueue/)
-  end
-
-  it 'fails when negated and several jobs enqueued' do
-    expect {
-      expect {
-        worker.perform_async
-        worker.perform_async
-      }.not_to enqueue_sidekiq_job(worker)
-    }.to raise_error(/expected not to enqueue/)
-  end
-
-  it 'passes with multiple jobs' do
-    expect {
-      another_worker.perform_async
-      worker.perform_async
-    }
-      .to enqueue_sidekiq_job(worker)
-      .and enqueue_sidekiq_job(another_worker)
-  end
-
-  context 'when enqueued with perform_at' do
-    it 'passes' do
-      future = 1.minute.from_now
-      expect { worker.perform_at(future) }
-        .to enqueue_sidekiq_job(worker).at(future)
-    end
-
-    it 'fails when timestamps do not match' do
-      future = 1.minute.from_now
-      expect {
-        expect { worker.perform_at(future) }
-          .to enqueue_sidekiq_job(worker).at(2.minutes.from_now)
-      }.to raise_error(/expected to enqueue.+at:/m)
-    end
-
-    it 'matches timestamps with nanosecond precision' do
-      100.times do
-        future = 1.minute.from_now
-        future = future.change(nsec: future.nsec.round(-3) + rand(999))
-        expect { worker.perform_at(future) }
-          .to enqueue_sidekiq_job(worker).at(future)
-      end
-    end
-
-    it 'accepts composable matchers' do
-      future = 1.minute.from_now
-      slightly_earlier = 58.seconds.from_now
-      expect { worker.perform_at(slightly_earlier) }
-        .to enqueue_sidekiq_job(worker).at(a_value_within(5.seconds).of(future))
-    end
-
-    it 'fails when the job was enuqued for now' do
-      expect {
-        expect { worker.perform_async }
-          .to enqueue_sidekiq_job(worker).at(1.minute.from_now)
-      }.to raise_error(/expected to enqueue.+at:/m)
-    end
-  end
-
-  context 'when enqueued with perform_in' do
-    it 'passes' do
-      interval = 1.minute
-      expect { worker.perform_in(interval) }
-        .to enqueue_sidekiq_job(worker).in(interval)
-    end
-
-    it 'fails when timestamps do not match' do
-      interval = 1.minute
-      expect {
-        expect { worker.perform_in(interval) }
-          .to enqueue_sidekiq_job(worker).in(2.minutes)
-      }.to raise_error(/expected to enqueue.+in:/m)
-    end
-
-    it 'fails when the job was enuqued for now' do
-      expect {
-        expect { worker.perform_async }
-          .to enqueue_sidekiq_job(worker).in(1.minute)
-      }.to raise_error(/expected to enqueue.+in:/m)
-    end
-  end
-
-  it 'matches when not specified at and scheduled for the future' do
-    expect { worker.perform_in(1.day) }
-      .to enqueue_sidekiq_job(worker)
-    expect { worker.perform_at(1.day.from_now) }
-      .to enqueue_sidekiq_job(worker)
-  end
-
-  context 'with arguments' do
-    it 'fails with kwargs' do
-      expect {
-        expect { worker.perform_async }
-          .to enqueue_sidekiq_job(worker).with(42, name: 'David')
-      }.to raise_error(/keyword arguments serialization is not supported by Sidekiq/)
-    end
-
-    it 'passes with provided arguments' do
-      expect { worker.perform_async(42, 'David') }
-        .to enqueue_sidekiq_job(worker).with(42, 'David')
-    end
-
-    it 'supports provided argument matchers' do
-      expect { worker.perform_async(42, 'David') }
-        .to enqueue_sidekiq_job(worker).with(be > 41, a_string_including('Dav'))
-    end
-
-    it 'passes when negated and arguments do not match' do
-      expect { worker.perform_async(42, 'David') }
-        .not_to enqueue_sidekiq_job(worker).with(11, 'Phil')
-    end
-
-    it 'fails when arguments do not match' do
-      expect {
-        expect { worker.perform_async(42, 'David') }
-          .to enqueue_sidekiq_job(worker).with(11, 'Phil')
-      }.to raise_error(/expected to enqueue.+arguments:/m)
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,4 +0,0 @@
-require 'active_support/core_ext/numeric/time'
-require 'active_support'
-require 'sidekiq'
-require 'rspec/enqueue_sidekiq_job'