DateTime.now => Time.zone.now

This commit is contained in:
simon lehericey 2018-10-25 15:07:15 +02:00
parent 4f1cc8a2f0
commit 13ffa61435
26 changed files with 39 additions and 39 deletions

View file

@ -47,7 +47,7 @@ describe Admin::AttestationTemplatesController, type: :controller do
it { expect(subject.status).to eq(200) }
it { expect(assigns).to include(upload_params.stringify_keys) }
it { expect(assigns[:created_at]).to eq(DateTime.now) }
it { expect(assigns[:created_at]).to eq(Time.zone.now) }
it { expect(assigns(:logo).read).to eq(logo.read) }
it { expect(assigns(:signature).read).to eq(signature.read) }
after { procedure.attestation_template.destroy }

View file

@ -250,11 +250,11 @@ describe NewGestionnaire::DossiersController, type: :controller do
end
before do
Timecop.freeze(DateTime.now)
Timecop.freeze(Time.zone.now)
expect_any_instance_of(AttestationTemplate)
.to receive(:attestation_for)
.with(have_attributes(motivation: "Yallah", processed_at: DateTime.now))
.with(have_attributes(motivation: "Yallah", processed_at: Time.zone.now))
end
after { Timecop.return }

View file

@ -57,7 +57,7 @@ describe Users::RegistrationsController, type: :controller do
end
context 'and the user is confirmed' do
let(:confirmed_at) { DateTime.now }
let(:confirmed_at) { Time.zone.now }
before { subject }

View file

@ -2,7 +2,7 @@ FactoryBot.define do
factory :deleted_dossier do
dossier_id { 1111 }
state { Dossier.states.fetch(:en_construction) }
deleted_at { DateTime.now }
deleted_at { Time.zone.now }
association :procedure, :published
end

View file

@ -155,7 +155,7 @@ FactoryBot.define do
trait :whitelisted do
after(:build) do |procedure, _evaluator|
procedure.update(whitelisted_at: DateTime.now)
procedure.update(whitelisted_at: Time.zone.now)
end
end

View file

@ -3,6 +3,6 @@ FactoryBot.define do
factory :user do
email { generate(:user_email) }
password { 'password' }
confirmed_at { DateTime.now }
confirmed_at { Time.zone.now }
end
end

View file

@ -2,7 +2,7 @@ require 'rails_helper'
RSpec.describe DossierHelper, type: :helper do
describe ".highlight_if_unseen_class" do
let(:seen_at) { DateTime.now }
let(:seen_at) { Time.zone.now }
subject { highlight_if_unseen_class(seen_at, updated_at) }
@ -19,7 +19,7 @@ RSpec.describe DossierHelper, type: :helper do
end
context "when there is no last seen datetime" do
let(:updated_at) { DateTime.now }
let(:updated_at) { Time.zone.now }
let(:seen_at) { nil }
it { is_expected.to eq nil }

View file

@ -25,7 +25,7 @@ RSpec.describe GestionnaireMailer, type: :mailer do
dossiers_en_instruction_description: 'desc')
{
start_date: DateTime.now,
start_date: Time.zone.now,
procedure_overviews: [procedure_overview]
}
end

View file

@ -982,7 +982,7 @@ describe Dossier do
context "retention date" do
let(:procedure) { create(:procedure, duree_conservation_dossiers_dans_ds: 6) }
let(:uninstructed_dossier) { create(:dossier, :en_construction, procedure: procedure) }
let(:young_dossier) { create(:dossier, :en_instruction, en_instruction_at: DateTime.now, procedure: procedure) }
let(:young_dossier) { create(:dossier, :en_instruction, en_instruction_at: Time.zone.now, procedure: procedure) }
let(:just_expired_dossier) { create(:dossier, :en_instruction, en_instruction_at: 6.months.ago, procedure: procedure) }
let(:long_expired_dossier) { create(:dossier, :en_instruction, en_instruction_at: 1.year.ago, procedure: procedure) }
let(:modif_date) { DateTime.parse('01/01/2100') }
@ -993,7 +993,7 @@ describe Dossier do
describe "#retention_end_date" do
it { expect(uninstructed_dossier.retention_end_date).to be_nil }
it { expect(young_dossier.retention_end_date).to eq(6.months.from_now) }
it { expect(just_expired_dossier.retention_end_date).to eq(DateTime.now) }
it { expect(just_expired_dossier.retention_end_date).to eq(Time.zone.now) }
it { expect(long_expired_dossier.retention_end_date).to eq(6.months.ago) }
end

View file

@ -139,7 +139,7 @@ describe Gestionnaire, type: :model do
let!(:gestionnaire2) { create(:gestionnaire) }
subject { gestionnaire2.last_week_overview }
let(:friday) { DateTime.new(2017, 5, 12) }
let(:monday) { DateTime.now.beginning_of_week }
let(:monday) { Time.zone.now.beginning_of_week }
before { Timecop.freeze(friday) }
after { Timecop.return }
@ -313,7 +313,7 @@ describe Gestionnaire, type: :model do
context 'when gestionnaire update it s public champs last seen' do
let(:follow) { gestionnaire.follows.find_by(dossier: dossier) }
before { follow.update_attribute('demande_seen_at', DateTime.now) }
before { follow.update_attribute('demande_seen_at', Time.zone.now) }
it { is_expected.to match([]) }
it { expect(gestionnaire_2.notifications_for_procedure(procedure)).to match([dossier.id]) }