Merge branch 'master' into 6-4-stable

Author: jaredbeck

gemfiles/rails_7.0.rb

@@ -5,5 +5,5 @@
 source "https://rubygems.org"
 gemspec path: ".."
 
-gem "activerecord", "~> 7.0.0.alpha", github: "rails/rails", branch: "main"
-gem "activesupport", "~> 7.0.0.alpha", github: "rails/rails", branch: "main"
+gem "activerecord", "~> 7.0.0"
+gem "activesupport", "~> 7.0.0"

lib/authlogic/session/base.rb

@@ -2092,7 +2092,7 @@ def update_login_ip_addresses
       def update_login_timestamps
         if record.respond_to?(:current_login_at)
           record.last_login_at = record.current_login_at if record.respond_to?(:last_login_at)
-          record.current_login_at = klass.default_timezone == :utc ? Time.now.utc : Time.now
+          record.current_login_at = Time.current
         end
       end
 

test/acts_as_authentic_test/perishable_token_test.rb

@@ -63,7 +63,7 @@ def test_find_using_perishable_token
     def test_find_using_perishable_token_when_perished
       ben = users(:ben)
       ActiveRecord::Base.connection.execute(
-        "UPDATE users set updated_at = '#{1.week.ago.to_s(:db)}' where id = #{ben.id}"
+        "UPDATE users set updated_at = '#{1.week.ago.to_formatted_s(:db)}' where id = #{ben.id}"
       )
       assert_nil User.find_using_perishable_token(ben.perishable_token)
     end
@@ -72,7 +72,7 @@ def test_find_using_perishable_token_when_perished_2
       User.perishable_token_valid_for = 1.minute
       ben = users(:ben)
       ActiveRecord::Base.connection.execute(
-        "UPDATE users set updated_at = '#{2.minutes.ago.to_s(:db)}' where id = #{ben.id}"
+        "UPDATE users set updated_at = '#{2.minutes.ago.to_formatted_s(:db)}' where id = #{ben.id}"
       )
       assert_nil User.find_using_perishable_token(ben.perishable_token)
       User.perishable_token_valid_for = 10.minutes
@@ -82,7 +82,7 @@ def test_find_using_perishable_token_when_passing_threshold
       User.perishable_token_valid_for = 1.minute
       ben = users(:ben)
       ActiveRecord::Base.connection.execute(
-        "UPDATE users set updated_at = '#{10.minutes.ago.to_s(:db)}' where id = #{ben.id}"
+        "UPDATE users set updated_at = '#{10.minutes.ago.to_formatted_s(:db)}' where id = #{ben.id}"
       )
       assert_nil User.find_using_perishable_token(ben.perishable_token, 5.minutes)
       assert_equal ben, User.find_using_perishable_token(ben.perishable_token, 20.minutes)

test/session_test/brute_force_protection_test.rb

@@ -75,7 +75,8 @@ def test_exceeded_ban_for
         end
 
         ActiveRecord::Base.connection.execute(
-          "update users set updated_at = '#{1.day.ago.to_s(:db)}' where login = '#{ben.login}'"
+          "update users set updated_at = '#{1.day.ago.to_formatted_s(:db)}'
+           where login = '#{ben.login}'"
         )
         session = UserSession.new(login: ben.login, password: "benrocks")
         assert session.save
@@ -97,7 +98,8 @@ def test_exceeded_ban_and_failed_doesnt_ban_again
         end
 
         ActiveRecord::Base.connection.execute(
-          "update users set updated_at = '#{1.day.ago.to_s(:db)}' where login = '#{ben.login}'"
+          "update users set updated_at = '#{1.day.ago.to_formatted_s(:db)}'
+           where login = '#{ben.login}'"
         )
         session = UserSession.new(login: ben.login, password: "badpassword1")
         refute session.save