Merge branch 'master' into patch-1

Author: thomas-mcdonald

.github/workflows/activerecord.yml

@@ -6,17 +6,17 @@ jobs:
     continue-on-error: true
     strategy:
       matrix:
-        gemfile: [activerecord_4, activerecord_5, activerecord_6]
-        ruby: [2.5.9, 2.6.10, 2.7.7]
+        gemfile: [activerecord_6]
+        ruby: [2.7.7]
         include:
           - gemfile: activerecord_7
-            ruby: '3.2'
+            ruby: "3.2"
           - gemfile: activerecord_7
-            ruby: '3.1'
+            ruby: "3.1"
           - gemfile: activerecord_7
-            ruby: '3.0'
+            ruby: "3.0"
           - gemfile: activerecord_6
-            ruby: '3.0'
+            ruby: "3.0"
     env:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
       ADAPTER: active_record

.github/workflows/mongoid.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         gemfile: [mongoid_5]
-        ruby: [2.5.9, 2.6.10, 2.7.7]
+        ruby: [2.7.7]
     env:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
       ADAPTER: mongoid

gemfiles/activerecord_4.gemfile

@@ -5,6 +5,7 @@
 
 require 'rolify'
 require 'rolify/matchers'
+require 'logger'
 require 'rails/all'
 require_relative 'support/stream_helpers'
 include StreamHelpers

gemfiles/activerecord_5.gemfile

@@ -6,6 +6,7 @@
 
 require 'rolify'
 require 'rolify/matchers'
+require "logger"
 require 'rails'
 begin
   require 'its'