rspec-sidekiq 4.0.0.pre → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3320d82a82c0cbb318c7d563be5a7d4482178b8e4d4b6936e710bc88d8ce7531
-  data.tar.gz: d34d50e7d90f8e5ece3aceca122f89b51f77afb10c7c76ee19496a562151ff42
+  metadata.gz: e10d7ad26e39e70dba0ed0054c32d5edfdefd4788a06ca858c09d6a4aa90cd65
+  data.tar.gz: 050a61d6dd8720285462ff0ca3fe9d626a0f45f668f72d99d7f57d4788c77b29
 SHA512:
-  metadata.gz: b3c1a1b22cd93d5d18729365df70fcb3b8d98f5c83b5f6d2cde618eb03a425ee5164a66abf92b139c62629ab95a55b35a89a06e202699effd6e472654281d59a
-  data.tar.gz: 5c6a68c4890e8de3de64e52b7d3c6cc603c743f8980e7e7d6cebbd4ff819e7d183a617c3677bd9a924eba405c655d8e35c8a52f3e02f259a081806e5d810dfbf
+  metadata.gz: b7575bbe2397006c254cb61bce816460efc01dc7fb4434e371e3234796e4dbb12ab9e0bd9d9e769971979b060fb62852d2d54cdc1786b823f4a835467ebfcf6b
+  data.tar.gz: b2c3200a2f0dc3afd7b779564649e7c2a29b0d65a70c86d029704501ff4c9dc4180595a9520133a4568c3a956f4df713f5f382f2dd5e10f42c2095bd2b0208e6

data/CHANGES.md

@@ -1,4 +1,9 @@
-Unreleased - 4.0.0
+4.0.1
+---
+* Restore the old normalizing expected args behavior with symbols (#205)
+  * fixes an unintentional breaking change in 4.0.0
+
+4.0.0
 ---
 * [BREAKING] Dropped support for matching jobs on ActiveJob's private API args, (e.g. `_aj_globalid` and `_aj_ruby2_keywords`). `_aj_globalid` can be replaced with the object itself, e.g. `have_enqueued_sidekiq_job(user)`.
 * [BREAKING] Dropped support for Ruby 2.6
@@ -10,6 +15,7 @@ Unreleased - 4.0.0
 * Add support for builtin argument matchers from rspec mocks for
   `have_enqueued_sidekiq_job` (#200)
 * Add `#on` to `have_enqueued_sidekiq_job` to support testing queue at enqueue time (#197)
+* Add `enqueue_sidekiq_job` for block-syntax style expectations
 * Clarified `have_enqueued_sidekiq_job` error message to make it clear that the "actual arguments" list is an array of argument-lists across all enqueued jobs. (#195)
 * Fix `in` and `at` evaluation to match Sidekiq (#194)
 * Fix `be_delayed` argument matcher (#196)

data/README.md

@@ -1,6 +1,6 @@
 **Welcome @wspurgin as new maintainer for `rspec-sidekiq`!**
 
-[![RubyGems][gem_version_badge]][ruby_gems]
+[![Gem Version](https://badge.fury.io/rb/rspec-sidekiq.svg)](https://badge.fury.io/rb/rspec-sidekiq)
 [![Github Actions CI][github_actions_badge]][github_actions]
 
 Simple testing of Sidekiq jobs via a collection of matchers and helpers.
@@ -341,11 +341,7 @@ Please do! If there's a feature missing that you'd love to see then get in on th
 
 Issues/Pull Requests/Comments all welcome...
 
-[gem_version_badge]: https://badge.fury.io/rb/rspec-sidekiq.svg
 [github]: http://github.com/wspurgin/rspec-sidekiq
-[ruby_doc]: http://rubydoc.info/gems/rspec-sidekiq/frames
-[ruby_gems]: http://rubygems.org/gems/rspec-sidekiq
-[ruby_toolbox]: http://www.ruby-toolbox.com/projects/rspec-sidekiq
 [github_actions]: https://github.com/wspurgin/rspec-sidekiq/actions
 [github_actions_badge]: https://github.com/wspurgin/rspec-sidekiq/actions/workflows/main.yml/badge.svg
 

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

@@ -171,7 +171,7 @@ module RSpec
         end
 
         def with(*expected_arguments)
-          @expected_arguments = expected_arguments
+          @expected_arguments = normalize_arguments(expected_arguments)
           self
         end
 
@@ -237,18 +237,17 @@ module RSpec
           RSpec::Support::ObjectFormatter.format(thing)
         end
 
-        def jsonified_expected_arguments
-          # We would just cast-to-parse-json, but we need to support
-          # RSpec matcher args like #kind_of
-          @jsonified_expected_arguments ||= begin
-            expected_arguments.map do |arg|
-              case arg.class
-              when Symbol then arg.to_s
-              when Hash then JSON.parse(arg.to_json)
-              else
-                arg
-              end
+        def normalize_arguments(args)
+          if args.is_a?(Array)
+            args.map{ |x| normalize_arguments(x) }
+          elsif args.is_a?(Hash)
+            args.each_with_object({}) do |(key, value), hash|
+              hash[key.to_s] = normalize_arguments(value)
             end
+          elsif args.is_a?(Symbol)
+            args.to_s
+          else
+            args
           end
         end
       end

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

@@ -9,7 +9,7 @@ module RSpec
       class HaveEnqueuedSidekiqJob < Base
         def initialize(expected_arguments)
           super()
-          @expected_arguments = expected_arguments
+          @expected_arguments = normalize_arguments(expected_arguments)
         end
 
         def matches?(job_class)
@@ -17,7 +17,7 @@ module RSpec
 
           @actual_jobs = EnqueuedJobs.new(klass)
 
-          actual_jobs.includes?(jsonified_expected_arguments, expected_options)
+          actual_jobs.includes?(expected_arguments, expected_options)
         end
       end
     end

data/lib/rspec/sidekiq/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module Sidekiq
-    VERSION = "4.0.0.pre"
+    VERSION = "4.0.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-sidekiq
 version: !ruby/object:Gem::Version
-  version: 4.0.0.pre
+  version: 4.0.1
 platform: ruby
 authors:
 - Aidan Coyle
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-09 00:00:00.000000000 Z
+date: 2023-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
@@ -269,9 +269,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.3.26
 signing_key: