shoryuken 6.2.1 → 7.0.2

data/spec/lib/shoryuken/worker_registry_spec.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Shoryuken::WorkerRegistry do
+  subject { described_class.new }
+
+  describe '#batch_receive_messages?' do
+    it 'raises NotImplementedError' do
+      expect { subject.batch_receive_messages?('test-queue') }.to raise_error(NotImplementedError)
+    end
+  end
+
+  describe '#clear' do
+    it 'raises NotImplementedError' do
+      expect { subject.clear }.to raise_error(NotImplementedError)
+    end
+  end
+
+  describe '#fetch_worker' do
+    it 'raises NotImplementedError' do
+      queue = 'test-queue'
+      message = double('message')
+      expect { subject.fetch_worker(queue, message) }.to raise_error(NotImplementedError)
+    end
+  end
+
+  describe '#queues' do
+    it 'raises NotImplementedError' do
+      expect { subject.queues }.to raise_error(NotImplementedError)
+    end
+  end
+
+  describe '#register_worker' do
+    it 'raises NotImplementedError' do
+      queue = 'test-queue'
+      worker_class = Class.new
+      expect { subject.register_worker(queue, worker_class) }.to raise_error(NotImplementedError)
+    end
+  end
+
+  describe '#workers' do
+    it 'raises NotImplementedError' do
+      expect { subject.workers('test-queue') }.to raise_error(NotImplementedError)
+    end
+  end
+
+  context 'interface documentation' do
+    it 'defines the required interface methods' do
+      expect(subject).to respond_to(:batch_receive_messages?)
+      expect(subject).to respond_to(:clear)
+      expect(subject).to respond_to(:fetch_worker)
+      expect(subject).to respond_to(:queues)
+      expect(subject).to respond_to(:register_worker)
+      expect(subject).to respond_to(:workers)
+    end
+
+    it 'is designed to be subclassed' do
+      expect(described_class).to be < Object
+      expect(described_class.ancestors).to include(described_class)
+    end
+  end
+end

data/spec/{shoryuken → lib/shoryuken}/worker_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+# frozen_string_literal: true
 
 RSpec.describe Shoryuken::Worker do
   let(:sqs_queue) { double 'SQS Queue' }
@@ -108,14 +108,16 @@ RSpec.describe Shoryuken::Worker do
   end
 
   describe '.server_middleware' do
-    before do
-      class FakeMiddleware
+    let(:fake_middleware_class) do
+      Class.new do
         def call(*_args)
           yield
         end
       end
     end
 
+    before { fake_middleware_class }
+
     context 'no middleware is defined in the worker' do
       it 'returns the list of global middlewares' do
         expect(TestWorker.server_middleware).to satisfy do |chain|
@@ -147,27 +149,29 @@ RSpec.describe Shoryuken::Worker do
     end
 
     context 'the worker modifies the chain' do
-      before do
-        class NewTestWorker3
+      let(:new_test_worker3_class) do
+        ref = fake_middleware_class
+
+        Class.new do
           include Shoryuken::Worker
 
           server_middleware do |chain|
             chain.remove Shoryuken::Middleware::Server::Timing
-            chain.insert_before Shoryuken::Middleware::Server::AutoDelete, FakeMiddleware
+            chain.insert_before Shoryuken::Middleware::Server::AutoDelete, ref
           end
         end
       end
 
       it 'returns the combined global and worker middlewares' do
-        expect(NewTestWorker3.server_middleware).not_to satisfy do |chain|
+        expect(new_test_worker3_class.server_middleware).not_to satisfy do |chain|
           chain.exists?(Shoryuken::Middleware::Server::Timing)
         end
 
-        expect(NewTestWorker3.server_middleware).to satisfy do |chain|
-          chain.exists?(FakeMiddleware)
+        expect(new_test_worker3_class.server_middleware).to satisfy do |chain|
+          chain.exists?(fake_middleware_class)
         end
 
-        expect(NewTestWorker3.server_middleware).to satisfy do |chain|
+        expect(new_test_worker3_class.server_middleware).to satisfy do |chain|
           chain.exists?(Shoryuken::Middleware::Server::AutoDelete)
         end
       end
@@ -182,7 +186,7 @@ RSpec.describe Shoryuken::Worker do
         end
 
         expect(Shoryuken.server_middleware).not_to satisfy do |chain|
-          chain.exists?(FakeMiddleware)
+          chain.exists?(fake_middleware_class)
         end
       end
     end

data/spec/{shoryuken_spec.rb → lib/shoryuken_spec.rb}

@@ -1,4 +1,4 @@
-require 'spec_helper'
+# frozen_string_literal: true
 
 RSpec.describe Shoryuken do
   describe '.healthy?' do

data/spec/shared_examples_for_active_job.rb

@@ -1,5 +1,5 @@
 require 'active_job'
-require 'shoryuken/extensions/active_job_extensions'
+require 'active_job/extensions'
 
 # Stand-in for a job class specified by the user
 class TestJob < ActiveJob::Base; end
@@ -23,11 +23,11 @@ RSpec.shared_examples 'active_job_adapters' do
     specify do
       expect(queue).to receive(:send_message) do |hash|
         expect(hash[:message_deduplication_id]).to_not be
-        expect(hash[:message_attributes]['shoryuken_class'][:string_value]).to eq(described_class::JobWrapper.to_s)
-        expect(hash[:message_attributes]['shoryuken_class'][:data_type]).to eq("String")
+        expect(hash[:message_attributes]['shoryuken_class'][:string_value]).to eq(Shoryuken::ActiveJob::JobWrapper.to_s)
+        expect(hash[:message_attributes]['shoryuken_class'][:data_type]).to eq('String')
         expect(hash[:message_attributes].keys).to eq(['shoryuken_class'])
       end
-      expect(Shoryuken).to receive(:register_worker).with(job.queue_name, described_class::JobWrapper)
+      expect(Shoryuken).to receive(:register_worker).with(job.queue_name, Shoryuken::ActiveJob::JobWrapper)
 
       subject.enqueue(job)
     end
@@ -50,7 +50,7 @@ RSpec.shared_examples 'active_job_adapters' do
 
           expect(hash[:message_deduplication_id]).to eq(message_deduplication_id)
         end
-        expect(Shoryuken).to receive(:register_worker).with(job.queue_name, described_class::JobWrapper)
+        expect(Shoryuken).to receive(:register_worker).with(job.queue_name, Shoryuken::ActiveJob::JobWrapper)
 
         subject.enqueue(job)
       end
@@ -132,12 +132,12 @@ RSpec.shared_examples 'active_job_adapters' do
         }
 
         expect(queue).to receive(:send_message) do |hash|
-          expect(hash[:message_attributes]['shoryuken_class'][:string_value]).to eq(described_class::JobWrapper.to_s)
-          expect(hash[:message_attributes]['shoryuken_class'][:data_type]).to eq("String")
+          expect(hash[:message_attributes]['shoryuken_class'][:string_value]).to eq(Shoryuken::ActiveJob::JobWrapper.to_s)
+          expect(hash[:message_attributes]['shoryuken_class'][:data_type]).to eq('String')
           expect(hash[:message_attributes]['tracer_id'][:string_value]).to eq(custom_message_attributes['tracer_id'][:string_value])
-          expect(hash[:message_attributes]['tracer_id'][:data_type]).to eq("String")
+          expect(hash[:message_attributes]['tracer_id'][:data_type]).to eq('String')
         end
-        expect(Shoryuken).to receive(:register_worker).with(job.queue_name, described_class::JobWrapper)
+        expect(Shoryuken).to receive(:register_worker).with(job.queue_name, Shoryuken::ActiveJob::JobWrapper)
 
         subject.enqueue(job, message_attributes: custom_message_attributes)
       end
@@ -157,7 +157,8 @@ RSpec.shared_examples 'active_job_adapters' do
         it 'should enqueue a message with the message_attributes specified on the job' do
           expect(queue).to receive(:send_message) do |hash|
             expect(hash[:message_attributes]['tracer_id']).to eq({ data_type: 'String', string_value: 'job-value' })
-            expect(hash[:message_attributes]['shoryuken_class']).to eq({ data_type: 'String', string_value: described_class::JobWrapper.to_s })
+            expect(hash[:message_attributes]['shoryuken_class']).to eq({ data_type: 'String',
+                                                                         string_value: Shoryuken::ActiveJob::JobWrapper.to_s })
           end
           subject.enqueue job
         end
@@ -185,8 +186,10 @@ RSpec.shared_examples 'active_job_adapters' do
 
           expect(queue).to receive(:send_message) do |hash|
             expect(hash[:message_attributes]['tracer_id']).to be_nil
-            expect(hash[:message_attributes]['options_tracer_id']).to eq({ data_type: 'String', string_value: 'options-value' })
-            expect(hash[:message_attributes]['shoryuken_class']).to eq({ data_type: 'String', string_value: described_class::JobWrapper.to_s })
+            expect(hash[:message_attributes]['options_tracer_id']).to eq({ data_type: 'String',
+                                                                           string_value: 'options-value' })
+            expect(hash[:message_attributes]['shoryuken_class']).to eq({ data_type: 'String',
+                                                                         string_value: Shoryuken::ActiveJob::JobWrapper.to_s })
           end
           subject.enqueue job, message_attributes: custom_message_attributes
         end
@@ -225,7 +228,8 @@ RSpec.shared_examples 'active_job_adapters' do
 
       it 'should enqueue a message with the message_system_attributes specified on the job' do
         expect(queue).to receive(:send_message) do |hash|
-          expect(hash[:message_system_attributes]['AWSTraceHeader']).to eq({ data_type: 'String', string_value: 'job-value' })
+          expect(hash[:message_system_attributes]['AWSTraceHeader']).to eq({ data_type: 'String',
+                                                                             string_value: 'job-value' })
         end
         subject.enqueue job
       end
@@ -253,7 +257,8 @@ RSpec.shared_examples 'active_job_adapters' do
 
         expect(queue).to receive(:send_message) do |hash|
           expect(hash[:message_system_attributes]['job_trace_header']).to be_nil
-          expect(hash[:message_system_attributes]['options_trace_header']).to eq({ data_type: 'String', string_value: 'options-value' })
+          expect(hash[:message_system_attributes]['options_trace_header']).to eq({ data_type: 'String',
+                                                                                   string_value: 'options-value' })
         end
         subject.enqueue job, message_system_attributes: custom_message_attributes
       end
@@ -269,13 +274,33 @@ RSpec.shared_examples 'active_job_adapters' do
         expect(hash[:delay_seconds]).to eq(delay)
       end
 
-      expect(Shoryuken).to receive(:register_worker).with(job.queue_name, described_class::JobWrapper)
+      expect(Shoryuken).to receive(:register_worker).with(job.queue_name, Shoryuken::ActiveJob::JobWrapper)
 
       # need to figure out what to require Time.current and N.minutes to remove the stub
       allow(subject).to receive(:calculate_delay).and_return(delay)
 
       subject.enqueue_at(job, nil)
     end
+
+    context 'when fifo' do
+      let(:fifo) { true }
+
+      it 'raises FifoDelayNotSupportedError when delay is positive' do
+        allow(subject).to receive(:calculate_delay).and_return(3)
+        allow(queue).to receive(:name).and_return('test.fifo')
+        expect(queue).not_to receive(:send_message)
+
+        expect { subject.enqueue_at(job, nil) }.to raise_error(
+          Shoryuken::Errors::FifoDelayNotSupportedError, /FIFO queue.*does not support per-message delays/
+        )
+      end
+
+      it 'does not raise when delay is zero' do
+        allow(subject).to receive(:calculate_delay).and_return(0)
+        expect(queue).to receive(:send_message).with(hash_including(delay_seconds: 0))
+        expect { subject.enqueue_at(job, nil) }.not_to raise_error
+      end
+    end
   end
 end
 # rubocop:enable Metrics/BlockLength

data/spec/spec_helper.rb

@@ -1,3 +1,30 @@
+# frozen_string_literal: true
+
+Warning[:performance] = true if RUBY_VERSION >= '3.3'
+Warning[:deprecated] = true
+$VERBOSE = true
+
+require 'warning'
+
+Warning.process do |warning|
+  # Only check warnings from our code (not dependencies)
+  next unless warning.include?(Dir.pwd)
+
+  # Filter out warnings we don't care about in specs
+  next if warning.include?('_spec')
+
+  # We redefine methods to simulate various scenarios in tests
+  next if warning.include?('previous definition of')
+  next if warning.include?('method redefined')
+
+  # Ignore vendor and bundle directories
+  next if warning.include?('vendor/')
+  next if warning.include?('bundle/')
+  next if warning.include?('.bundle/')
+
+  raise "Warning in your code: #{warning}"
+end
+
 require 'bundler/setup'
 Bundler.setup
 
@@ -10,11 +37,30 @@ require 'shoryuken'
 require 'json'
 require 'dotenv'
 require 'securerandom'
+require 'ostruct'
 Dotenv.load
 
-if ENV['CODECLIMATE_REPO_TOKEN']
+unless ENV['SIMPLECOV_DISABLED']
   require 'simplecov'
-  SimpleCov.start
+  SimpleCov.start do
+  add_filter '/spec/'
+  add_filter '/test_workers/'
+  add_filter '/examples/'
+  add_filter '/vendor/'
+  add_filter '/.bundle/'
+
+  add_group 'Library', 'lib/'
+  add_group 'ActiveJob', 'lib/active_job'
+  add_group 'Middleware', 'lib/shoryuken/middleware'
+  add_group 'Polling', 'lib/shoryuken/polling'
+  add_group 'Workers', 'lib/shoryuken/worker'
+  add_group 'Helpers', 'lib/shoryuken/helpers'
+
+  enable_coverage :branch
+
+  minimum_coverage 89
+  minimum_coverage_by_file 60
+  end
 end
 
 config_file = File.join(File.expand_path('..', __dir__), 'spec', 'shoryuken.yml')