Proposed solution for ActiveRecord deprecation in Rails 7.0 (binarylo…

…gic#743) * Proposed solution for ActiveRecord deprecation in Rails 7.0 * Fixed deprecated RuboCop tag * Removed commented-out lines * Disabled Rubocop warning for legacy method * Reversed change to Rubocop version
Physolia · Oct 19, 2021 · 09a244e · 09a244e
1 parent 0cdd582
commit 09a244e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -21,7 +21,7 @@ Please use github issues only for bug reports and feature suggestions.
 ### Usage Questions
 
 Please ask usage questions on
-[stackoverflow](http://stackoverflow.com/questions/tagged/authlogic).
+[Stack Overflow](http://stackoverflow.com/questions/tagged/authlogic).
 
 ## Development
 
@@ -33,8 +33,21 @@ ruby. See `required_ruby_version` in the gemspec.
 Tests can be run against different versions of Rails:
 
 ```
+# Rails 5.2
+BUNDLE_GEMFILE=gemfiles/rails_5.2.rb bundle install
+BUNDLE_GEMFILE=gemfiles/rails_5.2.rb bundle exec rake
+
+# Rails 6.0
 BUNDLE_GEMFILE=gemfiles/rails_6.0.rb bundle install
 BUNDLE_GEMFILE=gemfiles/rails_6.0.rb bundle exec rake
+
+# Rails 6.1
+BUNDLE_GEMFILE=gemfiles/rails_6.1.rb bundle install
+BUNDLE_GEMFILE=gemfiles/rails_6.1.rb bundle exec rake
+
+# Rails 7.0
+BUNDLE_GEMFILE=gemfiles/rails_7.0.rb bundle install
+BUNDLE_GEMFILE=gemfiles/rails_7.0.rb bundle exec rake
 ```
 
 To run a single test:

diff --git a/lib/authlogic/session/base.rb b/lib/authlogic/session/base.rb
@@ -2031,7 +2031,7 @@ def search_scope
 
       # @api private
       def set_last_request_at
-        current_time = klass.default_timezone == :utc ? Time.now.utc : Time.now
+        current_time = Time.current
         MagicColumn::AssignsLastRequestAt
           .new(current_time, record, controller, last_request_at_threshold)
           .assign