Restore normalizing args (#205)

* Restore normalizing args

Handles recursively stringifying symbols in expected args

* Add symbolized args spec for enqueue_sidekiq_job

lib/rspec/sidekiq/matchers/base.rb

@@ -171,7 +171,7 @@ def initialize
         end
 
         def with(*expected_arguments)
-          @expected_arguments = expected_arguments
+          @expected_arguments = normalize_arguments(expected_arguments)
           self
         end
 
@@ -237,18 +237,17 @@ def formatted(thing)
           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

lib/rspec/sidekiq/matchers/have_enqueued_sidekiq_job.rb

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

spec/rspec/sidekiq/matchers/enqueue_sidekiq_job_spec.rb

@@ -55,6 +55,14 @@
         }.to enqueue_sidekiq_job.with("some_arg")
       end
 
+      context "when expected arguments include symbols" do
+        it "returns true" do
+          expect {
+            worker.perform_async("foo", {"some_arg" => "etc"})
+          }.to enqueue_sidekiq_job.with(:foo, {some_arg: :etc})
+        end
+      end
+
       it "fails if no job with args are found" do
         expect do
           expect {

spec/rspec/sidekiq/matchers/have_enqueued_sidekiq_job_spec.rb

@@ -33,6 +33,9 @@
           expect(worker).to have_enqueued_sidekiq_job(hash_including("something" => "Awesome"))
           expect(worker).to have_enqueued_sidekiq_job(any_args)
           expect(worker).to have_enqueued_sidekiq_job(hash_excluding("bad_stuff" => anything))
+
+          worker.perform_async({"something" => 1})
+          expect(worker).to have_enqueued_sidekiq_job({something: kind_of(Integer)})
         end
       end
 
@@ -190,6 +193,14 @@
         end
       end
 
+      context "when expected arguments include symbols" do
+        let(:worker_args) { [:foo, {bar: :baz}] }
+        it "returns true" do
+          worker.perform_async(*JSON.parse(worker_args.to_json))
+          expect(worker).to have_enqueued_sidekiq_job(*worker_args)
+        end
+      end
+
       context 'when expected are matchers' do
         it 'returns true' do
           worker.perform_async *worker_args