From b475fd6aae8de79c7ae7c62be14b61991d1522a0 Mon Sep 17 00:00:00 2001 From: Leandro Nunes dos Santos Date: Tue, 26 Jul 2016 15:30:40 -0300 Subject: [PATCH] consider local time zone in tests --- test/api/activities_test.rb | 6 +++--- test/api/articles_test.rb | 4 ++-- test/api/communities_test.rb | 8 ++++---- test/api/task_test.rb | 6 +++--- test/unit/article_test.rb | 8 ++++---- test/unit/dates_helper_test.rb | 2 +- test/unit/forum_test.rb | 2 +- test/unit/person_notifier_test.rb | 6 +++--- test/unit/profile_test.rb | 42 +++++++++++++++++++++--------------------- test/unit/task_test.rb | 8 ++++---- test/unit/time_scopes.rb | 16 ++++++++-------- 11 files changed, 54 insertions(+), 54 deletions(-) diff --git a/test/api/activities_test.rb b/test/api/activities_test.rb index c7f691a..303ad68 100644 --- a/test/api/activities_test.rb +++ b/test/api/activities_test.rb @@ -167,14 +167,14 @@ class ActivitiesTest < ActiveSupport::TestCase ActionTracker::Record.destroy_all a1 = create_activity(:target => person) a2 = create_activity(:target => person) - a2.updated_at = Time.zone.now + a2.updated_at = Time.now.in_time_zone a2.save - a1.updated_at = Time.zone.now + 3.hours + a1.updated_at = Time.now.in_time_zone + 3.hours a1.save! - params[:timestamp] = Time.zone.now + 1.hours + params[:timestamp] = Time.now.in_time_zone + 1.hours get "/api/v1/profiles/#{person.id}/activities?#{params.to_query}" json = JSON.parse(last_response.body) diff --git a/test/api/articles_test.rb b/test/api/articles_test.rb index 9b98227..49781b4 100644 --- a/test/api/articles_test.rb +++ b/test/api/articles_test.rb @@ -335,10 +335,10 @@ class ArticlesTest < ActiveSupport::TestCase article_one = fast_create(Article, :profile_id => user.person.id, :name => "Another thing") article_two = fast_create(Article, :profile_id => user.person.id, :name => "Some thing") - article_one.updated_at = Time.now + 3.hours + article_one.updated_at = Time.now.in_time_zone + 3.hours article_one.save! - params[:timestamp] = Time.now + 1.hours + params[:timestamp] = Time.now.in_time_zone + 1.hours get "/api/v1/articles/?#{params.to_query}" json = JSON.parse(last_response.body) diff --git a/test/api/communities_test.rb b/test/api/communities_test.rb index bf1838f..c502dc1 100644 --- a/test/api/communities_test.rb +++ b/test/api/communities_test.rb @@ -164,10 +164,10 @@ class CommunitiesTest < ActiveSupport::TestCase community1 = fast_create(Community, :public_profile => true) community2 = fast_create(Community) - community1.updated_at = Time.now + 3.hours + community1.updated_at = Time.now.in_time_zone + 3.hours community1.save! - params[:timestamp] = Time.now + 1.hours + params[:timestamp] = Time.now.in_time_zone + 1.hours get "/api/v1/communities/?#{params.to_query}" json = JSON.parse(last_response.body) @@ -299,10 +299,10 @@ class CommunitiesTest < ActiveSupport::TestCase community1 = fast_create(Community, :public_profile => true) community2 = fast_create(Community) - community1.updated_at = Time.now + 3.hours + community1.updated_at = Time.now.in_time_zone + 3.hours community1.save! - params[:timestamp] = Time.now + 1.hours + params[:timestamp] = Time.now.in_time_zone + 1.hours get "/api/v1/communities/?#{params.to_query}" json = JSON.parse(last_response.body) diff --git a/test/api/task_test.rb b/test/api/task_test.rb index 08cf941..bdccbb6 100644 --- a/test/api/task_test.rb +++ b/test/api/task_test.rb @@ -143,13 +143,13 @@ class TasksTest < ActiveSupport::TestCase should 'list tasks with timestamp' do t1 = create(Task, :requestor => person, :target => person) - t2 = create(Task, :requestor => person, :target => person, :created_at => Time.zone.now) + t2 = create(Task, :requestor => person, :target => person, :created_at => Time.now.in_time_zone) - t1.created_at = Time.zone.now + 3.hours + t1.created_at = Time.now.in_time_zone + 3.hours t1.save! - params[:timestamp] = Time.zone.now + 1.hours + params[:timestamp] = Time.now.in_time_zone + 1.hours get "/api/v1/tasks/?#{params.to_query}" json = JSON.parse(last_response.body) diff --git a/test/unit/article_test.rb b/test/unit/article_test.rb index 82a4fdf..ce46e2d 100644 --- a/test/unit/article_test.rb +++ b/test/unit/article_test.rb @@ -226,7 +226,7 @@ class ArticleTest < ActiveSupport::TestCase p = create_user('usr1').person Article.destroy_all - now = Time.now + now = Time.now.in_time_zone first = create(Article, :name => 'first', :published => true, :created_at => now, :published_at => now, :profile_id => p.id) second = create(Article, :name => 'second', :published => true, :updated_at => now, :published_at => now + 1.second, :profile_id => p.id) @@ -728,7 +728,7 @@ class ArticleTest < ActiveSupport::TestCase end should 'fill published_at with current date if not set' do - now = Time.now + now = Time.now.in_time_zone Time.stubs(:now).returns(now) a = create(Article, :name => 'Published at', :profile_id => profile.id) assert_equal now, a.published_at @@ -1410,7 +1410,7 @@ class ArticleTest < ActiveSupport::TestCase should 'retrieve latest info from topic when has no comments' do forum = fast_create(Forum, :name => 'Forum test', :profile_id => profile.id) - post = fast_create(TextileArticle, :name => 'First post', :profile_id => profile.id, :parent_id => forum.id, :updated_at => Time.now, :author_id => profile.id) + post = fast_create(TextileArticle, :name => 'First post', :profile_id => profile.id, :parent_id => forum.id, :updated_at => Time.now.in_time_zone, :author_id => profile.id) assert_equal post.updated_at, post.info_from_last_update[:date] assert_equal profile.name, post.info_from_last_update[:author_name] assert_equal profile.url, post.info_from_last_update[:author_url] @@ -1418,7 +1418,7 @@ class ArticleTest < ActiveSupport::TestCase should 'retrieve latest info from comment when has comments' do forum = fast_create(Forum, :name => 'Forum test', :profile_id => profile.id) - post = fast_create(TextileArticle, :name => 'First post', :profile_id => profile.id, :parent_id => forum.id, :updated_at => Time.now) + post = fast_create(TextileArticle, :name => 'First post', :profile_id => profile.id, :parent_id => forum.id, :updated_at => Time.now.in_time_zone) post.comments << build(Comment, :name => 'Guest', :email => 'guest@example.com', :title => 'test comment', :body => 'hello!') assert_equal post.comments.last.created_at, post.info_from_last_update[:date] assert_equal "Guest", post.info_from_last_update[:author_name] diff --git a/test/unit/dates_helper_test.rb b/test/unit/dates_helper_test.rb index 42d3370..5454023 100644 --- a/test/unit/dates_helper_test.rb +++ b/test/unit/dates_helper_test.rb @@ -147,7 +147,7 @@ class DatesHelperTest < ActiveSupport::TestCase end should 'show how long it has passed since a specific date' do - date = Time.zone.now + date = Time.now.in_time_zone assert_equal show_date(date, false, false, true), time_ago_in_words(date) end diff --git a/test/unit/forum_test.rb b/test/unit/forum_test.rb index a4640f2..913357e 100644 --- a/test/unit/forum_test.rb +++ b/test/unit/forum_test.rb @@ -78,7 +78,7 @@ class ForumTest < ActiveSupport::TestCase forum = fast_create(Forum, :profile_id => p.id, :name => 'Forum test') newer = create(TextileArticle, :name => 'Post 2', :parent => forum, :profile => p) older = create(TextileArticle, :name => 'Post 1', :parent => forum, :profile => p) - older.updated_at = Time.now - 1.month + older.updated_at = Time.now.in_time_zone - 1.month older.stubs(:record_timestamps).returns(false) older.save! assert_equal [newer, older], forum.posts diff --git a/test/unit/person_notifier_test.rb b/test/unit/person_notifier_test.rb index 6b1c4a1..c97c506 100644 --- a/test/unit/person_notifier_test.rb +++ b/test/unit/person_notifier_test.rb @@ -61,7 +61,7 @@ class PersonNotifierTest < ActiveSupport::TestCase @community.add_member(@member) ActionTracker::Record.delete_all comment = Comment.create!(:author => @admin, :title => 'test comment', :body => 'body!', :source => @article ) - @member.last_notification = DateTime.now + 1.day + @member.last_notification = DateTime.now.in_time_zone + 1.day assert_no_difference 'ActionMailer::Base.deliveries.count' do notify end @@ -88,7 +88,7 @@ class PersonNotifierTest < ActiveSupport::TestCase should 'schedule next mail at notification time' do @member.notification_time = 12 - time = Time.now + time = Time.now.in_time_zone @member.notifier.schedule_next_notification_mail job = Delayed::Job.handler_like(PersonNotifier::NotifyJob.name).last assert job.run_at >= time + @member.notification_time.hours @@ -140,7 +140,7 @@ class PersonNotifierTest < ActiveSupport::TestCase end should 'reschedule with changed notification time' do - time = Time.now + time = Time.now.in_time_zone assert_difference 'job_count(PersonNotifier::NotifyJob)', 1 do @member.notification_time = 2 @member.save! diff --git a/test/unit/profile_test.rb b/test/unit/profile_test.rb index 559bb0c..d71d4c7 100644 --- a/test/unit/profile_test.rb +++ b/test/unit/profile_test.rb @@ -1576,8 +1576,8 @@ class ProfileTest < ActiveSupport::TestCase should 'list all events' do profile = fast_create(Profile) - event1 = Event.new(:name => 'Ze Birthday', :start_date => DateTime.now) - event2 = Event.new(:name => 'Mane Birthday', :start_date => DateTime.now >> 1) + event1 = Event.new(:name => 'Ze Birthday', :start_date => DateTime.now.in_time_zone) + event2 = Event.new(:name => 'Mane Birthday', :start_date => DateTime.now.in_time_zone >> 1) profile.events << [event1, event2] assert_includes profile.events, event1 assert_includes profile.events, event2 @@ -1586,7 +1586,7 @@ class ProfileTest < ActiveSupport::TestCase should 'list events by day' do profile = fast_create(Profile) - today = DateTime.now + today = DateTime.now.in_time_zone yesterday_event = Event.new(:name => 'Joao Birthday', :start_date => today - 1.day) today_event = Event.new(:name => 'Ze Birthday', :start_date => today) tomorrow_event = Event.new(:name => 'Mane Birthday', :start_date => today + 1.day) @@ -1612,7 +1612,7 @@ class ProfileTest < ActiveSupport::TestCase should 'list events in a range' do profile = fast_create(Profile) - today = DateTime.now + today = DateTime.now.in_time_zone event_in_range = Event.new(:name => 'Noosfero Conference', :start_date => today - 2.day, :end_date => today + 2.day) event_in_day = Event.new(:name => 'Ze Birthday', :start_date => today) @@ -1626,7 +1626,7 @@ class ProfileTest < ActiveSupport::TestCase should 'not list events out of range' do profile = fast_create(Profile) - today = DateTime.now + today = DateTime.now.in_time_zone event_in_range1 = Event.new(:name => 'Foswiki Conference', :start_date => today - 2.day, :end_date => today + 2.day) event_in_range2 = Event.new(:name => 'Debian Conference', :start_date => today - 2.day, :end_date => today + 3.day) event_out_of_range = Event.new(:name => 'Ze Birthday', :start_date => today - 5.day, :end_date => today - 3.day) @@ -1640,9 +1640,9 @@ class ProfileTest < ActiveSupport::TestCase should 'sort events by date' do profile = fast_create(Profile) - event1 = Event.new(:name => 'Noosfero Hackaton', :start_date => DateTime.now) - event2 = Event.new(:name => 'Debian Day', :start_date => DateTime.now - 1) - event3 = Event.new(:name => 'Fisl 10', :start_date => DateTime.now + 1) + event1 = Event.new(:name => 'Noosfero Hackaton', :start_date => DateTime.now.in_time_zone) + event2 = Event.new(:name => 'Debian Day', :start_date => DateTime.now.in_time_zone - 1) + event3 = Event.new(:name => 'Fisl 10', :start_date => DateTime.now.in_time_zone + 1) profile.events << [event1, event2, event3] assert_equal [event2, event1, event3], profile.events end @@ -1708,7 +1708,7 @@ class ProfileTest < ActiveSupport::TestCase should 'find more recent profile' do Profile.delete_all p1 = fast_create(Profile, :created_at => 4.days.ago) - p2 = fast_create(Profile, :created_at => Time.now) + p2 = fast_create(Profile, :created_at => Time.now.in_time_zone) p3 = fast_create(Profile, :created_at => 2.days.ago) assert_equal [p2,p3,p1] , Profile.more_recent @@ -1739,19 +1739,19 @@ class ProfileTest < ActiveSupport::TestCase should "return one activity on label if the profile has one action" do p = fast_create(Profile) - fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => p, :created_at => Time.now) + fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => p, :created_at => Time.now.in_time_zone) assert_equal 1, p.recent_actions.count assert_equal "one activity", p.more_active_label end should "return number of activities on label if the profile has more than one action" do p = fast_create(Profile) - fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => p, :created_at => Time.now) - fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => p, :created_at => Time.now) + fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => p, :created_at => Time.now.in_time_zone) + fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => p, :created_at => Time.now.in_time_zone) assert_equal 2, p.recent_actions.count assert_equal "2 activities", p.more_active_label - fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => p, :created_at => Time.now) + fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => p, :created_at => Time.now.in_time_zone) assert_equal 3, p.recent_actions.count assert_equal "3 activities", p.more_active_label end @@ -2187,10 +2187,10 @@ class ProfileTest < ActiveSupport::TestCase end should 'fetch profiles older than a specific date' do - p1 = fast_create(Profile, :created_at => Time.now) - p2 = fast_create(Profile, :created_at => Time.now - 1.day) - p3 = fast_create(Profile, :created_at => Time.now - 2.days) - p4 = fast_create(Profile, :created_at => Time.now - 3.days) + p1 = fast_create(Profile, :created_at => Time.now.in_time_zone) + p2 = fast_create(Profile, :created_at => Time.now.in_time_zone - 1.day) + p3 = fast_create(Profile, :created_at => Time.now.in_time_zone - 2.days) + p4 = fast_create(Profile, :created_at => Time.now.in_time_zone - 3.days) profiles = Profile.older_than(p2.created_at) @@ -2201,10 +2201,10 @@ class ProfileTest < ActiveSupport::TestCase end should 'fetch profiles younger than a specific date' do - p1 = fast_create(Profile, :created_at => Time.now) - p2 = fast_create(Profile, :created_at => Time.now - 1.day) - p3 = fast_create(Profile, :created_at => Time.now - 2.days) - p4 = fast_create(Profile, :created_at => Time.now - 3.days) + p1 = fast_create(Profile, :created_at => Time.now.in_time_zone) + p2 = fast_create(Profile, :created_at => Time.now.in_time_zone - 1.day) + p3 = fast_create(Profile, :created_at => Time.now.in_time_zone - 2.days) + p4 = fast_create(Profile, :created_at => Time.now.in_time_zone - 3.days) profiles = Profile.younger_than(p3.created_at) diff --git a/test/unit/task_test.rb b/test/unit/task_test.rb index 7987142..63fae76 100644 --- a/test/unit/task_test.rb +++ b/test/unit/task_test.rb @@ -342,10 +342,10 @@ class TaskTest < ActiveSupport::TestCase should 'order tasks by some attribute correctly' do Task.destroy_all - t1 = fast_create(Task, :status => 4, :created_at => Time.now + 1.hour) - t2 = fast_create(Task, :status => 3, :created_at => Time.now + 2.hour) - t3 = fast_create(Task, :status => 2, :created_at => Time.now + 3.hour) - t4 = fast_create(Task, :status => 1, :created_at => Time.now + 4.hour) + t1 = fast_create(Task, :status => 4, :created_at => Time.now.in_time_zone + 1.hour) + t2 = fast_create(Task, :status => 3, :created_at => Time.now.in_time_zone + 2.hour) + t3 = fast_create(Task, :status => 2, :created_at => Time.now.in_time_zone + 3.hour) + t4 = fast_create(Task, :status => 1, :created_at => Time.now.in_time_zone + 4.hour) assert_equal [t1,t2,t3,t4], Task.order_by('created_at', 'asc') assert_equal [t4,t3,t2,t1], Task.order_by('created_at', 'desc') diff --git a/test/unit/time_scopes.rb b/test/unit/time_scopes.rb index d67eb15..7ddff17 100644 --- a/test/unit/time_scopes.rb +++ b/test/unit/time_scopes.rb @@ -5,10 +5,10 @@ require_relative "../test_helper" class TimeScopesTest < ActiveSupport::TestCase should 'fetch profiles older than a specific date' do - p1 = fast_create(Profile, :created_at => Time.now) - p2 = fast_create(Profile, :created_at => Time.now - 1.day) - p3 = fast_create(Profile, :created_at => Time.now - 2.days) - p4 = fast_create(Profile, :created_at => Time.now - 3.days) + p1 = fast_create(Profile, :created_at => Time.now.in_time_zone) + p2 = fast_create(Profile, :created_at => Time.now.in_time_zone - 1.day) + p3 = fast_create(Profile, :created_at => Time.now.in_time_zone - 2.days) + p4 = fast_create(Profile, :created_at => Time.now.in_time_zone - 3.days) profiles = Profile.older_than(p2.created_at) @@ -19,10 +19,10 @@ class TimeScopesTest < ActiveSupport::TestCase end should 'fetch profiles younger than a specific date' do - p1 = fast_create(Profile, :created_at => Time.now) - p2 = fast_create(Profile, :created_at => Time.now - 1.day) - p3 = fast_create(Profile, :created_at => Time.now - 2.days) - p4 = fast_create(Profile, :created_at => Time.now - 3.days) + p1 = fast_create(Profile, :created_at => Time.now.in_time_zone) + p2 = fast_create(Profile, :created_at => Time.now.in_time_zone - 1.day) + p3 = fast_create(Profile, :created_at => Time.now.in_time_zone - 2.days) + p4 = fast_create(Profile, :created_at => Time.now.in_time_zone - 3.days) profiles = Profile.younger_than(p3.created_at) -- libgit2 0.21.2