From 7fe9dac8c5a316c19bce25aaaa2cd0ddb6e72c12 Mon Sep 17 00:00:00 2001
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Tue, 19 Jun 2012 02:11:16 +0000
Subject: [PATCH] Merge r9871 from trunk

fix test_global_index of functional activities controller test fails around UTC 00:00.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9873 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 test/functional/activities_controller_test.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/functional/activities_controller_test.rb b/test/functional/activities_controller_test.rb
index 126119bc1..eb2770982 100644
--- a/test/functional/activities_controller_test.rb
+++ b/test/functional/activities_controller_test.rb
@@ -55,13 +55,16 @@ class ActivitiesControllerTest < ActionController::TestCase
   end
 
   def test_global_index
+    @request.session[:user_id] = 1
     get :index
     assert_response :success
     assert_template 'index'
     assert_not_nil assigns(:events_by_day)
 
+    i5 = Issue.find(5)
+    d5 = User.find(1).time_to_date(i5.created_on)
     assert_tag :tag => "h3",
-               :content => /#{5.day.ago.to_date.day}/,
+               :content => /#{d5.day}/,
                :sibling => { :tag => "dl",
                  :child => { :tag => "dt",
                    :attributes => { :class => /issue/ },
-- 
2.39.5