Merge pull request #1634 from consul/fix/date_time_current_usage

Fix Flaky test related with Time/Date in Search concern

app/controllers/concerns/search.rb

@@ -41,11 +41,11 @@ module Search
   end
 
   def search_finish_date
-    (params[:advanced_search][:date_max].to_date rescue Date.today) || Date.today
+    (params[:advanced_search][:date_max].to_date rescue Date.current) || Date.current
   end
 
   def search_date_range
-    [100.years.ago, search_start_date].max.beginning_of_day..[search_finish_date, Date.today].min.end_of_day
+    [100.years.ago, search_start_date].max.beginning_of_day..[search_finish_date, Date.current].min.end_of_day
   end
 
   def set_search_order
@@ -54,4 +54,4 @@ module Search
     end
   end
 
-end
+end

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

app/models/direct_message.rb

@@ -8,7 +8,7 @@ class DirectMessage < ActiveRecord::Base
   validates :receiver, presence: true
   validate  :max_per_day
 
-  scope :today, lambda { where('DATE(created_at) = ?', Date.today) }
+  scope :today, lambda { where('DATE(created_at) = ?', Date.current) }
 
   def max_per_day
     return if errors.any?

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

app/views/management/proposals/print.html.erb

@@ -8,7 +8,7 @@
       <%= image_tag "header_print_proposals.jpg", class: "for-print-only" %>
 
       <div class="filters">
-        <span class="for-print-only date-for-print"><%= l Date.today, format: :long %></span>
+        <span class="for-print-only date-for-print"><%= l Date.current, format: :long %></span>
 
         <h2 class="inline-block">
           <span class="not-print"><%= t("proposals.index.select_order_long") %></span>