add tests on ruby 3.1, 3.2, rails 7.0, drop support for rails 5.1

.github/workflows/ci.yml

@@ -3,7 +3,7 @@ name: CI
 on: push
 
 jobs:
-  test:
+  tests:
     runs-on: ubuntu-latest
 
     services:
@@ -18,26 +18,40 @@ jobs:
         ruby-version:
           - "2.7"
           - "3.0"
+          - "3.1"
+          - "3.2"
         gemfile:
-          - rails5.1
-          - rails5.2
           - rails6.0
           - rails6.1
-        exclude:
-          - ruby-version: "3.0"
-            gemfile: rails5.1
-          - ruby-version: "3.0"
+          - rails7.0
+        include:
+          - ruby-version: "2.7"
             gemfile: rails5.2
 
     env:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
 
     steps:
-      - uses: zendesk/checkout@v2
+      - uses: zendesk/checkout@v3
 
       - uses: zendesk/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true
 
       - run: bundle exec rake test
+
+  tests_successful:
+    name: Tests passing?
+    needs: tests
+    if: always()
+    runs-on: ubuntu-latest
+    steps:
+      - run: |
+          if ${{ needs.tests.result == 'success' }}
+          then
+            echo "All tests pass"
+          else
+            echo "Some tests failed"
+            false
+          fi

.ruby-version

@@ -0,0 +1 @@
+2.7.8

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Unreleased
 
+# 4.1.0
+- Add support for Ruby 3.1 and 3.2 
+- Add support for Rails 7.0
+- Drop support for Rails 5.1
+
 # 4.0.1
 
 - Bug fix: Cast job audit to the configured auditor class when enqueuing

Gemfile

@@ -1 +1 @@
-eval_gemfile('gemfiles/rails5.1.gemfile')
+eval_gemfile('gemfiles/rails6.1.gemfile')

gemfiles/common.rb

@@ -1,3 +1,12 @@
 source 'https://rubygems.org'
 
 gemspec path: '..'
+
+gem "bump"
+gem "rake"
+gem "minitest"
+gem "minitest-rg"
+gem "mocha"
+gem "timecop"
+gem "pry"
+gem "sqlite3"

gemfiles/rails7.0.gemfile

@@ -0,0 +1,3 @@
+eval_gemfile('common.rb')
+
+gem 'activerecord', '~> 7.0.0'

resque-durable.gemspec

@@ -1,25 +1,16 @@
 Gem::Specification.new do |s|
   s.name     = "resque-durable"
-  s.version  = "4.0.3"
+  s.version  = "4.1.0"
   s.authors  = ["Eric Chapweske", "Ben Osheroff"]
   s.summary  = "Resque queue backed by database audits, with automatic retry"
   s.homepage = "https://github.com/zendesk/resque-durable"
   s.license  = "MIT"
   s.files    = `git ls-files lib`.split($/)
 
-  s.required_ruby_version = ">= 2.6"
+  s.required_ruby_version = ">= 2.7"
 
-  s.add_runtime_dependency("activerecord", ">= 5.1")
+  s.add_runtime_dependency("activerecord", ">= 5.2")
   s.add_runtime_dependency("resque", "~> 1.27")
   s.add_runtime_dependency("uuidtools", "~> 2.2")
   s.add_runtime_dependency("redis", "< 5")
-
-  s.add_development_dependency("bump")
-  s.add_development_dependency("rake")
-  s.add_development_dependency("minitest")
-  s.add_development_dependency("minitest-rg")
-  s.add_development_dependency("mocha")
-  s.add_development_dependency("timecop")
-  s.add_development_dependency("pry")
-  s.add_development_dependency("sqlite3")
 end

test/queue_audit_test.rb

@@ -57,7 +57,7 @@ class QueueAuditTest < Minitest::Test
           Timecop.freeze(Time.now) do
             @audit.complete!
 
-            assert_equal Time.now, @audit.completed_at
+            assert_equal Time.now.floor(6), @audit.completed_at
             assert_equal true,     @audit.complete?
           end
         end
@@ -129,7 +129,7 @@ class QueueAuditTest < Minitest::Test
             @audit.enqueued!
           end
 
-          assert_equal an_hour_ago, @audit.enqueued_at
+          assert_equal an_hour_ago.floor(6), @audit.enqueued_at
         end
 
       end
@@ -141,7 +141,7 @@ class QueueAuditTest < Minitest::Test
             @audit.enqueued!
           end
 
-          assert_equal (an_hour_ago + 10.minutes), @audit.timeout_at
+          assert_equal (an_hour_ago + 10.minutes).floor(6), @audit.timeout_at
         end
 
         it 'allows configuration of the timeout' do
@@ -184,13 +184,13 @@ class QueueAuditTest < Minitest::Test
           Timecop.freeze(ts) do
             @audit.enqueued!
           end
-          assert_equal ts + 10.minutes, @audit.timeout_at
+          assert_equal (ts + 10.minutes).floor(6), @audit.timeout_at
 
           ts = 30.minutes.ago
           Timecop.freeze(ts) do
             @audit.heartbeat!
           end
-          assert_equal ts + 10.minutes, @audit.timeout_at
+          assert_equal (ts + 10.minutes).floor(6), @audit.timeout_at
         end
       end
 

test/schema.rb

@@ -6,9 +6,9 @@
     t.string   :job_klass,  :null => false
     t.string   :payload,     :null => false
     t.integer  :enqueue_count, :default => 0
-    t.datetime :enqueued_at
-    t.datetime :completed_at
-    t.datetime :timeout_at
+    t.datetime :enqueued_at, precision: 6
+    t.datetime :completed_at, precision: 6
+    t.datetime :timeout_at, precision: 6
     t.timestamps :null => true
   end
   add_index(:durable_queue_audits, :enqueued_id, :unique => true)