summaryrefslogtreecommitdiffstats
path: root/tests/codeigniter/helpers
diff options
context:
space:
mode:
authorTimothy Warren <tim@timshomepage.net>2012-06-27 14:02:13 +0200
committerTimothy Warren <tim@timshomepage.net>2012-06-27 14:02:13 +0200
commit13077951b63cf9858dc14ec9cab7f2b53ec88a3e (patch)
treee1fc50ddb8c0a4103c945f15d674d85c6655231b /tests/codeigniter/helpers
parent9128231452f3ccea857a848b61bd0e6e9e319737 (diff)
parentb66664b5decd68de50ae6c239c8d995d6c088d94 (diff)
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into email
Diffstat (limited to 'tests/codeigniter/helpers')
-rw-r--r--tests/codeigniter/helpers/date_helper_test.php12
1 files changed, 5 insertions, 7 deletions
diff --git a/tests/codeigniter/helpers/date_helper_test.php b/tests/codeigniter/helpers/date_helper_test.php
index 1d397ac81..4e01b1aa3 100644
--- a/tests/codeigniter/helpers/date_helper_test.php
+++ b/tests/codeigniter/helpers/date_helper_test.php
@@ -48,11 +48,9 @@ class Date_helper_test extends CI_TestCase {
*/
- $this->ci_set_config('time_reference', 'UTC');
-
$this->assertEquals(
- gmmktime(date('G'), date('i'), date('s'), date('n'), date('j'), date('Y')),
- now()
+ mktime(gmdate('G'), gmdate('i'), gmdate('s'), gmdate('n'), gmdate('j'), gmdate('Y')),
+ now('UTC')
);
}
@@ -196,9 +194,9 @@ class Date_helper_test extends CI_TestCase {
public function test_local_to_gmt()
{
$this->assertEquals(
- gmmktime(
- date('G', $this->time), date('i', $this->time), date('s', $this->time),
- date('n', $this->time), date('j', $this->time), date('Y', $this->time)
+ mktime(
+ gmdate('G', $this->time), gmdate('i', $this->time), gmdate('s', $this->time),
+ gmdate('n', $this->time), gmdate('j', $this->time), gmdate('Y', $this->time)
),
local_to_gmt($this->time)
);