rspec-sidekiq_pro 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cd253da9eb5bb4e1bbb68a9bf9c2453f200e2743120b1730f82bc9c51c346ab
-  data.tar.gz: 63e909c970b1f4d29d1334f14b721a9c12478ca02cfef5d829d5046cea1ba733
+  metadata.gz: a19307da8e27eaf43f2ec679fde1ce55961ad0f61c48b01d13b086b408af6a71
+  data.tar.gz: 50db6bdf022a1fa024e527e7a0fa65bcbf52566a6b28e603ecf5626f4ecfa94d
 SHA512:
-  metadata.gz: ec44fdba876447f815815d3f9bf510876aca1be41fe0324102fff0828285d3a9b214825c9c79966b342e42e4d109c2487052d33aa1cd99c0fff69c34253a5dc0
-  data.tar.gz: c2692d557e4d997d3c17b895b7db57ca841b729bb643bbd2e1b8dfe3af410a80f959aee8db786e81d3787d282ec2f5a04a3f9dc5ac401bacf29fee08b3352d6a
+  metadata.gz: c36f3fa7655fef1b047eb84b8148cd40a7eee3bf131d8966469f03bae2ce214e065d21c36088e00c170717eb737bf0265206d8ddaea4a0ca1cde307bf91c7aa2
+  data.tar.gz: cc0fc1156ebb0b69aa95e82c7e83f9b3079a6b80fe7a7b920f026a7300c66661f9aaee440a566de5ca91a9e7b1463bc3b2e42482fc01b73a1efa013c347f8e9e

data/README.md

@@ -55,7 +55,11 @@ Both matchers provide the same chainable methods:
 * `.with`
 * `.once`
 * `.twice`
-* `.exactly().times`
+* `.exactly(n).times`
+* `.more_than(n).times`
+* `.less_than(n).times`
+* `.at_least(n).times`
+* `.at_most(n).times`
 * `.in`
 * `.at`
 * `.within_batch`
@@ -103,6 +107,14 @@ it do
 end
 ```
 
+```ruby
+it do
+  expect {
+    10.times { SampleJob.perform_async }
+  }.to enqueue_sidekiq_job(SampleJob).more_than(5).times
+end
+```
+
 Be careful when checking both counts and arguments:
 
 ```ruby

data/lib/rspec/sidekiq_pro/batches.rb

@@ -89,7 +89,7 @@ module Sidekiq
         @bid = bid || SecureRandom.urlsafe_base64(10)
         props = RSpec::SidekiqPro::Batches::Props.fetch(bid, {})
 
-        @created_at = props.fetch("created_at", Time.now.utc).to_f
+        @created_f = @created_at = props.fetch("created_at", Time.now.utc).to_f
         @description = props["description"]
         @parent_bid = props["parent"]
         @callbacks = props.fetch("callbacks", {})

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

@@ -12,6 +12,10 @@ module RSpec
           :expected_timestamp,
           :expected_schedule,
           :expected_count,
+          :expected_least_count,
+          :expected_most_count,
+          :expected_more_count,
+          :expected_less_count,
           :expected_without_batch,
           :expected_batch,
           :actual_jobs
@@ -52,8 +56,28 @@ module RSpec
           exactly(2)
         end
 
-        def exactly(times)
-          @expected_count = times
+        def exactly(count)
+          @expected_count = count
+          self
+        end
+
+        def at_least(count)
+          @expected_least_count = count
+          self
+        end
+
+        def at_most(count)
+          @expected_most_count = count
+          self
+        end
+
+        def more_than(count)
+          @expected_more_count = count
+          self
+        end
+
+        def less_than(count)
+          @expected_less_count = count
           self
         end
 
@@ -89,6 +113,14 @@ module RSpec
 
           if expected_count
             filtered_jobs.count == expected_count
+          elsif expected_least_count
+            filtered_jobs.count >= expected_least_count
+          elsif expected_most_count
+            filtered_jobs.count <= expected_most_count
+          elsif expected_more_count
+            filtered_jobs.count > expected_more_count
+          elsif expected_less_count
+            filtered_jobs.count < expected_less_count
           else
             filtered_jobs.any?
           end
@@ -100,6 +132,14 @@ module RSpec
 
           if expected_count
             filtered_jobs.count != expected_count
+          elsif expected_least_count
+            raise ArgumentError, "ambiguous `at_least` matcher used with negative form"
+          elsif expected_most_count
+            raise ArgumentError, "ambiguous `at_most` matcher used with negative form"
+          elsif expected_more_count
+            filtered_jobs.count < expected_more_count
+          elsif expected_less_count
+            filtered_jobs.count > expected_less_count
           else
             filtered_jobs.empty?
           end
@@ -122,6 +162,14 @@ module RSpec
             description += " twice"
           elsif expected_count
             description += " #{expected_count} times"
+          elsif expected_least_count
+            description += " at least #{expected_least_count} times"
+          elsif expected_most_count
+            description += " at most #{expected_most_count} times"
+          elsif expected_more_count
+            description += " more than #{expected_more_count} times"
+          elsif expected_less_count
+            description += " less than #{expected_less_count} times"
           end
 
           if expected_arguments.is_a?(Proc)
@@ -160,6 +208,10 @@ module RSpec
         def expectations_in_failure_message
           message = []
           message << "  exactly:   #{expected_count} time(s)"       if expected_count
+          message << "  at least:  #{expected_least_count} time(s)" if expected_least_count
+          message << "  at most:   #{expected_most_count} time(s)"  if expected_most_count
+          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 << "  in:        #{expected_interval_output}"     if expected_interval
           message << "  at:        #{expected_timestamp}"           if expected_timestamp

data/lib/rspec/sidekiq_pro/matchers.rb

@@ -18,13 +18,11 @@ module RSpec
       # expect(AwesomeWorker).to have_enqueued_sidekiq_job.in(5.minutes)
       #
       def have_enqueued_sidekiq_job
-        HaveEnqueuedSidekiqJobs.new.once
-      end
-
-      def have_enqueued_sidekiq_jobs
         HaveEnqueuedSidekiqJobs.new
       end
 
+      alias_method :have_enqueued_sidekiq_jobs, :have_enqueued_sidekiq_job
+
       # Checks if a certain job was enqueued in a block.
       #
       # expect { AwesomeWorker.perform_async }
@@ -37,12 +35,10 @@ module RSpec
       #   .to enqueue_sidekiq_job(AwesomeWorker).in(5.minutes)
       #
       def enqueue_sidekiq_job(worker_class)
-        EnqueueSidekiqJobs.new(worker_class).once
-      end
-
-      def enqueue_sidekiq_jobs(worker_class)
         EnqueueSidekiqJobs.new(worker_class)
       end
+
+      alias_method :enqueue_sidekiq_jobs, :enqueue_sidekiq_job
     end
   end
 end

data/lib/rspec/sidekiq_pro/version.rb

@@ -2,6 +2,6 @@
 
 module RSpec
   module SidekiqPro
-    VERSION = "1.1.0"
+    VERSION = "1.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-sidekiq_pro
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Savater Sebastien
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-16 00:00:00.000000000 Z
+date: 2023-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -98,7 +98,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
-description:
+description: A collection of RSpec matchers for Sidekiq Pro
 email: github.60k5k@simplelogin.co
 executables: []
 extensions: []
@@ -132,8 +132,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
-summary: A collection of tools and matchers for Sidekiq Pro
+summary: A collection of RSpec matchers for Sidekiq Pro
 test_files: []