From b79df113cdc92851e60f3001506a8bbad1828a66 Mon Sep 17 00:00:00 2001
From: Bertocq <bertocq@gmail.com>
Date: Sun, 11 Jun 2017 10:40:41 +0200
Subject: [PATCH] Switch all Time.curren.to_date for Date.current, same result
 but better syntax

---
 app/controllers/officing/residence_controller.rb  | 2 +-
 app/models/poll/voter.rb                          | 2 +-
 lib/age.rb                                        | 2 +-
 spec/factories.rb                                 | 2 +-
 spec/features/admin/poll/booth_assigments_spec.rb | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/officing/residence_controller.rb b/app/controllers/officing/residence_controller.rb
index 9f24d3a90..ef76162ea 100644
--- a/app/controllers/officing/residence_controller.rb
+++ b/app/controllers/officing/residence_controller.rb
@@ -26,7 +26,7 @@ class Officing::ResidenceController < Officing::BaseController
       @officer_assignments = current_user.poll_officer.
                                officer_assignments.
                                voting_days.
-                               where(date: Time.current.to_date)
+                               where(date: Date.current)
     end
 
     def validate_officer_assignment
diff --git a/app/models/poll/voter.rb b/app/models/poll/voter.rb
index 6da6b98b2..7236865c4 100644
--- a/app/models/poll/voter.rb
+++ b/app/models/poll/voter.rb
@@ -50,7 +50,7 @@ class Poll
         if dob.blank?
           nil
         else
-          now = Time.current.to_date
+          now = Date.current
           now.year - dob.year - (now.month > dob.month || (now.month == dob.month && now.day >= dob.day) ? 0 : 1)
         end
       end
diff --git a/lib/age.rb b/lib/age.rb
index cf619133d..1169b4f5d 100644
--- a/lib/age.rb
+++ b/lib/age.rb
@@ -1,5 +1,5 @@
 module Age
-  def self.in_years(dob, now = Time.current.to_date)
+  def self.in_years(dob, now = Date.current)
     return nil if dob.blank?
     # reference: http://stackoverflow.com/questions/819263/get-persons-age-in-ruby#comment21200772_819263
     now.year - dob.year - (now.month > dob.month || (now.month == dob.month && now.day >= dob.day) ? 0 : 1)
diff --git a/spec/factories.rb b/spec/factories.rb
index ed89ec154..bdd50c905 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -429,7 +429,7 @@ FactoryGirl.define do
   factory :poll_officer_assignment, class: 'Poll::OfficerAssignment' do
     association :officer, factory: :poll_officer
     association :booth_assignment, factory: :poll_booth_assignment
-    date Time.current.to_date
+    date Date.current
 
     trait :final do
       final true
diff --git a/spec/features/admin/poll/booth_assigments_spec.rb b/spec/features/admin/poll/booth_assigments_spec.rb
index 7a07eab82..ea2291e91 100644
--- a/spec/features/admin/poll/booth_assigments_spec.rb
+++ b/spec/features/admin/poll/booth_assigments_spec.rb
@@ -144,7 +144,7 @@ feature 'Admin booths assignments' do
       poll = create(:poll)
       booth = create(:poll_booth)
       booth_assignment = create(:poll_booth_assignment, poll: poll, booth: booth)
-      today = Time.current.to_date
+      today = Date.current
       officer_assignment = create(:poll_officer_assignment, booth_assignment: booth_assignment, date: today)
 
       recount = create(:poll_recount,