summaryrefslogtreecommitdiffstats
path: root/tests/codeigniter
diff options
context:
space:
mode:
authorEric Barnes <eric@ericlbarnes.com>2011-07-13 03:45:40 +0200
committerEric Barnes <eric@ericlbarnes.com>2011-07-13 03:45:40 +0200
commit71644d683d0a15a6f7e04fabd0f51a4200d620b4 (patch)
tree880bbf6aea13d44663f4a84440fbe0dbe52d135e /tests/codeigniter
parentbd4c87543818bd4573308743d44e12b78349ecd0 (diff)
Fixed some small issues in the date tests.
Diffstat (limited to 'tests/codeigniter')
-rw-r--r--tests/codeigniter/helpers/date_helper_test.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/codeigniter/helpers/date_helper_test.php b/tests/codeigniter/helpers/date_helper_test.php
index f6048c324..63cf30bbe 100644
--- a/tests/codeigniter/helpers/date_helper_test.php
+++ b/tests/codeigniter/helpers/date_helper_test.php
@@ -26,7 +26,7 @@ class Date_helper_test extends CI_TestCase
{
$time = time();
$format = 'DATE_RFC822';
- $expected = date("D, d F y G:i:s O", $time);
+ $expected = date("D, d M y H:i:s O", $time);
$this->assertEquals($expected, standard_date($format, $time));
}
@@ -158,7 +158,7 @@ class Date_helper_test extends CI_TestCase
public function test_mysql_to_unix()
{
- $this->assertEquals(1164378225, mysql_to_unix(20061124092345));
+ $this->assertEquals(1344708680, mysql_to_unix(date("YYYY-MM-DD HH:MM:SS")));
}
// ------------------------------------------------------------------------