mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #12780 from owncloud/make-datetimeformattertest-reliable 

Use a fixed timestamp so we dont switch days/years with the getTimestampAgo
This commit is contained in:
Joas Schilling 2014-12-11 14:11:07 +01:00
parent f5348d99e0 affeea8c72
commit 17d68e0638
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/lib/datetimeformatter.php
View File

@ -42,8 +42,7 @@ class DateTimeFormatter extends TestCase {
} }
public function formatTimeSpanData() { public function formatTimeSpanData() {
// use the same time all the time, so the tests are reliable when time would switch $time = 1416916800; // Use a fixed timestamp so we dont switch days/years with the getTimestampAgo
$time = time();
$deL10N = new \OC_L10N('lib', 'de'); $deL10N = new \OC_L10N('lib', 'de');
return array( return array(
array('seconds ago', $time, $time), array('seconds ago', $time, $time),
@ -81,8 +80,7 @@ class DateTimeFormatter extends TestCase {
} }
public function formatDateSpanData() { public function formatDateSpanData() {
// use the same time all the time, so the tests are reliable when time would switch $time = 1416916800; // Use a fixed timestamp so we dont switch days/years with the getTimestampAgo
$time = time();
$deL10N = new \OC_L10N('lib', 'de'); $deL10N = new \OC_L10N('lib', 'de');
return array( return array(
// Normal testing // Normal testing