From dd27167c5da10aa77aa2aefcfbb847b7f2cc10bf Mon Sep 17 00:00:00 2001 From: Mathieu Magnin Date: Mon, 18 Feb 2019 11:56:09 +0100 Subject: [PATCH] Enforce Timezone rule in Rubocop --- .rubocop.yml | 2 +- app/controllers/users/confirmations_controller.rb | 2 +- app/models/deleted_dossier.rb | 2 +- app/models/procedure.rb | 2 +- lib/tasks/task_helper.rb | 2 +- spec/mailers/previews/administrateur_mailer_preview.rb | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index afb11910f..307bc088d 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -777,7 +777,7 @@ Rails/SkipsModelValidations: Enabled: false Rails/TimeZone: - Enabled: true + EnforcedStyle: strict Rails/UniqBeforePluck: Enabled: true diff --git a/app/controllers/users/confirmations_controller.rb b/app/controllers/users/confirmations_controller.rb index a93ac5600..ec5755987 100644 --- a/app/controllers/users/confirmations_controller.rb +++ b/app/controllers/users/confirmations_controller.rb @@ -34,7 +34,7 @@ class Users::ConfirmationsController < Devise::ConfirmationsController # Avoid keeping auto-sign-in links in users inboxes for too long. # 95% of users confirm their account within two hours. auto_sign_in_timeout = 2.hours - resource.confirmation_sent_at + auto_sign_in_timeout > DateTime.current + resource.confirmation_sent_at + auto_sign_in_timeout > Time.zone.now end # The path used after confirmation. diff --git a/app/models/deleted_dossier.rb b/app/models/deleted_dossier.rb index 9fba98749..25338f6b4 100644 --- a/app/models/deleted_dossier.rb +++ b/app/models/deleted_dossier.rb @@ -2,6 +2,6 @@ class DeletedDossier < ApplicationRecord belongs_to :procedure def self.create_from_dossier(dossier) - DeletedDossier.create!(dossier_id: dossier.id, procedure: dossier.procedure, state: dossier.state, deleted_at: Time.now.utc) + DeletedDossier.create!(dossier_id: dossier.id, procedure: dossier.procedure, state: dossier.state, deleted_at: Time.zone.now) end end diff --git a/app/models/procedure.rb b/app/models/procedure.rb index c48b3ff37..992f273db 100644 --- a/app/models/procedure.rb +++ b/app/models/procedure.rb @@ -456,7 +456,7 @@ class Procedure < ApplicationRecord def percentile_time(start_attribute, end_attribute, p) times = dossiers .state_termine - .where(end_attribute => 1.month.ago..DateTime.current) + .where(end_attribute => 1.month.ago..Time.zone.now) .pluck(start_attribute, end_attribute) .map { |(start_date, end_date)| end_date - start_date } diff --git a/lib/tasks/task_helper.rb b/lib/tasks/task_helper.rb index 7443af5ff..8be2ab6dc 100644 --- a/lib/tasks/task_helper.rb +++ b/lib/tasks/task_helper.rb @@ -60,7 +60,7 @@ class ProgressReport def format_duration(seconds) if seconds.finite? - Time.at(seconds).utc.strftime('%H:%M:%S') + Time.zone.at(seconds).strftime('%H:%M:%S') else '--:--:--' end diff --git a/spec/mailers/previews/administrateur_mailer_preview.rb b/spec/mailers/previews/administrateur_mailer_preview.rb index afa8762a0..18730819c 100644 --- a/spec/mailers/previews/administrateur_mailer_preview.rb +++ b/spec/mailers/previews/administrateur_mailer_preview.rb @@ -1,6 +1,6 @@ class AdministrateurMailerPreview < ActionMailer::Preview def activate_before_expiration - administrateur = Administrateur.new(reset_password_sent_at: Time.now.utc) + administrateur = Administrateur.new(reset_password_sent_at: Time.zone.now) AdministrateurMailer.activate_before_expiration(administrateur, "a4d4e4f4b4d445") end