rspec-sidekiq_pro 1.3.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c17791f8aa93dfb4980ced725dc7469ffb056be113a035fc1586ef278116d83
-  data.tar.gz: 1aa9429f684ee980239144b919c3dc5912bac6a5bbb4c4958fd53c6a0f1f08b4
+  metadata.gz: 32a3e043a422ccb18bf8aaab5550b7ee6e106e2497d655a3b6733314628ab857
+  data.tar.gz: 4522464be86476fbbe612364071a479ad13069782cb155dc4a465e4c755f83f2
 SHA512:
-  metadata.gz: b99e17cb692da23642dc8f988f339cf419783207143bd6871f285ad30a96a34ea8a69115924c657aecc96decd48c2fda88d21ad106e90c1896bed3a797e91b00
-  data.tar.gz: 6091324c106b4472dcd44a6b17ced626d8a4431d444857505851caae2eb4e398f53ca64bb2d27d7ecd42af22002646f2cc0a93c3c0fdcf25649f85a34d3fcf18
+  metadata.gz: a158ae5fbf0c9ec357dde35da5ec22fea264c9e8d628f5fa3e963f87fc578037a1d462c8a165fa08ab11afb55b45c1695d88f25fcee4ff6d0c78cc8f4dbcd8ef
+  data.tar.gz: afa40423e976cf54ab957ffb33c41422d113123e8783fc2f867e6933409b7143c7e77856e8de3cb1a0f2aeb04a27bc9555e748304dbf978165208030e42e8b20

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2022 Savater Sebastien
+Copyright (c) 2022-2026 Savater Sebastien
 
 MIT License
 

data/README.md

@@ -14,9 +14,9 @@ bundle add rspec-sidekiq_pro --group=test
 
 ### Configuration
 
-`rspec/sidekiq_pro` requires `sidekiq/testing` by default so there is no need to include it.
-
-It also means that Sidekiq in set to `fake` mode by default. Take a look at [Sidekiq wiki](https://github.com/mperham/sidekiq/wiki/Testing) for more details.
+Sidekiq testing mode is set to `fake` by default by the gem.  
+You don't need to set it (or require `sidekiq/testing` prior to Sidekiq 8.1).  
+Take a look at [Sidekiq wiki](https://github.com/mperham/sidekiq/wiki/Testing) for more details.
 
 If you wish to start each spec without enqueued jobs or batches:
 
@@ -53,6 +53,7 @@ end
 Both matchers provide the same chainable methods:
 
 * `.with`
+* `.without_argument`
 * `.once`
 * `.twice`
 * `.exactly(n).times`
@@ -207,6 +208,12 @@ bundle exec rubocop
 bundle exec standardrb
 ```
 
+To run RSpec against various version of Sidekiq dependencies:
+```bash
+bundle exec appraisal install
+bundle exec appraisal rspec
+```
+
 All of them can be run with:
 
 ```bash

data/lib/rspec/sidekiq_pro/matchers/job_matcher.rb

@@ -8,6 +8,7 @@ module RSpec
 
         attr_reader :worker_class,
           :expected_arguments,
+          :expected_without_argument,
           :expected_interval,
           :expected_timestamp,
           :expected_schedule,
@@ -21,6 +22,8 @@ module RSpec
           :actual_jobs
 
         def with(*expected_arguments, &block)
+          raise "setting expecations with both `with` and `without_argument` is not supported" if @expected_without_argument
+
           if block
             raise ArgumentError, "setting block to `with` is not supported for this matcher" if supports_value_expectations?
             raise ArgumentError, "setting arguments and block together in `with` is not supported" if expected_arguments.any?
@@ -32,6 +35,13 @@ module RSpec
           self
         end
 
+        def without_argument
+          raise "setting expecations with both `with` and `without_argument` is not supported" if @expected_arguments
+
+          @expected_without_argument = true
+          self
+        end
+
         def in(interval)
           raise "setting expecations with both `at` and `in` is not supported" if @expected_timestamp
 
@@ -172,7 +182,9 @@ module RSpec
             description += " less than #{expected_less_count} times"
           end
 
-          if expected_arguments.is_a?(Proc)
+          if expected_without_argument
+            description += " without arguments"
+          elsif expected_arguments.is_a?(Proc)
             description += " with some arguments"
           elsif expected_arguments
             description += " with arguments #{expected_arguments}"
@@ -187,7 +199,7 @@ module RSpec
           message << "" if message.any?
           message << actual_jobs_size_in_failure_message
 
-          if expected_arguments || expected_schedule || expected_without_batch || expected_batch
+          if expected_arguments || expected_without_argument || expected_schedule || expected_without_batch || expected_batch
             message[-1] = "#{message[-1]}:"
             message += actual_jobs_details_in_failure_message
           end
@@ -213,6 +225,7 @@ module RSpec
           message << "  more than: #{expected_more_count} time(s)"  if expected_more_count
           message << "  less than: #{expected_less_count} time(s)"  if expected_less_count
           message << "  arguments: #{expected_arguments}"           if expected_arguments
+          message << "  arguments: no arguments"                    if expected_without_argument
           message << "  in:        #{expected_interval_output}"     if expected_interval
           message << "  at:        #{expected_timestamp}"           if expected_timestamp
           message << "  batch:     #{output_batch(expected_batch)}" if expected_batch
@@ -222,7 +235,8 @@ module RSpec
 
         def job_details_in_failure_message(job)
           message = []
-          message << "  arguments: #{job["args"]}"                if expected_arguments
+          message << "  arguments: #{job["args"]}"                if (expected_arguments || expected_without_argument) && job["args"].any?
+          message << "  arguments: no arguments"                  if (expected_arguments || expected_without_argument) && job["args"].empty?
           message << "  at:        #{output_schedule(job["at"])}" if expected_schedule && job["at"]
           message << "  at:        no schedule"                   if expected_schedule && !job["at"]
           message << "  batch:     #{output_batch(job["bid"])}"   if (expected_without_batch || expected_batch) && job["bid"]
@@ -274,6 +288,7 @@ module RSpec
         def filter_jobs(jobs)
           jobs.select do |job|
             next if expected_arguments && !values_match?(expected_arguments, job["args"])
+            next if expected_without_argument && job["args"].any?
             next if expected_schedule && !values_match?(expected_schedule.to_i, job["at"].to_i)
             next if expected_without_batch && job["bid"]
             next if expected_batch && !batch_match?(expected_batch, job["bid"])

data/lib/rspec/sidekiq_pro/version.rb

@@ -2,6 +2,6 @@
 
 module RSpec
   module SidekiqPro
-    VERSION = "1.3.0"
+    VERSION = "1.5.0"
   end
 end

data/lib/rspec/sidekiq_pro.rb

@@ -3,12 +3,17 @@
 require "rspec"
 require "sidekiq"
 require "sidekiq-pro"
-require "sidekiq/testing"
 require "active_support/duration"
 require "active_support/core_ext/module/delegation"
 require "rspec/sidekiq_pro/matchers"
 require "rspec/sidekiq_pro/batches"
 
+if Gem::Version.new(Sidekiq::VERSION) < "8.1"
+  require "sidekiq/testing"
+else
+  Sidekiq.testing!(:fake)
+end
+
 RSpec.configure do |config|
   config.include RSpec::SidekiqPro::Matchers
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-sidekiq_pro
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Savater Sebastien
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 4.0.3
 specification_version: 4
 summary: A collection of RSpec matchers for Sidekiq Pro
 test_files: []