Bump to rails 8

* Remove obosolete dependency from 12/2023 which was a proof of concept at the time. * Fix deprecated ``` DEPRECATION WARNING: `to_time` will always preserve the full timezone rather than offset of the receiver in Rails 8.1. To opt in to the new behavior, set `config.active_support.to_time_preserves_timezone = :zone`. ``` * `cucumber-rails` was not ready for rails 8, point to branch with some config change (no feature changed) cucumber/cucumber-rails#590 * `MalwareScan#analyzed_at` is a datetime, not an integer, which raises an error now in Rails 8
etalab · Nov 12, 2024 · 6a1f7cc · 6a1f7cc
1 parent 9dab9d6
commit 6a1f7cc
Show file tree

Hide file tree

Showing 7 changed files with 80 additions and 135 deletions.
diff --git a/Gemfile b/Gemfile
@@ -32,8 +32,8 @@ gem 'propshaft'
 gem 'puma', '>= 5.0'
 gem 'pundit'
 gem 'ransack'
-gem 'rails', '~> 7.2.2'
-gem 'rails-i18n', '~> 7.0.10'
+gem 'rails', '~> 8.0'
+gem 'rails-i18n'
 gem 'redis', '>= 4.0.1'
 gem 'sentry-ruby'
 gem 'sentry-rails'
@@ -42,7 +42,6 @@ gem 'state_machines-activerecord'
 gem 'stimulus-rails'
 gem 'turbo-rails'
 gem 'tzinfo-data', platforms: %i[ windows jruby ]
-gem 'validates_timeliness', '~> 7.0.0.beta1'
 gem 'wicked'
 
 group :development, :test do
@@ -69,7 +68,7 @@ end
 
 group :test do
   gem 'capybara'
-  gem 'cucumber-rails', require: false
+  gem 'cucumber-rails', require: false, github: 'tagliala/cucumber-rails', branch: 'feature/589-rails-8'
   gem 'cuprite'
   gem 'database_cleaner-active_record'
   gem 'generator_spec'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,46 +1,55 @@
+GIT
+  remote: https://github.com/tagliala/cucumber-rails.git
+  revision: 499545f4233fa09e1c9833a40a18afd072d325aa
+  branch: feature/589-rails-8
+  specs:
+    cucumber-rails (3.0.1)
+      capybara (>= 3.11, < 4)
+      cucumber (>= 5, < 10)
+      railties (>= 5.2, < 8.1)
+
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.2.2)
-      actionpack (= 7.2.2)
-      activesupport (= 7.2.2)
+    actioncable (8.0.0)
+      actionpack (= 8.0.0)
+      activesupport (= 8.0.0)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.2.2)
-      actionpack (= 7.2.2)
-      activejob (= 7.2.2)
-      activerecord (= 7.2.2)
-      activestorage (= 7.2.2)
-      activesupport (= 7.2.2)
+    actionmailbox (8.0.0)
+      actionpack (= 8.0.0)
+      activejob (= 8.0.0)
+      activerecord (= 8.0.0)
+      activestorage (= 8.0.0)
+      activesupport (= 8.0.0)
       mail (>= 2.8.0)
-    actionmailer (7.2.2)
-      actionpack (= 7.2.2)
-      actionview (= 7.2.2)
-      activejob (= 7.2.2)
-      activesupport (= 7.2.2)
+    actionmailer (8.0.0)
+      actionpack (= 8.0.0)
+      actionview (= 8.0.0)
+      activejob (= 8.0.0)
+      activesupport (= 8.0.0)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.2.2)
-      actionview (= 7.2.2)
-      activesupport (= 7.2.2)
+    actionpack (8.0.0)
+      actionview (= 8.0.0)
+      activesupport (= 8.0.0)
       nokogiri (>= 1.8.5)
-      racc
-      rack (>= 2.2.4, < 3.2)
+      rack (>= 2.2.4)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actiontext (7.2.2)
-      actionpack (= 7.2.2)
-      activerecord (= 7.2.2)
-      activestorage (= 7.2.2)
-      activesupport (= 7.2.2)
+    actiontext (8.0.0)
+      actionpack (= 8.0.0)
+      activerecord (= 8.0.0)
+      activestorage (= 8.0.0)
+      activesupport (= 8.0.0)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.2.2)
-      activesupport (= 7.2.2)
+    actionview (8.0.0)
+      activesupport (= 8.0.0)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
@@ -57,26 +66,26 @@ GEM
       activemodel (>= 6.1.4)
       activestorage (>= 6.1.4)
       activesupport (>= 6.1.4)
-    activejob (7.2.2)
-      activesupport (= 7.2.2)
+    activejob (8.0.0)
+      activesupport (= 8.0.0)
       globalid (>= 0.3.6)
-    activemodel (7.2.2)
-      activesupport (= 7.2.2)
+    activemodel (8.0.0)
+      activesupport (= 8.0.0)
     activemodel-serializers-xml (1.0.2)
       activemodel (> 5.x)
       activesupport (> 5.x)
       builder (~> 3.1)
-    activerecord (7.2.2)
-      activemodel (= 7.2.2)
-      activesupport (= 7.2.2)
+    activerecord (8.0.0)
+      activemodel (= 8.0.0)
+      activesupport (= 8.0.0)
       timeout (>= 0.4.0)
-    activestorage (7.2.2)
-      actionpack (= 7.2.2)
-      activejob (= 7.2.2)
-      activerecord (= 7.2.2)
-      activesupport (= 7.2.2)
+    activestorage (8.0.0)
+      actionpack (= 8.0.0)
+      activejob (= 8.0.0)
+      activerecord (= 8.0.0)
+      activesupport (= 8.0.0)
       marcel (~> 1.0)
-    activesupport (7.2.2)
+    activesupport (8.0.0)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -88,6 +97,7 @@ GEM
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     ast (2.4.2)
@@ -162,10 +172,6 @@ GEM
     cucumber-html-formatter (21.7.0)
       cucumber-messages (> 19, < 27)
     cucumber-messages (22.0.0)
-    cucumber-rails (3.0.1)
-      capybara (>= 3.11, < 4)
-      cucumber (>= 5, < 10)
-      railties (>= 5.2, < 8)
     cucumber-tag-expressions (6.1.1)
     cuprite (0.15.1)
       capybara (~> 3.0)
@@ -336,7 +342,7 @@ GEM
     nenv (0.3.0)
     net-http (0.4.1)
       uri
-    net-imap (0.5.0)
+    net-imap (0.5.1)
       date
       net-protocol
     net-pop (0.1.2)
@@ -407,20 +413,20 @@ GEM
       rack (>= 1.0.0)
     rackup (2.2.0)
       rack (>= 3)
-    rails (7.2.2)
-      actioncable (= 7.2.2)
-      actionmailbox (= 7.2.2)
-      actionmailer (= 7.2.2)
-      actionpack (= 7.2.2)
-      actiontext (= 7.2.2)
-      actionview (= 7.2.2)
-      activejob (= 7.2.2)
-      activemodel (= 7.2.2)
-      activerecord (= 7.2.2)
-      activestorage (= 7.2.2)
-      activesupport (= 7.2.2)
+    rails (8.0.0)
+      actioncable (= 8.0.0)
+      actionmailbox (= 8.0.0)
+      actionmailer (= 8.0.0)
+      actionpack (= 8.0.0)
+      actiontext (= 8.0.0)
+      actionview (= 8.0.0)
+      activejob (= 8.0.0)
+      activemodel (= 8.0.0)
+      activerecord (= 8.0.0)
+      activestorage (= 8.0.0)
+      activesupport (= 8.0.0)
       bundler (>= 1.15.0)
-      railties (= 7.2.2)
+      railties (= 8.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -432,12 +438,12 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    rails-i18n (7.0.10)
+    rails-i18n (8.0.1)
       i18n (>= 0.7, < 2)
-      railties (>= 6.0.0, < 8)
-    railties (7.2.2)
-      actionpack (= 7.2.2)
-      activesupport (= 7.2.2)
+      railties (>= 8.0.0, < 9)
+    railties (8.0.0)
+      actionpack (= 8.0.0)
+      activesupport (= 8.0.0)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -513,7 +519,7 @@ GEM
       rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
-    securerandom (0.3.1)
+    securerandom (0.3.2)
     sentry-rails (5.21.0)
       railties (>= 5.0)
       sentry-ruby (~> 5.21.0)
@@ -548,8 +554,7 @@ GEM
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     thor (1.3.2)
-    timeliness (0.4.5)
-    timeout (0.4.1)
+    timeout (0.4.2)
     turbo-rails (2.0.11)
       actionpack (>= 6.0.0)
       railties (>= 6.0.0)
@@ -559,11 +564,8 @@ GEM
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.6.0)
     uniform_notifier (1.16.0)
-    uri (0.13.1)
+    uri (1.0.1)
     useragent (0.16.10)
-    validates_timeliness (7.0.0.beta2)
-      activemodel (>= 7.0.0, < 8)
-      timeliness (>= 0.3.10, < 1)
     version_gem (1.1.3)
     web-console (4.2.1)
       actionview (>= 6.0.0)
@@ -604,7 +606,7 @@ DEPENDENCIES
   bullet
   byebug
   capybara
-  cucumber-rails
+  cucumber-rails!
   cuprite
   database_cleaner-active_record
   debug
@@ -639,9 +641,9 @@ DEPENDENCIES
   puma (>= 5.0)
   pundit
   rack_session_access
-  rails (~> 7.2.2)
+  rails (~> 8.0)
   rails-controller-testing
-  rails-i18n (~> 7.0.10)
+  rails-i18n
   ransack
   redis (>= 4.0.1)
   rspec-rails (= 7.1.0)
@@ -659,7 +661,6 @@ DEPENDENCIES
   stimulus-rails
   turbo-rails
   tzinfo-data
-  validates_timeliness (~> 7.0.0.beta1)
   web-console
   webmock
   wicked

diff --git a/app/jobs/malware_scan_retrieve_state_job.rb b/app/jobs/malware_scan_retrieve_state_job.rb
@@ -23,7 +23,7 @@ def perform(malware_scan_id)
 
     malware_scan.update!(safety_state:, analyzed_at: Time.zone.at(result_analyze[:analyzed_at]))
   rescue MalwareScanRetrieveStateJobError, Faraday::ServerError, Faraday::ConnectionFailed
-    malware_scan.update!(safety_state: :unknown, analyzed_at: Time.zone.now.to_i) if attempts == RETRIES
+    malware_scan.update!(safety_state: :unknown, analyzed_at: Time.zone.now) if attempts == RETRIES
   end
 
   private

diff --git a/config/application.rb b/config/application.rb
@@ -30,6 +30,8 @@ class Application < Rails::Application
 
     config.default_from = '[email protected]'
 
+    config.active_support.to_time_preserves_timezone = :zone
+
     # Configuration for the application, engines, and railties goes here.
     #
     # These settings can be overridden in specific environments using the files

diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
@@ -125,7 +125,6 @@ ignore_unused:
   - "{activerecord,activemodel}.errors.*"
   - "ransack.attributes.*"
   - "errors.messages.*"
-  - "validates_timeliness.error_value_formats.*"
   - "authorization_request_forms.*"
   - "authorization_request_mailer.*.subject"
   - "support.*"

diff --git a/config/initializers/validates_timeliness.rb b/config/initializers/validates_timeliness.rb
diff --git a/config/locales/validates_timeliness.fr.yml b/config/locales/validates_timeliness.fr.yml