update/test configuration Rails7 and mongoid7 (#1588)

* Updating test configuration to run with rails7 and mongoid7 * Skipping active_record configuration for mongoid in test environment * Updating README status build badge
lynndylanhurley · Apr 14, 2023 · 066ad21 · 066ad21
1 parent a30603f
commit 066ad21
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 13 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -46,20 +46,26 @@ jobs:
           - ruby: 2.7
             gemfile: gemfiles/rails_6_0_mongoid_7.gemfile
             devise-token-auth-orm: mongoid
+          - ruby: 2.7
+            gemfile: gemfiles/rails_7_0_mongoid_7.gemfile
+            devise-token-auth-orm: mongoid
           - ruby: 2.7
             gemfile: gemfiles/rails_7_0.gemfile
           - ruby: '3.0'
             gemfile: gemfiles/rails_7_0.gemfile
+          - ruby: '3.0'
+            gemfile: gemfiles/rails_7_0_mongoid_7.gemfile
+            devise-token-auth-orm: mongoid
           - ruby: 3.1
             gemfile: gemfiles/rails_7_0.gemfile
+          - ruby: 3.1
+            gemfile: gemfiles/rails_7_0_mongoid_7.gemfile
+            devise-token-auth-orm: mongoid
           - ruby: 3.2
             gemfile: gemfiles/rails_7_0.gemfile
-          # Waiting for mongoid to support Rails 7.0
-          # - ruby: '3.0'
-          #   gemfile: gemfiles/rails_7_0.gemfile
-          # - ruby: '3.0'
-          #   gemfile: gemfiles/rails_7_0_mongoid_7.gemfile
-          #   devise-token-auth-orm: mongoid
+          - ruby: 3.2
+            gemfile: gemfiles/rails_7_0_mongoid_7.gemfile
+            devise-token-auth-orm: mongoid
         exclude:
           - ruby: 2.4
             gemfile: gemfiles/rails_6_0.gemfile

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # Devise Token Auth
 
 [![Gem Version](https://badge.fury.io/rb/devise_token_auth.svg)](http://badge.fury.io/rb/devise_token_auth)
-[![Build Status](https://travis-ci.org/lynndylanhurley/devise_token_auth.svg?branch=master)](https://travis-ci.org/lynndylanhurley/devise_token_auth)
+[![Build Status](https://github.com/lynndylanhurley/devise_token_auth/actions/workflows/test.yml/badge.svg?branch=master)](https://github.com/lynndylanhurley/devise_token_auth/actions/workflows/test.yml)
 [![Code Climate](https://codeclimate.com/github/lynndylanhurley/devise_token_auth/badges/gpa.svg)](https://codeclimate.com/github/lynndylanhurley/devise_token_auth)
 [![Test Coverage](https://codeclimate.com/github/lynndylanhurley/devise_token_auth/badges/coverage.svg)](https://codeclimate.com/github/lynndylanhurley/devise_token_auth/coverage)
 [![Downloads](https://img.shields.io/gem/dt/devise_token_auth.svg)](https://rubygems.org/gems/devise_token_auth)

diff --git a/gemfiles/rails_7_0_mongoid_7.gemfile b/gemfiles/rails_7_0_mongoid_7.gemfile
@@ -4,27 +4,28 @@ source "https://rubygems.org"
 
 gem "omniauth", "~> 2.0"
 gem "rails", "~> 7.0"
+gem "omniauth-rails_csrf_protection"
 gem "mongoid", "~> 7.0"
 gem "mongoid-locker", "~> 1.0"
 
 group :development, :test do
   gem "attr_encrypted"
-  gem "figaro"
+  gem "figaro", "~> 1.2"
   gem "omniauth-facebook"
   gem "omniauth-github"
   gem "omniauth-google-oauth2"
   gem "omniauth-apple"
   gem "rack-cors"
-  gem "thor"
+  gem "thor", "~> 1.2"
   gem "database_cleaner-mongoid"
   gem "factory_bot_rails"
-  gem "faker"
+  gem "faker", "~> 2.16"
   gem "fuzz_ball"
   gem "guard"
   gem "guard-minitest"
   gem "minitest"
   gem "minitest-focus"
-  gem "minitest-rails"
+  gem "minitest-rails", "~> 7"
   gem "minitest-reporters"
   gem "mocha", ">= 1.5"
   gem "pry"
@@ -35,7 +36,7 @@ end
 
 group :test do
   gem "rails-controller-testing"
-  gem "simplecov", "~> 0.10", "< 0.18", require: false
+  gem "simplecov", require: false
 end
 
 group :development do

diff --git a/test/dummy/config/environments/test.rb b/test/dummy/config/environments/test.rb
@@ -23,7 +23,7 @@
       (config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }) :
       (config.static_cache_control = 'public, max-age=3600')
 
-  if Rails::VERSION::MAJOR > 6
+  if Rails::VERSION::MAJOR > 6 && ENV['DEVISE_TOKEN_AUTH_ORM'] != 'mongoid'
     config.active_record.legacy_connection_handling = false
   end