changes Time.now to Time.current

app/models/poll.rb

@@ -10,21 +10,21 @@ class Poll < ActiveRecord::Base
 
   validate :date_range
 
-  scope :current,  -> { where('starts_at <= ? and ? <= ends_at', Time.now, Time.now) }
-  scope :incoming, -> { where('? < starts_at', Time.now) }
-  scope :expired,  -> { where('ends_at < ?', Time.now) }
+  scope :current,  -> { where('starts_at <= ? and ? <= ends_at', Time.current, Time.current) }
+  scope :incoming, -> { where('? < starts_at', Time.current) }
+  scope :expired,  -> { where('ends_at < ?', Time.current) }
 
   scope :sort_for_list, -> { order(:starts_at) }
 
-  def current?(timestamp = DateTime.now)
+  def current?(timestamp = DateTime.current)
     starts_at <= timestamp && timestamp <= ends_at
   end
 
-  def incoming?(timestamp = DateTime.now)
+  def incoming?(timestamp = DateTime.current)
     timestamp < starts_at
   end
 
-  def expired?(timestamp = DateTime.now)
+  def expired?(timestamp = DateTime.current)
     ends_at < timestamp
   end
 

app/models/signature.rb

@@ -49,8 +49,8 @@ class Signature < ActiveRecord::Base
     user_params = {
       document_number: document_number,
       created_from_signature: true,
-      verified_at: Time.now,
-      erased_at: Time.now,
+      verified_at: Time.current,
+      erased_at: Time.current,
       password: random_password,
       terms_of_service: '1',
       email: nil

db/dev_seeds.rb

@@ -203,7 +203,7 @@ tags = Faker::Lorem.words(25)
                               responsible_name: Faker::Name.name,
                               external_url: Faker::Internet.url,
                               description: description,
-                              created_at: rand((Time.now - 1.week) .. Time.now),
+                              created_at: rand((Time.current - 1.week) .. Time.current),
                               tag_list: tags.sample(3).join(','),
                               geozone: Geozone.reorder("RANDOM()").first,
                               terms_of_service: "1",
@@ -461,7 +461,7 @@ puts "Commenting Poll Questions"
   author = User.reorder("RANDOM()").first
   question = Poll::Question.reorder("RANDOM()").first
   Comment.create!(user: author,
-                  created_at: rand(question.created_at .. Time.now),
+                  created_at: rand(question.created_at .. Time.current),
                   commentable: question,
                   body: Faker::Lorem.sentence)
 end

spec/factories.rb

@@ -310,7 +310,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.now.to_date
+    date Time.current.to_date
   end
 
   factory :poll_voter, class: 'Poll::Voter' do

spec/features/verification/residence_spec.rb

@@ -104,7 +104,7 @@ feature 'Residence' do
   end
 
   scenario 'Error when trying to verify a deregistered account' do
-    create(:user, document_number: '12345678Z', document_type: '1', erased_at: Time.now)
+    create(:user, document_number: '12345678Z', document_type: '1', erased_at: Time.current)
 
     login_as(create(:user))