rspec-sidekiq 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3bfc0f5fbded94f5135119b53c455ff09156e70
-  data.tar.gz: 4401a55dbbfc4da0e0fd47a0b096fe91bf78cd92
+  metadata.gz: 4e76f040dc9a72982978b86c4085e90a4efeab6f
+  data.tar.gz: 4f3531dc67714ce9f1aae2858b2e12c4baf80f2e
 SHA512:
-  metadata.gz: 226211091e343370183a1f9c4ee031431be35259315e455686bd27aa015f9e293677105a4636e48fd56c591b33d84ebb93b2bf30faa2f284651cb7455d128a90
-  data.tar.gz: c0432c59598027cf1c2647c5a7ed4259ed090c109710bd7d1230fece72e92b9c5c05f362e59bcbe3df91a9a266f768ea3e11aba23857a3ac2dbcc7d361f6dcb5
+  metadata.gz: 02c75664a4f650debe93f2a6a61d51ce5c8341c16388824f500d0d5afe75b7ab044a6606a2c3fab25649ea424f9da683da05e8ab71dd69893f54a9dc7cea5345
+  data.tar.gz: 7528d4c9f3cda76979b3118dee4069fdb86792e566e91bfd475703d2f107e5555ed1a850a0ff0e4b79b874f37b74261f2250bc28e148324555d22b31bdf4dbfd

data/CHANGES.md

@@ -1,3 +1,10 @@
+2.2.0
+---
+* Fix typo in README file [bradhaydon#87]
+* Fix type in readme [graudeejs#80]
+* Matchers::HaveEnqueuedJob breaks on jobs with Hash arguments [erikogan#77]
+* have_enqueued_job fails if args includes a Hash bug [gPrado#74]
+
 2.1.0
 ---
 * ActiveJob support [tarzan#71]

data/README.md

@@ -91,7 +91,7 @@ sidekiq_options retry: 5
 # test with...
 expect(AwesomeJob).to be_retryable true # or
 it { is_expected.to be_retryable true }
-# ...or alternatively specifiy the number of times it should be retried
+# ...or alternatively specify the number of times it should be retried
 expect(AwesomeJob).to be_retryable 5 # or
 it { is_expected.to be_retryable 5 }
 # ...or when it should not retry
@@ -136,7 +136,7 @@ it { is_expected.to_not be_expired_in 2.hours }
 ### have_enqueued_job
 *Describes that there should be an enqueued job with the specified arguments*
 ```ruby
-Awesomejob.perform_async 'Awesome', true
+AwesomeJob.perform_async 'Awesome', true
 # test with...
 expect(AwesomeJob).to have_enqueued_job('Awesome', true)
 ```

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

@@ -9,7 +9,7 @@ module RSpec
         attr_reader :klass, :expected_arguments, :actual
 
         def initialize(expected_arguments)
-          @expected_arguments = expected_arguments
+          @expected_arguments = normalize_arguments(expected_arguments)
         end
 
         def description
@@ -53,13 +53,25 @@ module RSpec
         end
 
         def job_arguments(hash)
-          hash['arguments'] || hash['args'] unless hash.is_a? Array
+          hash['arguments'] || hash['args'] if hash.is_a? Hash
         end
 
         def contain_exactly?(arguments)
           exactly = RSpec::Matchers::BuiltIn::ContainExactly.new(expected_arguments)
           exactly.matches?(arguments)
         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
+          else
+            args
+          end
+        end
       end
     end
   end

data/lib/rspec/sidekiq/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module Sidekiq
-    VERSION = '2.1.0'
+    VERSION = '2.2.0'
   end
 end

data/spec/rspec/sidekiq/matchers/have_enqueued_job_spec.rb

@@ -1,14 +1,15 @@
 require 'spec_helper'
 
 RSpec.describe RSpec::Sidekiq::Matchers::HaveEnqueuedJob do
-  let(:argument_subject) { RSpec::Sidekiq::Matchers::HaveEnqueuedJob.new ['string', 1, true] }
-  let(:matcher_subject) { RSpec::Sidekiq::Matchers::HaveEnqueuedJob.new [be_a(String), be_a(Fixnum), true] }
+  let(:argument_subject) { RSpec::Sidekiq::Matchers::HaveEnqueuedJob.new worker_args }
+  let(:matcher_subject) { RSpec::Sidekiq::Matchers::HaveEnqueuedJob.new [be_a(String), be_a(Fixnum), true, be_a(Hash)] }
   let(:worker) { create_worker }
+  let(:worker_args) { ['string', 1, true, {key: 'value', nested: [{hash: true}]}] }
   let(:active_job) { create_active_job :mailers }
   let(:resource) { TestResource.new }
 
   before(:each) do
-    worker.perform_async 'string', 1, true
+    worker.perform_async *worker_args
     active_job.perform_later 'someResource'
     active_job.perform_later(resource)
     TestActionMailer.testmail.deliver_later
@@ -18,11 +19,11 @@ RSpec.describe RSpec::Sidekiq::Matchers::HaveEnqueuedJob do
 
   describe 'expected usage' do
     it 'matches' do
-      expect(worker).to have_enqueued_job 'string', 1, true
+      expect(worker).to have_enqueued_job *worker_args
     end
 
     it 'matches on the global Worker queue' do
-      expect(Sidekiq::Worker).to have_enqueued_job 'string', 1, true
+      expect(Sidekiq::Worker).to have_enqueued_job *worker_args
     end
 
     it 'matches on an enqueued ActiveJob' do
@@ -59,13 +60,13 @@ RSpec.describe RSpec::Sidekiq::Matchers::HaveEnqueuedJob do
 
   describe '#description' do
     it 'returns description' do
-      expect(argument_subject.description).to eq "have an enqueued #{worker} job with arguments [\"string\", 1, true]"
+      expect(argument_subject.description).to eq "have an enqueued #{worker} job with arguments [\"string\", 1, true, {\"key\"=>\"value\", \"nested\"=>[{\"hash\"=>true}]}]"
     end
   end
 
   describe '#failure_message' do
     it 'returns message' do
-      expect(argument_subject.failure_message).to eq "expected to have an enqueued #{worker} job with arguments [\"string\", 1, true]\n\nfound: [[\"string\", 1, true]]"
+      expect(argument_subject.failure_message).to eq "expected to have an enqueued #{worker} job with arguments [\"string\", 1, true, {\"key\"=>\"value\", \"nested\"=>[{\"hash\"=>true}]}]\n\nfound: [[\"string\", 1, true, {\"key\"=>\"value\", \"nested\"=>[{\"hash\"=>true}]}]]"
     end
   end
 
@@ -103,7 +104,7 @@ RSpec.describe RSpec::Sidekiq::Matchers::HaveEnqueuedJob do
 
   describe '#failure_message_when_negated' do
     it 'returns message' do
-      expect(argument_subject.failure_message_when_negated).to eq "expected to not have an enqueued #{worker} job with arguments [\"string\", 1, true]"
+      expect(argument_subject.failure_message_when_negated).to eq "expected to not have an enqueued #{worker} job with arguments [\"string\", 1, true, {\"key\"=>\"value\", \"nested\"=>[{\"hash\"=>true}]}]"
     end
   end
 end

data/spec/rspec/sidekiq/version_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
 
 RSpec.describe RSpec::Sidekiq::VERSION do
-  it { is_expected.to eq('2.1.0') }
+  it { is_expected.to eq('2.2.0') }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-sidekiq
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Phil Ostler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-05 00:00:00.000000000 Z
+date: 2015-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -193,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: RSpec for Sidekiq