Merge pull request #513 from amatsuda/Time.now

Time.now => Time.current

Author: amatsuda

app/decorators/event_decorator.rb

@@ -32,7 +32,7 @@ def event_path_for
   end
 
   def cfp_days_remaining
-    ((object.closes_at - Time.current).to_i / 1.day) if object.closes_at && (object.closes_at - Time.now).to_i / 1.day > 1
+    ((object.closes_at - Time.current).to_i / 1.day) if object.closes_at && (object.closes_at - Time.current).to_i / 1.day > 1
   end
 
   def closes_at(format = nil)
@@ -123,7 +123,7 @@ def day
   private
 
   def proposal_date_range
-    now = Time.now
+    now = Time.current
     if object.proposals.present? && object.closes_at
       event_first_proposal_created_at =
         object.proposals.order(created_at: :asc).pluck(:created_at).first

app/models/event.rb

@@ -231,7 +231,7 @@ def mention_names
 
   def update_closes_at_if_manually_closed
     if changes.key?(:state) && changes[:state] == [STATUSES[:open], STATUSES[:closed]]
-      self.closes_at = Time.now
+      self.closes_at = Time.current
     end
   end
 end

db/seeds.rb

@@ -27,52 +27,52 @@ def create_seed_data
   admin = User.where(name: "Admin", email: "[email protected]", admin: true).first_or_create do |u|
     u.password = pwd
     u.password_confirmation = pwd
-    u.confirmed_at = Time.now
+    u.confirmed_at = Time.current
   end
   organizer = User.where(name: "Event MC", email: "[email protected]").first_or_create do |u|
     u.password = pwd
     u.password_confirmation = pwd
-    u.confirmed_at = Time.now
+    u.confirmed_at = Time.current
   end
   track_director = User.where(name: "Track Director", email: "[email protected]").first_or_create do |u|
     u.password = pwd
     u.password_confirmation = pwd
-    u.confirmed_at = Time.now
+    u.confirmed_at = Time.current
   end
   reviewer = User.where(name: "Reviewer", email: "[email protected]").first_or_create do |u|
     u.password = pwd
     u.password_confirmation = pwd
-    u.confirmed_at = Time.now
+    u.confirmed_at = Time.current
   end
   speaker_reviewer = User.where(name: "Speak and Review", email: "[email protected]").first_or_create do |u|
     u.password = pwd
     u.password_confirmation = pwd
-    u.confirmed_at = Time.now
+    u.confirmed_at = Time.current
   end
   speaker_1 = User.where(name: "Jenny Talksalot", email: "[email protected]").first_or_create do |u|
     u.password = pwd
     u.password_confirmation = pwd
-    u.confirmed_at = Time.now
+    u.confirmed_at = Time.current
   end
   speaker_2 = User.where(name: "Pamela Speakerson", email: "[email protected]").first_or_create do |u|
     u.password = pwd
     u.password_confirmation = pwd
-    u.confirmed_at = Time.now
+    u.confirmed_at = Time.current
   end
   speaker_3 = User.where(name: "Jim Talksman", email: "[email protected]").first_or_create do |u|
     u.password = pwd
     u.password_confirmation = pwd
-    u.confirmed_at = Time.now
+    u.confirmed_at = Time.current
   end
   speaker_4 = User.where(name: "Mark Speaksmith", email: "[email protected]").first_or_create do |u|
     u.password = pwd
     u.password_confirmation = pwd
-    u.confirmed_at = Time.now
+    u.confirmed_at = Time.current
   end
   speaker_5 = User.where(name: "Erin McTalky", email: "[email protected]").first_or_create do |u|
     u.password = pwd
     u.password_confirmation = pwd
-    u.confirmed_at = Time.now
+    u.confirmed_at = Time.current
   end
 
   ### SeedConf -- event is in the middle of the CFP
@@ -493,7 +493,7 @@ def create_seed_data
   # Program Sessions
   if schedule_event.proposals.count == 0
     120.times do |i|
-      speaker_user = User.create!(name: Faker::Name.name, email: Faker::Internet.email, password: pwd, password_confirmation: pwd, confirmed_at: Time.now)
+      speaker_user = User.create!(name: Faker::Name.name, email: Faker::Internet.email, password: pwd, password_confirmation: pwd, confirmed_at: Time.current)
 
       accepted_proposal = schedule_event.proposals.create!({
         event: seed_event,

spec/controllers/proposals_controller_spec.rb

@@ -101,7 +101,7 @@
     end
 
     it "leaves state unchanged for confirmed proposals" do
-      proposal.update_attribute(:confirmed_at, Time.now)
+      proposal.update_attribute(:confirmed_at, Time.current)
       post :withdraw, params: {event_slug: event.slug, uuid: proposal.uuid}
       expect(proposal.reload).not_to be_withdrawn
     end
@@ -126,7 +126,7 @@
     end
 
     it "sets the state to withdrawn for confirmed proposals" do
-      proposal.update_attribute(:confirmed_at, Time.now)
+      proposal.update_attribute(:confirmed_at, Time.current)
       post :decline, params: {event_slug: proposal.event.slug, uuid: proposal.uuid}
       expect(proposal.reload).to be_withdrawn
     end

spec/factories/events.rb

@@ -4,8 +4,8 @@
     url { "http://fineevent.com/" }
     guidelines { "We want all the good talks!" }
     contact_email { "[email protected]" }
-    start_date { Time.now + 25.days }
-    end_date { Time.now + 30.days }
-    closes_at { 3.weeks.from_now.to_datetime }
+    start_date { 25.days.from_now }
+    end_date { 30.days.from_now }
+    closes_at { 3.weeks.from_now }
   end
 end

spec/factories/notifications.rb

@@ -4,7 +4,7 @@
   factory :notification do
     user { nil }
     message { "MyString" }
-    read_at { Time.now }
+    read_at { Time.current }
     target_path { '/events' }
 
     trait :unread do

spec/factories/pages.rb

@@ -5,6 +5,6 @@
     sequence(:slug) { |i| "home#{i if i > 1}" }
     unpublished_body { "<p>#{Faker::Lorem.paragraph}</p>" }
     published_body { "<p>#{Faker::Lorem.paragraph}</p>" }
-    body_published_at { Time.now - 1.day }
+    body_published_at { 1.day.ago }
   end
 end

spec/features/admin/event_spec.rb

@@ -18,9 +18,9 @@
       fill_in "Name", with: "My Other Event"
       fill_in "Slug", with: "otherevent"
       fill_in "Contact email", with: "[email protected]"
-      fill_in "Start date", with: Time.now + 10.days
-      fill_in "End date", with: Time.now + 15.days
-      fill_in "Closes at", with: Time.now + 15.days
+      fill_in "Start date", with: 10.days.from_now
+      fill_in "End date", with: 15.days.from_now
+      fill_in "Closes at", with: 15.days.from_now
       click_button "Save"
 
       event = Event.last

spec/features/event_spec.rb

@@ -30,7 +30,7 @@
 
       expect(page).to have_content event.name
       expect(page).to have_link 'Submit a proposal'
-      expect(page).to have_content "Closes at #{(Time.now + 21.days).strftime('%b %-d')}"
+      expect(page).to have_content "Closes at #{(21.days.from_now).strftime('%b %-d')}"
       expect(page).to have_content '21 days left to submit your proposal'
       expect(page).to have_content '1 proposal submitted'
     end

spec/features/proposal_spec.rb

@@ -206,7 +206,7 @@
       let!(:speaker) { create(:speaker, proposal: proposal, user: user) }
 
       before do
-        proposal.update(confirmed_at: Time.now)
+        proposal.update(confirmed_at: Time.current)
         visit event_proposal_path(event_slug: proposal.event.slug, uuid: proposal)
       end