From 297447d802c8991bed2d4ef984501709510af646 Mon Sep 17 00:00:00 2001
From: Michael Klimenko <michaelkl@mail.ru>
Date: Fri, 23 Mar 2018 17:13:57 +0500
Subject: [PATCH] Make factories and tests timezone-friendly

---
 spec/controllers/admin/conferences_controller_spec.rb | 2 +-
 spec/factories/conferences.rb                         | 2 +-
 spec/factories/tracks.rb                              | 4 ++--
 spec/factories/vdays.rb                               | 2 +-
 spec/features/conference_spec.rb                      | 4 ++--
 spec/features/versions_spec.rb                        | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/spec/controllers/admin/conferences_controller_spec.rb b/spec/controllers/admin/conferences_controller_spec.rb
index 984ef137..97c76a29 100644
--- a/spec/controllers/admin/conferences_controller_spec.rb
+++ b/spec/controllers/admin/conferences_controller_spec.rb
@@ -41,7 +41,7 @@ describe Admin::ConferencesController do
           mailer = double
           allow(mailer).to receive(:deliver)
           conference.email_settings = create(:email_settings)
-          patch :update, id: conference.short_title, conference: attributes_for(:conference, start_date: Date.today + 2.days, end_date: Date.today + 4.days)
+          patch :update, id: conference.short_title, conference: attributes_for(:conference, start_date: Time.zone.today + 2.days, end_date: Time.zone.today + 4.days)
           conference.reload
           allow(Mailbot).to receive(:conference_date_update_mail).and_return(mailer)
         end
diff --git a/spec/factories/conferences.rb b/spec/factories/conferences.rb
index 31f72344..d0f11d19 100644
--- a/spec/factories/conferences.rb
+++ b/spec/factories/conferences.rb
@@ -5,7 +5,7 @@ FactoryGirl.define do
     title { Faker::Book.title }
     short_title { SecureRandom.urlsafe_base64(4) }
     timezone { Faker::Address.time_zone }
-    start_date { Date.current }
+    start_date { Time.zone.today }
     end_date { 6.days.from_now }
     start_hour 9
     end_hour 20
diff --git a/spec/factories/tracks.rb b/spec/factories/tracks.rb
index 3c0042f2..097a5452 100644
--- a/spec/factories/tracks.rb
+++ b/spec/factories/tracks.rb
@@ -12,8 +12,8 @@ FactoryGirl.define do
       association :submitter, factory: :user
       state 'new'
       cfp_active false
-      start_date { Date.today }
-      end_date { Date.today }
+      start_date { Time.zone.today }
+      end_date { Time.zone.today }
       room
       relevance { Faker::Hipster.paragraph(2) }
     end
diff --git a/spec/factories/vdays.rb b/spec/factories/vdays.rb
index 08aff069..7d7c2976 100644
--- a/spec/factories/vdays.rb
+++ b/spec/factories/vdays.rb
@@ -1,6 +1,6 @@
 FactoryGirl.define do
   factory :vday do
-    day { Date.today }
+    day { Time.zone.today }
     description 'Lorem Ipsum dolsum'
     conference
   end
diff --git a/spec/features/conference_spec.rb b/spec/features/conference_spec.rb
index 0dc4e228..a7a44c3e 100644
--- a/spec/features/conference_spec.rb
+++ b/spec/features/conference_spec.rb
@@ -16,7 +16,7 @@ feature Conference do
 
       select('(GMT+01:00) Berlin', from: 'conference[timezone]')
 
-      today = Date.today - 1
+      today = Time.zone.today - 1
       page
       .execute_script("$('#conference-start-datepicker').val('" +
                          "#{today.strftime('%d/%m/%Y')}')")
@@ -53,7 +53,7 @@ feature Conference do
       fill_in 'conference_title', with: 'New Con'
       fill_in 'conference_short_title', with: 'NewCon'
 
-      day = Date.today + 10
+      day = Time.zone.today + 10
       page
           .execute_script("$('#conference-start-datepicker').val('" +
                              "#{day.strftime('%d/%m/%Y')}')")
diff --git a/spec/features/versions_spec.rb b/spec/features/versions_spec.rb
index 2f71d519..3030d2b1 100644
--- a/spec/features/versions_spec.rb
+++ b/spec/features/versions_spec.rb
@@ -34,7 +34,7 @@ feature 'Version' do
 
   scenario 'display changes in cfp', feature: true, versioning: true, js: true do
     cfp = create(:cfp, program: conference.program)
-    cfp.update_attributes(start_date: (Date.today + 1).strftime('%d/%m/%Y'), end_date: (Date.today + 3).strftime('%d/%m/%Y'))
+    cfp.update_attributes(start_date: (Time.zone.today + 1).strftime('%d/%m/%Y'), end_date: (Time.zone.today + 3).strftime('%d/%m/%Y'))
     cfp_id = cfp.id
     cfp.destroy
 
@@ -46,7 +46,7 @@ feature 'Version' do
 
   scenario 'display changes in registration_period', feature: true, versioning: true, js: true do
     registration_period = create(:registration_period, conference: conference)
-    registration_period.update_attributes(start_date: (Date.today + 1).strftime('%d/%m/%Y'), end_date: (Date.today + 3).strftime('%d/%m/%Y'))
+    registration_period.update_attributes(start_date: (Time.zone.today + 1).strftime('%d/%m/%Y'), end_date: (Time.zone.today + 3).strftime('%d/%m/%Y'))
     registration_period_id = registration_period.id
     registration_period.destroy