tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.1'

Browse Source
This commit is contained in:
Ingo Schommer 2012-12-14 11:39:21 +01:00
commit 11987ac460
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/model/DateTest.php
View File

@ -188,8 +188,8 @@ class DateTest extends SapphireTest {
SS_Datetime::set_mock_now('2000-12-31 00:00:00'); SS_Datetime::set_mock_now('2000-12-31 00:00:00');
$this->assertEquals( $this->assertEquals(
'in 100 years', 'in 10 years',
DBField::create_field('Date', '2100-12-31')->Ago(), DBField::create_field('Date', '2010-12-31')->Ago(),
'Exact past match on years' 'Exact past match on years'
); );

4
tests/model/DatetimeTest.php
View File

@ -135,8 +135,8 @@ class SS_DatetimeTest extends SapphireTest {
SS_Datetime::set_mock_now('2000-12-31 00:00:00'); SS_Datetime::set_mock_now('2000-12-31 00:00:00');
$this->assertEquals( $this->assertEquals(
'in 100 years', 'in 10 years',
DBField::create_field('SS_Datetime', '2100-12-31 12:00:00')->Ago(), DBField::create_field('SS_Datetime', '2010-12-31 12:00:00')->Ago(),
'Exact past match on years' 'Exact past match on years'
); );