Add Ruby 3.1 and ActiveRecord 7 to CI (#574)

Address collision problem when using Rails 7 and the default class name 'Role'
Use Coveralls wear_merged! and move to the top of the spec file

.github/workflows/activerecord.yml

@@ -8,6 +8,13 @@ jobs:
       matrix:
         gemfile: [activerecord_4, activerecord_5, activerecord_6]
         ruby: [2.5.7, 2.6.5, 2.7.2]
+        include:
+          - gemfile: activerecord_7
+            ruby: '3.1'
+          - gemfile: activerecord_7
+            ruby: '3.0'
+          - gemfile: activerecord_6
+            ruby: '3.0'
     env:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
       ADAPTER: active_record

gemfiles/activerecord_6.gemfile

@@ -3,10 +3,10 @@
 source "https://rubygems.org"
 
 gem "sqlite3", "~> 1.4", platform: "ruby"
-gem "activerecord", ">= 6.0.0", require: "active_record"
-gem "actionpack", ">= 6.0.0"
-gem "activemodel", ">= 6.0.0"
-gem "railties", ">= 6.0.0"
+gem "activerecord", "~> 6.1.0", require: "active_record"
+gem "actionpack", "~> 6.1.0"
+gem "activemodel", "~> 6.1.0"
+gem "railties", "~> 6.1.0"
 
 group :test do
   gem "codeclimate-test-reporter", require: nil

gemfiles/activerecord_7.gemfile

@@ -0,0 +1,22 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sqlite3", "~> 1.4", platform: "ruby"
+gem "activerecord", "~> 7.0.0", require: "active_record"
+gem "actionpack", "~> 7.0.0"
+gem "activemodel", "~> 7.0.0"
+gem "railties", "~> 7.0.0"
+
+group :test do
+  gem "codeclimate-test-reporter", require: nil
+  gem "coveralls", require: false
+  gem "database_cleaner", "~> 1.6.2"
+  gem "its"
+  gem "test-unit"
+  gem "byebug"
+  gem "pry"
+  gem "pry-byebug"
+end
+
+gemspec path: "../"

spec/generators/rolify/rolify_activerecord_generator_spec.rb

@@ -32,7 +32,11 @@ class User < ActiveRecord::Base
         end
       }
       require File.join(destination_root, "app/models/user.rb")
-      run_generator
+      if Rails::VERSION::MAJOR >= 7
+        run_generator %w(--skip-collision-check)
+      else
+        run_generator
+      end
     }
 
     describe 'config/initializers/rolify.rb' do

spec/spec_helper.rb

@@ -1,5 +1,5 @@
-require "simplecov"
-SimpleCov.start
+require 'coveralls'
+Coveralls.wear_merged!
 
 require 'rubygems'
 require "bundler/setup"
@@ -13,9 +13,6 @@
 end
 require 'database_cleaner'
 
-require 'coveralls'
-Coveralls.wear_merged!
-
 ENV['ADAPTER'] ||= 'active_record'
 
 load File.dirname(__FILE__) + "/support/adapters/#{ENV['ADAPTER']}.rb"