DGNum/demarches-normaliennes
14
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #3454 from betagouv/enforce-rubocop-timezone

Browse source 
Enforce rubocop timezone
This commit is contained in:
Mathieu Magnin 2019-02-19 11:08:09 +01:00 committed by GitHub
commit a9969e59ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.rubocop.yml
View file

@ -777,7 +777,7 @@ Rails/SkipsModelValidations:
Enabled: false Enabled: false
Rails/TimeZone: Rails/TimeZone:
Enabled: true EnforcedStyle: strict
Rails/UniqBeforePluck: Rails/UniqBeforePluck:
Enabled: true Enabled: true

2
app/controllers/users/confirmations_controller.rb
View file

@ -34,7 +34,7 @@ class Users::ConfirmationsController < Devise::ConfirmationsController
# Avoid keeping auto-sign-in links in users inboxes for too long. # Avoid keeping auto-sign-in links in users inboxes for too long.
# 95% of users confirm their account within two hours. # 95% of users confirm their account within two hours.
auto_sign_in_timeout = 2.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 end
# The path used after confirmation. # The path used after confirmation.

2
app/models/deleted_dossier.rb
View file

@ -2,6 +2,6 @@ class DeletedDossier < ApplicationRecord
belongs_to :procedure belongs_to :procedure
def self.create_from_dossier(dossier) 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
end end

2
app/models/procedure.rb
View file

@ -456,7 +456,7 @@ class Procedure < ApplicationRecord
def percentile_time(start_attribute, end_attribute, p) def percentile_time(start_attribute, end_attribute, p)
times = dossiers times = dossiers
.state_termine .state_termine
.where(end_attribute => 1.month.ago..DateTime.current) .where(end_attribute => 1.month.ago..Time.zone.now)
.pluck(start_attribute, end_attribute) .pluck(start_attribute, end_attribute)
.map { |(start_date, end_date)| end_date - start_date } .map { |(start_date, end_date)| end_date - start_date }

2
lib/tasks/task_helper.rb
View file

@ -60,7 +60,7 @@ class ProgressReport
def format_duration(seconds) def format_duration(seconds)
if seconds.finite? if seconds.finite?
Time.at(seconds).utc.strftime('%H:%M:%S') Time.zone.at(seconds).strftime('%H:%M:%S')
else else
'--:--:--' '--:--:--'
end end

2
spec/mailers/previews/administrateur_mailer_preview.rb
View file

@ -1,6 +1,6 @@
class AdministrateurMailerPreview < ActionMailer::Preview class AdministrateurMailerPreview < ActionMailer::Preview
def activate_before_expiration 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") AdministrateurMailer.activate_before_expiration(administrateur, "a4d4e4f4b4d445")
end end