rspec-sidekiq 3.0.3 → 5.1.0

data/lib/rspec-sidekiq.rb

@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
+require 'forwardable'
+
 require 'sidekiq'
 require 'sidekiq/testing'
 

metadata

@@ -1,14 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: rspec-sidekiq
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 5.1.0
 platform: ruby
 authors:
+- Aidan Coyle
 - Phil Ostler
-autorequire: 
+- Will Spurgin
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-06-23 00:00:00.000000000 Z
+date: 2025-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
@@ -17,9 +19,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - ">="
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-mocks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,149 +40,215 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - ">="
+- !ruby/object:Gem::Dependency
+  name: rspec-expectations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: pry-doc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-nav
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: fuubar
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: fuubar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: actionmailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple testing of Sidekiq jobs via a collection of matchers and helpers
-email: github@philostler.com
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitattributes"
-- ".gitignore"
-- ".rspec"
-- ".simplecov"
 - CHANGES.md
-- Gemfile
 - LICENSE
 - README.md
 - lib/rspec-sidekiq.rb
@@ -178,39 +257,23 @@ files:
 - lib/rspec/sidekiq/helpers.rb
 - lib/rspec/sidekiq/helpers/within_sidekiq_retries_exhausted_block.rb
 - lib/rspec/sidekiq/matchers.rb
+- lib/rspec/sidekiq/matchers/base.rb
 - lib/rspec/sidekiq/matchers/be_delayed.rb
 - lib/rspec/sidekiq/matchers/be_expired_in.rb
 - lib/rspec/sidekiq/matchers/be_processed_in.rb
 - lib/rspec/sidekiq/matchers/be_retryable.rb
 - lib/rspec/sidekiq/matchers/be_unique.rb
-- lib/rspec/sidekiq/matchers/have_enqueued_job.rb
+- lib/rspec/sidekiq/matchers/enqueue_sidekiq_job.rb
+- lib/rspec/sidekiq/matchers/have_enqueued_sidekiq_job.rb
 - lib/rspec/sidekiq/matchers/save_backtrace.rb
 - lib/rspec/sidekiq/sidekiq.rb
 - lib/rspec/sidekiq/version.rb
-- rspec-sidekiq.gemspec
-- spec/rspec/sidekiq/batch_spec.rb
-- spec/rspec/sidekiq/helpers/retries_exhausted_spec.rb
-- spec/rspec/sidekiq/matchers/be_delayed_spec.rb
-- spec/rspec/sidekiq/matchers/be_expired_in_spec.rb
-- spec/rspec/sidekiq/matchers/be_processed_in_spec.rb
-- spec/rspec/sidekiq/matchers/be_retryable_spec.rb
-- spec/rspec/sidekiq/matchers/be_unique_spec.rb
-- spec/rspec/sidekiq/matchers/have_enqueued_job_spec.rb
-- spec/rspec/sidekiq/matchers/save_backtrace_spec.rb
-- spec/rspec/sidekiq/sidekiq_spec.rb
-- spec/spec_helper.rb
-- spec/support/factories.rb
-- spec/support/init.rb
-- spec/support/test_action_mailer.rb
-- spec/support/test_job.rb
-- spec/support/test_resource.rb
-- spec/support/test_worker.rb
-- spec/support/test_worker_alternative.rb
-homepage: http://github.com/philostler/rspec-sidekiq
+homepage: http://github.com/wspurgin/rspec-sidekiq
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  changelog_uri: https://github.com/wspurgin/rspec-sidekiq/blob/main/CHANGES.md
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -218,16 +281,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: RSpec for Sidekiq
 test_files: []

data/.gitattributes

@@ -1,22 +0,0 @@
-# Auto detect text files and perform LF normalization
-* text=auto
-
-# Custom for Visual Studio
-*.cs     diff=csharp
-*.sln    merge=union
-*.csproj merge=union
-*.vbproj merge=union
-*.fsproj merge=union
-*.dbproj merge=union
-
-# Standard to msysgit
-*.doc	 diff=astextplain
-*.DOC	 diff=astextplain
-*.docx diff=astextplain
-*.DOCX diff=astextplain
-*.dot  diff=astextplain
-*.DOT  diff=astextplain
-*.pdf  diff=astextplain
-*.PDF	 diff=astextplain
-*.rtf	 diff=astextplain
-*.RTF	 diff=astextplain

data/.gitignore

@@ -1,2 +0,0 @@
-Gemfile.lock
-tmp

data/.rspec

@@ -1,4 +0,0 @@
---colour
---tty
---format Fuubar
---format html --out tmp/spec_result/index.html

data/.simplecov

@@ -1,5 +0,0 @@
-SimpleCov.start do
-  add_filter '/spec/'
-
-  coverage_dir 'tmp/spec_coverage'
-end

data/Gemfile

@@ -1,9 +0,0 @@
-source 'https://rubygems.org'
-
-platforms :rbx do
-  gem 'rubysl', '~> 2.0'
-  gem 'psych'
-  gem 'rubinius-developer_tools'
-end
-
-gemspec

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

@@ -1,183 +0,0 @@
-module RSpec
-  module Sidekiq
-    module Matchers
-      def have_enqueued_sidekiq_job(*expected_arguments)
-        HaveEnqueuedJob.new expected_arguments
-      end
-
-      def have_enqueued_job(*expected_arguments)
-        warn "[DEPRECATION] `have_enqueued_job` is deprecated.  Please use `have_enqueued_sidekiq_job` instead."
-        have_enqueued_sidekiq_job(*expected_arguments)
-      end
-
-      class JobOptionParser
-        attr_reader :job
-
-        def initialize(job)
-          @job = job
-        end
-
-        def matches?(option, value)
-          raise ArgumentError, "Option `#{option}` is not defined." unless %w(in at).include?(option.to_s)
-          send("#{option}_evaluator", value)
-        end
-
-        private
-
-        def at_evaluator(value)
-          return false if job['at'].blank?
-          value.to_time.to_s == Time.at(job['at']).to_s
-        end
-
-        def in_evaluator(value)
-          return false if job['at'].blank?
-          (Time.now + value).to_s == Time.at(job['at']).to_s
-        end
-      end
-
-      class JobMatcher
-        attr_reader :jobs
-
-        def initialize(klass)
-          @jobs = unwrap_jobs(klass.jobs)
-        end
-
-        def present?(arguments, options)
-          !!find_job(arguments, options)
-        end
-
-        private
-
-        def matches?(job, arguments, options)
-          arguments_matches?(job, arguments) &&
-            options_matches?(job, options)
-        end
-
-        def arguments_matches?(job, arguments)
-          arguments_got = job_arguments(job)
-          contain_exactly?(arguments, arguments_got)
-        end
-
-        def options_matches?(job, options)
-          options.all? do |option, value|
-            parser = JobOptionParser.new(job)
-            parser.matches?(option, value)
-          end
-        end
-
-        def find_job(arguments, options)
-          jobs.find { |job| matches?(job, arguments, options) }
-        end
-
-        def job_arguments(job)
-          args = job['args']
-          return args[0]['arguments'] if args.is_a?(Array) && args[0].is_a?(Hash) && args[0].has_key?('arguments')
-          args
-        end
-
-        def unwrap_jobs(jobs)
-          return jobs if jobs.is_a?(Array)
-          jobs.values.flatten
-        end
-
-        def contain_exactly?(expected, got)
-          exactly = RSpec::Matchers::BuiltIn::ContainExactly.new(expected)
-          exactly.matches?(got)
-        end
-      end
-
-      class HaveEnqueuedJob
-        attr_reader :klass, :expected_arguments, :actual_arguments, :expected_options, :actual_options
-
-        def initialize(expected_arguments)
-          @expected_arguments = normalize_arguments(expected_arguments)
-          @expected_options = {}
-        end
-
-        def matches?(klass)
-          @klass = klass
-          @actual_arguments = unwrapped_job_arguments(klass.jobs)
-          @actual_options = unwrapped_job_options(klass.jobs)
-          JobMatcher.new(klass).present?(expected_arguments, expected_options)
-        end
-
-        def at(timestamp)
-          @expected_options['at'] = timestamp
-          self
-        end
-
-        def in(interval)
-          @expected_options['in'] = interval
-          self
-        end
-
-        def description
-          "have an enqueued #{klass} job with arguments #{expected_arguments}"
-        end
-
-        def failure_message
-          message = ["expected to have an enqueued #{klass} job"]
-          message << "  arguments: #{expected_arguments}" if expected_arguments
-          message << "  options: #{expected_options}" if expected_options.any?
-          message << "found"
-          message << "  arguments: #{actual_arguments}" if expected_arguments
-          message << "  options: #{actual_options}" if expected_options.any?
-          message.join("\n")
-        end
-
-        def failure_message_when_negated
-          message = ["expected not to have an enqueued #{klass} job"]
-          message << "  arguments: #{expected_arguments}" if expected_arguments.any?
-          message << "  options: #{expected_options}" if expected_options.any?
-          message.join("\n")
-        end
-
-        private
-
-        def unwrapped_job_options(jobs)
-          jobs = jobs.values if jobs.is_a?(Hash)
-          jobs.flatten.map do |job|
-            { 'at' => job['at'] }
-          end
-        end
-
-        def unwrapped_job_arguments(jobs)
-          if jobs.is_a? Hash
-            jobs.values.flatten.map do |job|
-              map_arguments(job)
-            end
-          else
-            map_arguments(jobs)
-          end.map { |job| job.flatten }
-        end
-
-        def map_arguments(job)
-          args = job_arguments(job) || job
-          if args.respond_to?(:any?) && args.any? { |e| e.is_a? Hash }
-            args.map { |a| map_arguments(a) }
-          else
-            args
-          end
-        end
-
-        def job_arguments(hash)
-          hash['arguments'] || hash['args'] if hash.is_a? Hash
-        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
-    end
-  end
-end

data/rspec-sidekiq.gemspec

@@ -1,37 +0,0 @@
-require File.expand_path('../lib/rspec/sidekiq/version', __FILE__)
-
-Gem::Specification.new do |s|
-  s.name        = 'rspec-sidekiq'
-  s.version     = RSpec::Sidekiq::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.author      = 'Phil Ostler'
-  s.email       = 'github@philostler.com'
-  s.homepage    = 'http://github.com/philostler/rspec-sidekiq'
-  s.summary     = 'RSpec for Sidekiq'
-  s.description = 'Simple testing of Sidekiq jobs via a collection of matchers and helpers'
-  s.license     = 'MIT'
-
-  s.add_dependency 'rspec-core', '~> 3.0', '>= 3.0.0'
-  s.add_dependency 'sidekiq', '>= 2.4.0'
-
-  s.add_development_dependency 'rspec', '~> 3.0'
-  s.add_development_dependency 'coveralls', '~> 0.8', '>= 0.8.0'
-  s.add_development_dependency 'fuubar', '~> 2.0', '>= 2.0.0'
-  s.add_development_dependency 'activejob', '~> 4.2', '>= 4.0.0'
-  s.add_development_dependency 'actionmailer', '~> 4.2', '>= 4.0.0'
-  s.add_development_dependency 'activerecord', '~> 4.2', '>= 4.0.0'
-
-
-  s.files = Dir['.gitattributes'] +
-            Dir['.gitignore'] +
-            Dir['.rspec'] +
-            Dir['.simplecov'] +
-            Dir['.travis'] +
-            Dir['CHANGES.md'] +
-            Dir['Gemfile'] +
-            Dir['LICENSE'] +
-            Dir['README.md'] +
-            Dir['rspec-sidekiq.gemspec'] +
-            Dir['**/*.rb']
-  s.require_paths = ['lib']
-end