Commit 4a0511999ff36108e8c4c46c818e2c1dab050684
1 parent
f759d50d
Exists in
master
and in
6 other branches
adapting tests for datetime values
Showing
1 changed file
with
7 additions
and
7 deletions
Show diff stats
test/unit/profile_test.rb
... | ... | @@ -1563,8 +1563,8 @@ class ProfileTest < ActiveSupport::TestCase |
1563 | 1563 | |
1564 | 1564 | should 'list all events' do |
1565 | 1565 | profile = fast_create(Profile) |
1566 | - event1 = Event.new(:name => 'Ze Birthday', :start_date => Date.today) | |
1567 | - event2 = Event.new(:name => 'Mane Birthday', :start_date => Date.today >> 1) | |
1566 | + event1 = Event.new(:name => 'Ze Birthday', :start_date => DateTime.now) | |
1567 | + event2 = Event.new(:name => 'Mane Birthday', :start_date => DateTime.now >> 1) | |
1568 | 1568 | profile.events << [event1, event2] |
1569 | 1569 | assert_includes profile.events, event1 |
1570 | 1570 | assert_includes profile.events, event2 |
... | ... | @@ -1586,7 +1586,7 @@ class ProfileTest < ActiveSupport::TestCase |
1586 | 1586 | should 'list events by month' do |
1587 | 1587 | profile = fast_create(Profile) |
1588 | 1588 | |
1589 | - today = Date.new(2014, 03, 2) | |
1589 | + today = DateTime.new(2014, 03, 2) | |
1590 | 1590 | yesterday_event = Event.new(:name => 'Joao Birthday', :start_date => today - 1.day) |
1591 | 1591 | today_event = Event.new(:name => 'Ze Birthday', :start_date => today) |
1592 | 1592 | tomorrow_event = Event.new(:name => 'Mane Birthday', :start_date => today + 1.day) |
... | ... | @@ -1613,7 +1613,7 @@ class ProfileTest < ActiveSupport::TestCase |
1613 | 1613 | should 'not list events out of range' do |
1614 | 1614 | profile = fast_create(Profile) |
1615 | 1615 | |
1616 | - today = Date.today | |
1616 | + today = DateTime.now | |
1617 | 1617 | event_in_range1 = Event.new(:name => 'Foswiki Conference', :start_date => today - 2.day, :end_date => today + 2.day) |
1618 | 1618 | event_in_range2 = Event.new(:name => 'Debian Conference', :start_date => today - 2.day, :end_date => today + 3.day) |
1619 | 1619 | event_out_of_range = Event.new(:name => 'Ze Birthday', :start_date => today - 5.day, :end_date => today - 3.day) |
... | ... | @@ -1627,9 +1627,9 @@ class ProfileTest < ActiveSupport::TestCase |
1627 | 1627 | |
1628 | 1628 | should 'sort events by date' do |
1629 | 1629 | profile = fast_create(Profile) |
1630 | - event1 = Event.new(:name => 'Noosfero Hackaton', :start_date => Date.today) | |
1631 | - event2 = Event.new(:name => 'Debian Day', :start_date => Date.today - 1) | |
1632 | - event3 = Event.new(:name => 'Fisl 10', :start_date => Date.today + 1) | |
1630 | + event1 = Event.new(:name => 'Noosfero Hackaton', :start_date => DateTime.now) | |
1631 | + event2 = Event.new(:name => 'Debian Day', :start_date => DateTime.now - 1) | |
1632 | + event3 = Event.new(:name => 'Fisl 10', :start_date => DateTime.now + 1) | |
1633 | 1633 | profile.events << [event1, event2, event3] |
1634 | 1634 | assert_equal [event2, event1, event3], profile.events |
1635 | 1635 | end | ... | ... |