Download as
Browse Code »

Commit 4a0511999ff36108e8c4c46c818e2c1dab050684

Authored by Leandro Santos
1 parent f759d50d
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

adapting tests for datetime values

Showing 1 changed file with 7 additions and 7 deletions   Show diff stats
test/unit/profile_test.rb
  Diff comments   View file @4a05119
@@ -1563,8 +1563,8 @@ class ProfileTest < ActiveSupport::TestCase @@ -1563,8 +1563,8 @@ class ProfileTest < ActiveSupport::TestCase
1563 1563
1564 should 'list all events' do 1564 should 'list all events' do
1565 profile = fast_create(Profile) 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 profile.events << [event1, event2] 1568 profile.events << [event1, event2]
1569 assert_includes profile.events, event1 1569 assert_includes profile.events, event1
1570 assert_includes profile.events, event2 1570 assert_includes profile.events, event2
@@ -1586,7 +1586,7 @@ class ProfileTest &lt; ActiveSupport::TestCase @@ -1586,7 +1586,7 @@ class ProfileTest &lt; ActiveSupport::TestCase
1586 should 'list events by month' do 1586 should 'list events by month' do
1587 profile = fast_create(Profile) 1587 profile = fast_create(Profile)
1588 1588
1589 - today = Date.new(2014, 03, 2) 1589 + today = DateTime.new(2014, 03, 2)
1590 yesterday_event = Event.new(:name => 'Joao Birthday', :start_date => today - 1.day) 1590 yesterday_event = Event.new(:name => 'Joao Birthday', :start_date => today - 1.day)
1591 today_event = Event.new(:name => 'Ze Birthday', :start_date => today) 1591 today_event = Event.new(:name => 'Ze Birthday', :start_date => today)
1592 tomorrow_event = Event.new(:name => 'Mane Birthday', :start_date => today + 1.day) 1592 tomorrow_event = Event.new(:name => 'Mane Birthday', :start_date => today + 1.day)
@@ -1613,7 +1613,7 @@ class ProfileTest &lt; ActiveSupport::TestCase @@ -1613,7 +1613,7 @@ class ProfileTest &lt; ActiveSupport::TestCase
1613 should 'not list events out of range' do 1613 should 'not list events out of range' do
1614 profile = fast_create(Profile) 1614 profile = fast_create(Profile)
1615 1615
1616 - today = Date.today 1616 + today = DateTime.now
1617 event_in_range1 = Event.new(:name => 'Foswiki Conference', :start_date => today - 2.day, :end_date => today + 2.day) 1617 event_in_range1 = Event.new(:name => 'Foswiki Conference', :start_date => today - 2.day, :end_date => today + 2.day)
1618 event_in_range2 = Event.new(:name => 'Debian Conference', :start_date => today - 2.day, :end_date => today + 3.day) 1618 event_in_range2 = Event.new(:name => 'Debian Conference', :start_date => today - 2.day, :end_date => today + 3.day)
1619 event_out_of_range = Event.new(:name => 'Ze Birthday', :start_date => today - 5.day, :end_date => today - 3.day) 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 &lt; ActiveSupport::TestCase @@ -1627,9 +1627,9 @@ class ProfileTest &lt; ActiveSupport::TestCase
1627 1627
1628 should 'sort events by date' do 1628 should 'sort events by date' do
1629 profile = fast_create(Profile) 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 profile.events << [event1, event2, event3] 1633 profile.events << [event1, event2, event3]
1634 assert_equal [event2, event1, event3], profile.events 1634 assert_equal [event2, event1, event3], profile.events
1635 end 1635 end