sidekiq-unique-jobs 4.0.18 → 5.0.0

data/rails_example/spec/controllers/work_controller_mock_spec.rb

@@ -0,0 +1,91 @@
+require 'rails_helper'
+
+MOCK_REDIS = MockRedis.new
+
+describe WorkController, 'with mock redis' do
+  before do
+    MOCK_REDIS.keys.each do |key|
+      MOCK_REDIS.del(key)
+    end
+
+    Sidekiq::Queues.clear_all
+    Sidekiq::Worker.clear_all
+
+    SidekiqUniqueJobs.configure do |config|
+      config.redis_test_mode = :mock
+    end
+    allow(Sidekiq).to receive(:redis).and_yield(MOCK_REDIS)
+  end
+
+  describe 'GET /work/duplicate_simple' do
+    context 'when test mode is fake', sidekiq: :fake do
+      specify do
+        expect { get :duplicate_simple, params: { id: 10 } }
+          .to change { SimpleWorker.jobs.size }
+          .from(0)
+          .to(1)
+      end
+    end
+
+    context 'when test mode is disabled', sidekiq: :disable do
+      specify do
+        get :duplicate_simple, params: { id: 11 }
+        Sidekiq.redis do |c|
+          expect(c.keys.size).to eq(2)
+          expect(c.llen('queue:default')).to eq(0)
+        end
+      end
+    end
+
+    context 'when test mode is inline', sidekiq: :inline do
+      specify do
+        get :duplicate_simple, params: { id: 12 }
+        Sidekiq.redis do |c|
+          expect(c).to be_a(MockRedis)
+          expect(c.keys.size).to eq(0)
+          expect(c.llen('queue:default')).to eq(0)
+        end
+      end
+    end
+  end
+
+  describe 'GET /work/duplicate_nested' do
+    context 'when test mode is fake', sidekiq: :fake do
+      specify do
+        expect { get :duplicate_nested, params: {  id: 20 } }
+          .to change { SpawnSimpleWorker.jobs.size }
+          .from(0)
+          .to(4)
+
+        SpawnSimpleWorker.perform_one
+        SpawnSimpleWorker.perform_one
+        expect(SpawnSimpleWorker.jobs.size).to eq(2)
+        expect(SimpleWorker.jobs.size).to eq(1)
+      end
+    end
+
+    context 'when test mode is disabled', sidekiq: :disable do
+      specify do
+        get :duplicate_nested, params: { id: 21 }
+
+        Sidekiq.redis do |c|
+          expect(c).to be_a(MockRedis)
+          expect(c.keys.size).to eq(0)
+          expect(c.llen('queue:default')).to eq(0)
+        end
+      end
+    end
+
+    context 'when test mode is inline', sidekiq: :inline do
+      specify do
+        get :duplicate_nested, params: { id: 22 }
+
+        Sidekiq.redis do |c|
+          expect(c).to be_a(MockRedis)
+          expect(c.keys.size).to eq(0)
+          expect(c.llen('queue:default')).to eq(0)
+        end
+      end
+    end
+  end
+end

data/rails_example/spec/controllers/work_controller_spec.rb

@@ -1,170 +1,75 @@
 require 'rails_helper'
 
-describe WorkController do
-  context 'with real redis' do
-    before(:each) do
-      SidekiqUniqueJobs.configure do |config|
-        config.redis_test_mode = :redis
-      end
-
-      Sidekiq::Queues.clear_all
-      Sidekiq.redis(&:flushdb)
-      Sidekiq.redis do |c|
-        c.keys.each do |key|
-          c.del(key)
-        end
-      end
+describe WorkController, 'with real redis' do
+  before(:each) do
+    SidekiqUniqueJobs.configure do |config|
+      config.redis_test_mode = :redis
     end
 
-    describe 'GET /work/duplicate_simple' do
-      context 'when test mode is fake', sidekiq: :fake do
-        specify do
-          expect { get :duplicate_simple }
-            .to change { SimpleWorker.jobs.size }
-            .from(0)
-            .to(1)
-        end
-      end
-
-      context 'when test mode is disabled', sidekiq: :disable do
-        specify do
-          get :duplicate_simple
-          Sidekiq.redis do |c|
-            expect(c.llen('queue:default')).to eq(1)
-            expect(c.keys).to include('uniquejobs:83bda9f47b05071ffcb35cbb59e1fada')
-          end
-        end
-      end
+    Sidekiq::Queues.clear_all
+    Sidekiq.redis(&:flushdb)
+  end
 
-      context 'when test mode is inline', sidekiq: :inline do
-        specify do
-          get :duplicate_simple
-          Sidekiq.redis do |c|
-            expect(c.llen('queue:default')).to eq(0)
-            expect(c.keys).not_to include('uniquejobs:83bda9f47b05071ffcb35cbb59e1fada')
-          end
-        end
+  describe 'GET /work/duplicate_simple' do
+    context 'when test mode is fake', sidekiq: :fake do
+      specify do
+        expect { get :duplicate_simple, params: { id: 40 } }
+          .to change { SimpleWorker.jobs.size }
+          .from(0)
+          .to(1)
       end
     end
 
-    describe 'GET /work/duplicate_nested' do
-      context 'when test mode is fake', sidekiq: :fake do
-        specify do
-          expect { get :duplicate_nested }
-            .to change { SpawnSimpleWorker.jobs.size }
-            .from(0)
-            .to(4)
-
-          SpawnSimpleWorker.perform_one
-          SpawnSimpleWorker.perform_one
-          expect(SpawnSimpleWorker.jobs.size).to eq(2)
-          expect(SimpleWorker.jobs.size).to eq(1)
-        end
-      end
-
-      context 'when test mode is disabled', sidekiq: :disable do
-        specify do
-          get :duplicate_nested
-
-          Sidekiq.redis do |c|
-            expect(c.llen('queue:default')).to eq(4)
-            expect(c.keys).not_to include('uniquejobs:83bda9f47b05071ffcb35cbb59e1fada')
-          end
+    context 'when test mode is disabled', sidekiq: :disable do
+      specify do
+        get :duplicate_simple, params: { id: 41 }
+        Sidekiq.redis do |c|
+          expect(c.llen('queue:default')).to eq(1)
         end
       end
+    end
 
-      context 'when test mode is inline', sidekiq: :inline do
-        specify do
-          get :duplicate_nested
-
-          Sidekiq.redis do |c|
-            expect(c.llen('queue:default')).to eq(0)
-            expect(c.keys).not_to include('uniquejobs:83bda9f47b05071ffcb35cbb59e1fada')
-          end
+    context 'when test mode is inline', sidekiq: :inline do
+      specify do
+        get :duplicate_simple, params: { id: 42 }
+        Sidekiq.redis do |c|
+          expect(c.llen('queue:default')).to eq(0)
         end
       end
     end
   end
 
-  context 'with mock_redis' do
-    before do
-      SidekiqUniqueJobs.configure do |config|
-        config.redis_test_mode = :mock
-      end
-      Sidekiq::Queues.clear_all
-      Sidekiq::Worker.clear_all
+  describe 'GET /work/duplicate_nested' do
+    context 'when test mode is fake', sidekiq: :fake do
+      specify do
+        expect { get :duplicate_nested, params: { id: 34 } }
+          .to change { SpawnSimpleWorker.jobs.size }
+          .from(0)
+          .to(4)
 
-      MOCK_REDIS.keys.each do |key|
-        MOCK_REDIS.del(key)
+        SpawnSimpleWorker.perform_one
+        SpawnSimpleWorker.perform_one
+        expect(SpawnSimpleWorker.jobs.size).to eq(2)
+        expect(SimpleWorker.jobs.size).to eq(1)
       end
-      allow(Redis).to receive(:new).and_return(MOCK_REDIS)
     end
 
-    describe 'GET /work/duplicate_simple' do
-      context 'when test mode is fake', sidekiq: :fake do
-        specify do
-          expect { get :duplicate_simple }
-            .to change { SimpleWorker.jobs.size }
-            .from(0)
-            .to(1)
-        end
-      end
-
-      context 'when test mode is disabled', sidekiq: :disable do
-        specify do
-          get :duplicate_simple
-          Sidekiq.redis do |c|
-            expect(c.llen('queue:default')).to eq(1)
-            expect(c.keys).to include('uniquejobs:83bda9f47b05071ffcb35cbb59e1fada')
-          end
-        end
-      end
+    context 'when test mode is disabled', sidekiq: :disable do
+      specify do
+        get :duplicate_nested, params: { id: 35 }
 
-      context 'when test mode is inline', sidekiq: :inline do
-        specify do
-          get :duplicate_simple
-          Sidekiq.redis do |c|
-            expect(c.llen('queue:default')).to eq(0)
-            expect(c.keys).not_to include('uniquejobs:83bda9f47b05071ffcb35cbb59e1fada')
-          end
+        Sidekiq.redis do |c|
+          expect(c.llen('queue:default')).to eq(4)
         end
       end
     end
 
-    describe 'GET /work/duplicate_nested' do
-      context 'when test mode is fake', sidekiq: :fake do
-        specify do
-          expect { get :duplicate_nested }
-            .to change { SpawnSimpleWorker.jobs.size }
-            .from(0)
-            .to(4)
-
-          SpawnSimpleWorker.perform_one
-          SpawnSimpleWorker.perform_one
-          expect(SpawnSimpleWorker.jobs.size).to eq(2)
-          expect(SimpleWorker.jobs.size).to eq(1)
-        end
-      end
-
-      context 'when test mode is disabled', sidekiq: :disable do
-        specify do
-          get :duplicate_nested
-
-          Sidekiq.redis do |c|
-            expect(c.llen('queue:default')).to eq(4)
-            expect(c.keys).not_to include('uniquejobs:83bda9f47b05071ffcb35cbb59e1fada')
-          end
-        end
-      end
-
-      context 'when test mode is inline', sidekiq: :inline do
-        specify do
-          get :duplicate_nested
+    context 'when test mode is inline', sidekiq: :inline do
+      specify do
+        get :duplicate_nested, params: { id: 36 }
 
-          Sidekiq.redis do |c|
-            expect(c.llen('queue:default')).to eq(0)
-            expect(c.keys).not_to include('uniquejobs:83bda9f47b05071ffcb35cbb59e1fada')
-          end
+        Sidekiq.redis do |c|
+          expect(c.llen('queue:default')).to eq(0)
         end
       end
     end

data/rails_example/spec/rails_helper.rb

@@ -5,14 +5,13 @@ require File.expand_path('../../config/environment', __FILE__)
 abort('The Rails environment is running in production mode!') if Rails.env.production?
 require 'spec_helper'
 require 'rspec/rails'
+require 'pry-byebug'
 require 'sidekiq_unique_jobs/testing'
 
 Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f }
 
 ActiveRecord::Migration.maintain_test_schema!
 
-MOCK_REDIS ||= MockRedis.new
-
 RSpec.configure do |config|
   config.use_transactional_fixtures = true
   config.infer_spec_type_from_file_location!

data/sidekiq-unique-jobs.gemspec

@@ -1,4 +1,5 @@
-# -*- encoding: utf-8 -*-
+# rubocop:disable Style/FileName
+
 require File.expand_path('../lib/sidekiq_unique_jobs/version', __FILE__)
 
 Gem::Specification.new do |gem|
@@ -8,18 +9,19 @@ Gem::Specification.new do |gem|
   gem.homepage      = 'https://github.com/mhenrixon/sidekiq-unique-jobs'
   gem.license       = 'WTFPL-2.0'
 
-  gem.executables   = %w(jobs)
+  gem.executables   = %w[jobs]
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- test/*`.split("\n")
   gem.name          = 'sidekiq-unique-jobs'
   gem.require_paths = ['lib']
   gem.post_install_message = 'WARNING: VERSION 4.0.0 HAS BREAKING CHANGES! Please see Readme for info'
   gem.version = SidekiqUniqueJobs::VERSION
-  gem.add_dependency 'sidekiq', '>= 2.6'
+  gem.add_dependency 'sidekiq', '>= 4.0'
   gem.add_dependency 'thor', '>= 0'
   gem.add_development_dependency 'rspec', '~> 3.1'
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'rubocop'
   gem.add_development_dependency 'timecop'
   gem.add_development_dependency 'yard'
+  gem.add_development_dependency 'gem-release'
+  gem.add_development_dependency 'codeclimate-test-reporter', '~> 1.0.0'
 end

data/spec/jobs/custom_queue_job.rb

@@ -1,6 +1,5 @@
 class CustomQueueJob
   include Sidekiq::Worker
   sidekiq_options queue: :customqueue
-  def perform(_)
-  end
+  def perform(_); end
 end

data/spec/jobs/just_a_worker.rb

@@ -3,6 +3,5 @@ class JustAWorker
 
   sidekiq_options unique: :until_executed, queue: 'testqueue'
 
-  def perform
-  end
+  def perform; end
 end

data/spec/jobs/long_running_job.rb

@@ -2,6 +2,5 @@ class LongRunningJob
   include Sidekiq::Worker
   sidekiq_options queue: :customqueue, retry: true, unique: :until_and_while_executing,
                   run_lock_expiration: 7_200, retry_count: 10
-  def perform(_one, _two)
-  end
+  def perform(_one, _two); end
 end

data/spec/jobs/main_job.rb

@@ -3,6 +3,5 @@ class MainJob
   sidekiq_options queue: :customqueue, unique: :until_executed,
                   log_duplicate_payload: true
 
-  def perform(_)
-  end
+  def perform(_); end
 end

data/spec/jobs/my_unique_job.rb

@@ -7,6 +7,5 @@ class MyUniqueJob
     unique_expiration: 7_200,
     retry_count: 10
   )
-  def perform(_one, _two)
-  end
+  def perform(_one, _two); end
 end

data/spec/jobs/plain_class.rb

@@ -1,4 +1,3 @@
 class PlainClass
-  def run(_x)
-  end
+  def run(_x); end
 end

data/spec/jobs/test_class.rb

@@ -1,4 +1,3 @@
 class TestClass
-  def self.run(_)
-  end
+  def self.run(_); end
 end

data/spec/jobs/until_and_while_executing_job.rb

@@ -3,6 +3,5 @@ class UntilAndWhileExecuting
 
   sidekiq_options queue: :working, unique: :until_and_while_executing
 
-  def perform
-  end
+  def perform; end
 end

data/spec/jobs/until_executing_job.rb

@@ -3,6 +3,5 @@ class UntilExecutingJob
 
   sidekiq_options queue: :working, unique: :until_executing
 
-  def perform
-  end
+  def perform; end
 end

data/spec/jobs/without_argument_job.rb

@@ -0,0 +1,9 @@
+class WithoutArgumentJob
+  include Sidekiq::Worker
+  sidekiq_options unique: :until_executed,
+                  log_duplicate_payload: true
+
+  def perform
+    sleep 20
+  end
+end

data/spec/lib/sidekiq_unique_jobs/client/middleware_spec.rb

@@ -10,18 +10,21 @@ RSpec.describe SidekiqUniqueJobs::Client::Middleware do
 
   describe 'with real redis' do
     before do
+      if defined?(Sidekiq::Extensions) && Sidekiq::Extensions.respond_to?(:enable_delay!)
+        Sidekiq::Extensions.enable_delay!
+      end
       Sidekiq.redis = REDIS
       Sidekiq.redis(&:flushdb)
     end
 
     describe 'when a job is already scheduled' do
-      it 'processes jobs properly', sidekiq_ver: '>= 4.0.0' do
+      it 'processes jobs properly' do
         Sidekiq::Testing.disable! do
           jid = NotifyWorker.perform_in(1, 183, 'xxxx')
           expect(jid).not_to eq(nil)
           Sidekiq.redis do |c|
             expect(c.zcard('schedule')).to eq(1)
-            expected = %w(schedule uniquejobs:6e47d668ad22db2a3ba0afd331514ce2 uniquejobs)
+            expected = %w[schedule uniquejobs:6e47d668ad22db2a3ba0afd331514ce2 uniquejobs]
             expect(c.keys).to match_array(expected)
           end
           sleep 1
@@ -39,7 +42,7 @@ RSpec.describe SidekiqUniqueJobs::Client::Middleware do
         end
       end
 
-      it 'rejects nested subsequent jobs with the same arguments', sidekiq_ver: '>= 3.5.3' do
+      it 'rejects nested subsequent jobs with the same arguments' do
         Sidekiq::Testing.disable! do
           expect(SimpleWorker.perform_async(1)).not_to eq(nil)
           expect(SimpleWorker.perform_async(1)).to eq(nil)