Merge pull request #512 from amatsuda/death_to_DateTime

DateTime => Time

Author: amatsuda

app/controllers/proposals_controller.rb

@@ -116,7 +116,7 @@ def edit
 
   def update
     if params[:confirm]
-      @proposal.update(confirmed_at: DateTime.current)
+      @proposal.update(confirmed_at: Time.current)
       redirect_to event_event_proposals_url(slug: @event.slug, uuid: @proposal), flash: { success: "Thank you for confirming your participation" }
     elsif @proposal.speaker_update_and_notify(proposal_params)
       redirect_to event_proposal_url(event_slug: @event.slug, uuid: @proposal)

app/controllers/staff/program_sessions_controller.rb

@@ -98,6 +98,6 @@ def program_session_params
   end
 
   def json_filename
-    "#{current_event.slug}-program-#{DateTime.current.to_fs(:db_just_date)}.json"
+    "#{current_event.slug}-program-#{Time.current.to_fs(:db_just_date)}.json"
   end
 end

app/controllers/staff/time_slots_controller.rb

@@ -99,6 +99,6 @@ def time_slot_decorated
   end
 
   def json_filename
-    "#{current_event.slug}-schedule-#{DateTime.current.to_fs(:db_just_date)}.json"
+    "#{current_event.slug}-schedule-#{Time.current.to_fs(:db_just_date)}.json"
   end
 end

app/decorators/event_decorator.rb

@@ -32,7 +32,7 @@ def event_path_for
   end
 
   def cfp_days_remaining
-    ((object.closes_at - DateTime.current).to_i / 1.day) if object.closes_at && (object.closes_at - DateTime.now).to_i / 1.day > 1
+    ((object.closes_at - Time.current).to_i / 1.day) if object.closes_at && (object.closes_at - Time.now).to_i / 1.day > 1
   end
 
   def closes_at(format = nil)
@@ -123,7 +123,7 @@ def day
   private
 
   def proposal_date_range
-    now = DateTime.now
+    now = Time.now
     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 = DateTime.now
+      self.closes_at = Time.now
     end
   end
 end

app/models/notification.rb

@@ -18,7 +18,7 @@ def self.create_for(user, args = {})
   end
 
   def self.mark_as_read_for_proposal(proposal_url)
-    all.unread.where(target_path: proposal_url).update_all(read_at: DateTime.current)
+    all.unread.where(target_path: proposal_url).update_all(read_at: Time.current)
   end
 
   def self.more_unread?
@@ -30,7 +30,7 @@ def self.more_unread_count
   end
 
   def mark_as_read
-    update(read_at: DateTime.current)
+    update(read_at: Time.current)
   end
 
   def read?

app/models/proposal.rb

@@ -141,7 +141,7 @@ def withdraw
   end
 
   def confirm
-    update(confirmed_at: DateTime.current)
+    update(confirmed_at: Time.current)
     program_session.confirm if program_session.present?
   end
 
@@ -150,7 +150,7 @@ def promote
   end
 
   def decline
-    update(state: WITHDRAWN, confirmed_at: DateTime.current)
+    update(state: WITHDRAWN, confirmed_at: Time.current)
     program_session.update(state: ProgramSession::DECLINED)
   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 { DateTime.now + 25.days }
-    end_date { DateTime.now + 30.days }
+    start_date { Time.now + 25.days }
+    end_date { Time.now + 30.days }
     closes_at { 3.weeks.from_now.to_datetime }
   end
 end

spec/factories/notifications.rb

@@ -4,7 +4,7 @@
   factory :notification do
     user { nil }
     message { "MyString" }
-    read_at { DateTime.now }
+    read_at { Time.now }
     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 { DateTime.now - 1.day }
+    body_published_at { Time.now - 1.day }
   end
 end