Support for writing style deprecated in 7.1 and removed in 7.2 (#1606)

* Support for writing style deprecated in 7.1 and removed in 7.2 * test: 💍 MiniTest->Minitest * 7.1 -> 7.2
lynndylanhurley · Nov 2, 2023 · d9a91bc · d9a91bc
1 parent eeed642
commit d9a91bc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/app/models/devise_token_auth/concerns/active_record_support.rb b/app/models/devise_token_auth/concerns/active_record_support.rb
@@ -2,7 +2,11 @@ module DeviseTokenAuth::Concerns::ActiveRecordSupport
   extend ActiveSupport::Concern
 
   included do
-    serialize :tokens, DeviseTokenAuth::Concerns::TokensSerialization
+    if Rails::VERSION::MAJOR >= 7 && Rails::VERSION::MINOR >= 1
+      serialize :tokens, coder: DeviseTokenAuth::Concerns::TokensSerialization
+    else
+      serialize :tokens, DeviseTokenAuth::Concerns::TokensSerialization
+    end
   end
 
   class_methods do

diff --git a/devise_token_auth.gemspec b/devise_token_auth.gemspec
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 2.3.0"
 
-  s.add_dependency 'rails', '>= 4.2.0', '< 7.1'
+  s.add_dependency 'rails', '>= 4.2.0', '< 7.2'
   s.add_dependency 'devise', '> 3.5.2', '< 5'
   s.add_dependency 'bcrypt', '~> 3.0'
 

diff --git a/test/controllers/devise_token_auth/sessions_controller_test.rb b/test/controllers/devise_token_auth/sessions_controller_test.rb
@@ -420,7 +420,7 @@ def @controller.reset_session
       describe 'With paranoid mode' do
         before do
           mock_hash = '$2a$04$MUWADkfA6MHXDdWHoep6QOvX1o0Y56pNqt3NMWQ9zCRwKSp1HZJba'
-          @bcrypt_mock = MiniTest::Mock.new
+          @bcrypt_mock = Minitest::Mock.new
           @bcrypt_mock.expect(:call, mock_hash, [Object, String])
 
           swap Devise, paranoid: true do