Refactor: Reorganize tests and move ActiveJob to Rails-compliant paths

.github/workflows/specs.yml

@@ -2,82 +2,64 @@ name: Specs
 on:
   - push
   - pull_request
+permissions:
+  contents: read
 jobs:
-  all_specs:
-    name: All Specs
+  specs:
+    name: Specs
     strategy:
       matrix:
-        ruby: ['3.1', '3.2', '3.3', '3.4']
-        gemfile: ['Gemfile']
+        ruby: ['3.2', '3.3', '3.4']
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
 
-      - name: Start LocalStack
-        run: docker compose up -d
-
-      - name: Wait for LocalStack
-        run: |
-          timeout 30s bash -c '
-          until curl -s http://localhost:4566/_localstack/health | grep -q "\"sqs\": \"available\""; do
-            echo "Waiting for LocalStack..."
-            sleep 2
-          done
-          '
-
       - uses: ruby/setup-ruby@8aeb6ff8030dd539317f8e1769a044873b56ea71 # v1.268.0
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
 
       - name: Run specs
         run: bundle exec rake spec
-        env:
-          BUNDLE_GEMFILE: ${{ matrix.gemfile }}
-
-      - name: Run integration specs
-        run: bundle exec rake spec:integration
-        env:
-          BUNDLE_GEMFILE: ${{ matrix.gemfile }}
 
-  rails_specs:
-    name: Rails Specs
+  integrations:
+    name: Integrations
     strategy:
       matrix:
-        rails: ['7.2', '8.0', '8.1']
-        include:
-          - rails: '7.2'
-            ruby: '3.2'
-            gemfile: gemfiles/rails_7_2.gemfile
-          - rails: '8.0'
-            ruby: '3.3'
-            gemfile: gemfiles/rails_8_0.gemfile
-          - rails: '8.1'
-            ruby: '3.4'
-            gemfile: gemfiles/rails_8_1.gemfile
+        ruby: ['3.2', '3.3', '3.4']
     runs-on: ubuntu-latest
-    env:
-      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
     steps:
       - name: Checkout code
         uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
 
+      - name: Start LocalStack
+        run: docker compose up -d
+
+      - name: Wait for LocalStack
+        run: |
+          timeout 30s bash -c '
+          until curl -s http://localhost:4566/_localstack/health | grep -q "\"sqs\": \"available\""; do
+            echo "Waiting for LocalStack..."
+            sleep 2
+          done
+          '
+
       - uses: ruby/setup-ruby@8aeb6ff8030dd539317f8e1769a044873b56ea71 # v1.268.0
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
 
-      - name: Run Rails specs
-        run: bundle exec rake spec:rails
+      - name: Run integration specs
+        run: bundle exec rake spec:integration
 
   ci-success:
     name: CI Success
     runs-on: ubuntu-latest
     if: always()
     needs:
-      - all_specs
-      - rails_specs
+      - specs
+      - integrations
     steps:
       - name: Check all jobs passed
         if: |

.gitignore

@@ -27,3 +27,6 @@ shoryuken.yml
 rubocop.html
 .byebug_history
 .localstack
+spec/integration/**/Gemfile.lock
+spec/integration/**/vendor/
+spec/integration/**/.bundle/

.rspec

@@ -1,2 +1,3 @@
 --color
 --require spec_helper
+--exclude-pattern "spec/integration/**/*"

CHANGELOG.md

@@ -1,16 +1,35 @@
 ## [7.0.0] - Unreleased
+- Enhancement: Add `enqueue_all` for bulk ActiveJob enqueuing (Rails 7.1+)
+  - Implements efficient bulk enqueuing using SQS `send_message_batch` API
+  - Called by `ActiveJob.perform_all_later` for batching multiple jobs
+  - Batches jobs in groups of 10 (SQS limit) per queue
+  - Groups jobs by queue name for efficient multi-queue handling
+
 - Enhancement: Add ActiveJob Continuations support (Rails 8.1+)
   - Implements `stopping?` method in ActiveJob adapters to signal graceful shutdown
   - Enables jobs to checkpoint progress and resume after interruption
   - Handles past timestamps correctly (SQS treats negative delays as immediate delivery)
   - Tracks shutdown state in Launcher via `stopping?` flag
   - Leverages existing Shoryuken shutdown lifecycle (stop/stop! methods)
-  - Includes comprehensive integration tests with continuable jobs
   - See Rails PR #55127 for more details on ActiveJob Continuations
 
+- Enhancement: Add CurrentAttributes persistence support
+  - Enables Rails `ActiveSupport::CurrentAttributes` to flow from enqueue to job execution
+  - Automatically serializes current attributes into job payload when enqueuing
+  - Restores attributes before job execution and resets them afterward
+  - Supports multiple CurrentAttributes classes
+  - Based on Sidekiq's approach using `ActiveJob::Arguments` for serialization
+  - Usage: `require 'shoryuken/active_job/current_attributes'` and
+    `Shoryuken::ActiveJob::CurrentAttributes.persist('MyApp::Current')`
+
+- Breaking: Drop support for Ruby 3.1 (EOL March 2025)
+  - Minimum required Ruby version is now 3.2.0
+  - Supported Ruby versions: 3.2, 3.3, 3.4
+  - Users on Ruby 3.1 should upgrade or remain on Shoryuken 6.x
+
 - Breaking: Remove support for Rails versions older than 7.2
-  - Rails 7.0 and 7.1 have reached end-of-life and are no longer supported
-  - Supported versions: Rails 7.2, 8.0, and 8.1
+  - Rails 7.0 and 7.1 have reached end-of-life (April 2025) and are no longer supported
+  - Supported Rails versions: 7.2, 8.0, and 8.1
   - Users on older Rails versions should upgrade or remain on Shoryuken 6.x
 
 - Enhancement: Replace Concurrent::AtomicFixnum with pure Ruby AtomicCounter

Gemfile

@@ -12,7 +12,6 @@ group :test do
 end
 
 group :development do
-  gem 'appraisal', git: 'https://github.com/thoughtbot/appraisal.git'
   gem 'pry-byebug'
   gem 'rubocop'
 end

Rakefile

@@ -5,19 +5,13 @@ $stdout.sync = true
 
 begin
   require 'rspec/core/rake_task'
-  RSpec::Core::RakeTask.new(:spec) do |t|
-    t.exclude_pattern = 'spec/integration/**/*_spec.rb'
-  end
+  RSpec::Core::RakeTask.new(:spec)
 
   namespace :spec do
-    desc 'Run Rails specs only'
-    RSpec::Core::RakeTask.new(:rails) do |t|
-      t.pattern = 'spec/shoryuken/{environment_loader_spec,extensions/active_job_*}.rb'
-    end
-
     desc 'Run integration specs only'
-    RSpec::Core::RakeTask.new(:integration) do |t|
-      t.pattern = 'spec/integration/**/*_spec.rb'
+    task :integration do
+      puts "Running integration tests..."
+      system('./bin/integrations') || exit(1)
     end
   end
 rescue LoadError

bin/clean_localstack

@@ -0,0 +1,52 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# Removes all integration test SQS queues from LocalStack
+#
+# Useful when having a long-running LocalStack instance that cannot be fully
+# restarted between test runs. All integration test queues use the 'it-' prefix,
+# making them easy to identify and remove.
+#
+# Usage:
+#   bin/clean_localstack
+
+require 'aws-sdk-sqs'
+
+THREADS_COUNT = 3
+
+sqs = Aws::SQS::Client.new(
+  region: 'us-east-1',
+  endpoint: 'http://localhost:4566',
+  access_key_id: 'fake',
+  secret_access_key: 'fake'
+)
+
+# Find all queues with 'it-' prefix
+response = sqs.list_queues(queue_name_prefix: 'it-')
+queues_for_removal = response.queue_urls || []
+
+if queues_for_removal.empty?
+  puts "No integration test queues found (prefix: it-)"
+  exit 0
+end
+
+puts "Found #{queues_for_removal.size} queues to remove"
+
+queue = SizedQueue.new(THREADS_COUNT)
+
+threads = Array.new(THREADS_COUNT) do
+  Thread.new do
+    while (queue_url = queue.pop)
+      queue_name = queue_url.split('/').last
+      puts "Removing queue: #{queue_name}"
+      sqs.delete_queue(queue_url: queue_url)
+    end
+  end
+end
+
+queues_for_removal.each { |url| queue << url }
+
+queue.close
+threads.each(&:join)
+
+puts "Cleanup complete"