Update Test Suite

.github/workflows/test.yml

@@ -13,12 +13,13 @@ jobs:
       matrix:
         include:
           ### TEST ALL RUBY VERSIONS, USE DEFAULT GEMFILE
-          - ruby: 2.3
+          - ruby: 2.3 ### min version supported by Bundler 2.x
           - ruby: 2.4
           - ruby: 2.5
           - ruby: 2.6
           - ruby: 2.7
-          - ruby: 3.0
+          - ruby: "3.0" ### must be quoted otherwise will be treated as "3" which will resolve to latest 3.x version
+          - ruby: 3.1
 
           ### RAILS VERSION TESTING
           - ruby: 2.6
@@ -31,7 +32,7 @@ jobs:
             gemfile: gemfiles/rails_6.0.sqlite3.gemfile
           - ruby: 2.6
             gemfile: gemfiles/rails_6.1.sqlite3.gemfile
-          - ruby: 3.0
+          - ruby: "3.0"
             gemfile: gemfiles/rails_7.0.sqlite3.gemfile
 
     env:
@@ -47,12 +48,11 @@ jobs:
 
     - name: Bundle
       run: |
-        gem install bundler:1.17.3
-        bundle _1.17.3_ install
+        gem install bundler
+        bundle install
 
     - name: Run tests
       run: |
-        #bundle exec rake db:test:prepare
         bundle exec rake
 
 
@@ -83,7 +83,7 @@ jobs:
             gemfile: gemfiles/rails_6.0.mysql2.gemfile
           - ruby: 2.6
             gemfile: gemfiles/rails_6.1.mysql2.gemfile
-          - ruby: 3.0
+          - ruby: "3.0"
             gemfile: gemfiles/rails_7.0.mysql2.gemfile
 
     env:
@@ -98,15 +98,14 @@ jobs:
 
     - name: Bundle
       run: |
-        gem install bundler:1.17.3
-        bundle _1.17.3_ install
+        gem install bundler
+        bundle install
 
     - name: Run tests
       env:
         DATABASE_URL: mysql2://root:[email protected]:3306/test
         RAILS_ENV: test
       run: |
-        #bundle exec rake db:test:prepare
         bundle exec rake
 
 
@@ -137,7 +136,7 @@ jobs:
             gemfile: gemfiles/rails_6.0.pg.gemfile
           - ruby: 2.6
             gemfile: gemfiles/rails_6.1.pg.gemfile
-          - ruby: 3.0
+          - ruby: "3.0"
             gemfile: gemfiles/rails_7.0.pg.gemfile
 
     env:
@@ -153,13 +152,12 @@ jobs:
 
     - name: Bundle
       run: |
-        gem install bundler:1.17.3
-        bundle _1.17.3_ install
+        gem install bundler
+        bundle install
 
     - name: Run tests
       env:
         DATABASE_URL: postgres://postgres:password@localhost:5432/test
         RAILS_ENV: test
       run: |
-        #bundle exec rails db:test:prepare
         bundle exec rake

test/attribute_sanitization_test.rb

@@ -253,10 +253,13 @@ def test_create_with_bang_with_without_protection_with_attr_protected_attributes
 
   def test_protection_against_class_attribute_writers
     attribute_writers = [:logger, :configurations, :primary_key_prefix_type, :table_name_prefix, :table_name_suffix, :pluralize_table_names,
-     :default_timezone, :schema_format, :lock_optimistically, :timestamped_migrations, :default_scopes,
-     :connection_handler, :nested_attributes_options,
+     :lock_optimistically, :default_scopes, :connection_handler, :nested_attributes_options,
      :attribute_method_matchers, :time_zone_aware_attributes, :skip_time_zone_conversion_for_attributes]
 
+    if Rails::VERSION::MAJOR <= 6
+      attribute_writers += [:default_timezone, :schema_format, :timestamped_migrations]
+    end
+
     attribute_writers.push(:_attr_readonly) if ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR == 0
 
     attribute_writers.each do |method|