Merge pull request #347 from ChrisBr/fix_test_dates
Implements timecop to make tests independent from DateTime
This commit is contained in:
commit
35c5116051
14 changed files with 42 additions and 38 deletions
|
|
@ -717,6 +717,7 @@ describe Conference do
|
|||
it 'returns the last two past conferences if there are no pending conferences' do
|
||||
subject.start_date = Time.now - 10.days
|
||||
subject.end_date = Time.now - 5.days
|
||||
subject.save
|
||||
c = create(:conference,
|
||||
short_title: 'c', start_date: Time.now - 1.year,
|
||||
end_date: Time.now - 360.days)
|
||||
|
|
@ -901,9 +902,9 @@ describe Conference do
|
|||
let!(:admin_role) { create(:admin_role) }
|
||||
|
||||
it 'self#event_distribution calculates correct values with user' do
|
||||
create(:user, last_sign_in_at: Time.now - 3.months) # active
|
||||
create(:user, last_sign_in_at: Date.today - 3.months) # active
|
||||
create(:user, confirmed_at: nil) # unconfirmed
|
||||
create(:user, last_sign_in_at: Time.now - 1.year - 1.day) # dead
|
||||
create(:user, last_sign_in_at: Date.today - 1.year - 1.day) # dead
|
||||
result = {}
|
||||
result['Active'] = { 'color' => 'green', 'value' => 1 }
|
||||
result['Unconfirmed'] = { 'color' => 'red', 'value' => 1 }
|
||||
|
|
@ -913,7 +914,7 @@ describe Conference do
|
|||
end
|
||||
|
||||
it 'self#event_distribution calculates correct with only active user' do
|
||||
create(:user, last_sign_in_at: Time.now - 3.months) # active
|
||||
create(:user, last_sign_in_at: Date.today - 3.months) # active
|
||||
result = {}
|
||||
result['Active'] = { 'color' => 'green', 'value' => 1 }
|
||||
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ describe Target do
|
|||
target = build(:target, target_count: 10, unit: Target.units[:registrations])
|
||||
conference.targets = [target]
|
||||
|
||||
result = "10 Registrations by #{Date.today + 14}"
|
||||
result = "10 Registrations by #{14.days.from_now.to_date}"
|
||||
|
||||
expect(target.to_s).to eq(result)
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue