Fix integration tests by updating aws-sdk-sqs and replacing moto

.github/workflows/specs.yml

@@ -9,14 +9,21 @@ jobs:
     name: All Specs
     strategy:
       matrix:
-        ruby: ['2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2', '3.3']
+        ruby: ['2.7', '3.0', '3.1', '3.2', '3.3']
         gemfile: ['Gemfile', 'gemfiles/aws_sdk_core_2.gemfile']
     runs-on: ubuntu-20.04
     services:
-      moto_sqs:
-        image: quay.io/cjlarose/moto-sqs-server:1.1.0
+      localstack:
+        image: localstack/localstack:latest
+        env:
+          SERVICES: sqs
         ports:
-          - 5000:5000
+          - 4566:4566
+        options: >-
+          --health-cmd "curl -f http://localhost:4566/_localstack/health"
+          --health-interval 5s
+          --health-timeout 10s
+          --health-retries 5
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
     steps:
@@ -34,17 +41,8 @@ jobs:
     name: Rails Specs
     strategy:
       matrix:
-        rails: ['4.2', '5.2', '6.0', '6.1', '7.0', '7.1']
+        rails: ['6.1', '7.0', '7.1']
         include:
-          - rails: '4.2'
-            ruby: '2.2'
-            gemfile: gemfiles/rails_4_2.gemfile
-          - rails: '5.2'
-            ruby: '2.5'
-            gemfile: gemfiles/rails_5_2.gemfile
-          - rails: '6.0'
-            ruby: '2.6'
-            gemfile: gemfiles/rails_6_0.gemfile
           - rails: '6.1'
             ruby: '3.0'
             gemfile: gemfiles/rails_6_1.gemfile

CHANGELOG.md

@@ -1,3 +1,18 @@
+## [7.0.0] - Unreleased
+
+- Fix integration tests by updating aws-sdk-sqs and replacing moto with LocalStack
+  - [#782](https://github.com/ruby-shoryuken/shoryuken/pull/782)
+  - [#783](https://github.com/ruby-shoryuken/shoryuken/pull/783)
+
+- Breaking: Remove support of Ruby versions older than 2.7
+  - [#783](https://github.com/ruby-shoryuken/shoryuken/pull/783)
+
+- Breaking: Remove support of Rails versions older than 6.1
+  - [#783](https://github.com/ruby-shoryuken/shoryuken/pull/783)
+
+- Breaking: Require `aws-sdk-sqs` `>=` `1.66`:
+  - [#783](https://github.com/ruby-shoryuken/shoryuken/pull/783)
+
 ## [v6.2.1] - 2024-02-09
 
 - Bugfix: Not able to use extended polling strategy (#759)

Gemfile

@@ -6,10 +6,7 @@ gemspec
 group :test do
   gem 'activejob'
   gem 'aws-sdk-core', '~> 3'
-  # Pin to 1.65.0 because of below issues:
-  # - https://github.com/ruby-shoryuken/shoryuken/pull/753#issuecomment-1822720647
-  # - https://github.com/getmoto/moto/issues/7054
-  gem 'aws-sdk-sqs', '1.65.0'
+  gem 'aws-sdk-sqs'
   gem 'codeclimate-test-reporter', require: nil
   gem 'httparty'
   gem 'multi_xml'

gemfiles/aws_sdk_core_2.gemfile

@@ -4,10 +4,10 @@ source "https://rubygems.org"
 
 group :test do
   gem "activejob"
-  gem "aws-sdk-core", "~> 2"
   gem "codeclimate-test-reporter", require: nil
   gem "httparty"
   gem "multi_xml"
+  gem "nokogiri"
   gem "simplecov"
   gem "webrick"
 end

lib/shoryuken/version.rb

@@ -1,3 +1,3 @@
 module Shoryuken
-  VERSION = '6.2.1'.freeze
+  VERSION = '7.0.0.alpha1'.freeze
 end

shoryuken.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
 
-  spec.add_dependency 'aws-sdk-core', '>= 2'
+  spec.add_dependency 'aws-sdk-sqs', '>= 1.66.0'
   spec.add_dependency 'concurrent-ruby'
   spec.add_dependency 'thor'
 end

spec/integration/launcher_spec.rb

@@ -7,7 +7,7 @@
   let(:sqs_client) do
     Aws::SQS::Client.new(
       region: 'us-east-1',
-      endpoint: 'http://localhost:5000',
+      endpoint: 'http://localhost:4566',
       access_key_id: 'fake',
       secret_access_key: 'fake'
     )