summaryrefslogtreecommitdiffstats
path: root/tests/codeigniter
diff options
context:
space:
mode:
authorTimothy Warren <tim@timshomepage.net>2012-06-14 13:53:17 +0200
committerTimothy Warren <tim@timshomepage.net>2012-06-14 13:53:17 +0200
commit9128231452f3ccea857a848b61bd0e6e9e319737 (patch)
tree8fc1de596a58a1d1cc1d7c4acaf5596649dda5ea /tests/codeigniter
parentb30a7c0d53c5dae5dab2311f777d67f639a5cee4 (diff)
parent19c83f6ec6dd29b2ecbeba87801d275f4e247678 (diff)
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into email
Diffstat (limited to 'tests/codeigniter')
-rw-r--r--tests/codeigniter/core/URI_test.php5
-rw-r--r--tests/codeigniter/helpers/date_helper_test.php25
2 files changed, 23 insertions, 7 deletions
diff --git a/tests/codeigniter/core/URI_test.php b/tests/codeigniter/core/URI_test.php
index 0ba694b46..60ed1a4e9 100644
--- a/tests/codeigniter/core/URI_test.php
+++ b/tests/codeigniter/core/URI_test.php
@@ -9,6 +9,10 @@ class URI_test extends CI_TestCase {
// --------------------------------------------------------------------
+ /* As of the following commit, _set_uri_string() is a protected method:
+
+ https://github.com/EllisLab/CodeIgniter/commit/d461934184d95b0cfb2feec93f27b621ef72a5c2
+
public function test_set_uri_string()
{
// Slashes get killed
@@ -18,6 +22,7 @@ class URI_test extends CI_TestCase {
$this->uri->_set_uri_string('nice/uri');
$this->assertEquals('nice/uri', $this->uri->uri_string);
}
+ */
// --------------------------------------------------------------------
diff --git a/tests/codeigniter/helpers/date_helper_test.php b/tests/codeigniter/helpers/date_helper_test.php
index 4b747b864..1d397ac81 100644
--- a/tests/codeigniter/helpers/date_helper_test.php
+++ b/tests/codeigniter/helpers/date_helper_test.php
@@ -13,6 +13,8 @@ class Date_helper_test extends CI_TestCase {
public function test_now_local()
{
+ /*
+
// This stub job, is simply to cater $config['time_reference']
$config = $this->getMock('CI_Config');
$config->expects($this->any())
@@ -22,25 +24,34 @@ class Date_helper_test extends CI_TestCase {
// Add the stub to our test instance
$this->ci_instance_var('config', $config);
+ */
+
+ $this->ci_set_config('time_reference', 'local');
+
$this->assertEquals(time(), now());
}
// ------------------------------------------------------------------------
- public function test_now_gmt()
+ public function test_now_utc()
{
+ /*
+
// This stub job, is simply to cater $config['time_reference']
$config = $this->getMock('CI_Config');
$config->expects($this->any())
->method('item')
- ->will($this->returnValue('gmt'));
+ ->will($this->returnValue('UTC'));
// Add the stub to our stdClass
$this->ci_instance_var('config', $config);
- $t = time();
+ */
+
+ $this->ci_set_config('time_reference', 'UTC');
+
$this->assertEquals(
- mktime(gmdate('H', $t), gmdate('i', $t), gmdate('s', $t), gmdate('m', $t), gmdate('d', $t), gmdate('Y', $t)),
+ gmmktime(date('G'), date('i'), date('s'), date('n'), date('j'), date('Y')),
now()
);
}
@@ -185,9 +196,9 @@ class Date_helper_test extends CI_TestCase {
public function test_local_to_gmt()
{
$this->assertEquals(
- mktime(
- gmdate('H', $this->time), gmdate('i', $this->time), gmdate('s', $this->time),
- gmdate('m', $this->time), gmdate('d', $this->time), gmdate('Y', $this->time)
+ 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)
),
local_to_gmt($this->time)
);