summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/codeigniter/database/query_builder/get_test.php2
-rw-r--r--tests/codeigniter/helpers/date_helper_test.php12
-rw-r--r--tests/mocks/autoloader.php11
3 files changed, 14 insertions, 11 deletions
diff --git a/tests/codeigniter/database/query_builder/get_test.php b/tests/codeigniter/database/query_builder/get_test.php
index 699d2906a..156027537 100644
--- a/tests/codeigniter/database/query_builder/get_test.php
+++ b/tests/codeigniter/database/query_builder/get_test.php
@@ -41,7 +41,7 @@ class Get_test extends CI_TestCase {
*/
public function test_get_where()
{
- $job1 = $this->db->get('job', array('id' => 1))->result_array();
+ $job1 = $this->db->get_where('job', array('id' => 1))->result_array();
// Dummy jobs contain 1 rows
$this->assertCount(1, $job1);
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)
);
diff --git a/tests/mocks/autoloader.php b/tests/mocks/autoloader.php
index e3ff7a8bd..be1c2220c 100644
--- a/tests/mocks/autoloader.php
+++ b/tests/mocks/autoloader.php
@@ -69,16 +69,21 @@ function autoload($class)
}
}
- $file = isset($file) ? $file : $dir.$class.'.php';
+ $file = (isset($file)) ? $file : $dir.$class.'.php';
if ( ! file_exists($file))
{
$trace = debug_backtrace();
- // If the autoload call came from `class_exists` or `file_exists`,
- // we skipped and return FALSE
if ($trace[2]['function'] === 'class_exists' OR $trace[2]['function'] === 'file_exists')
{
+ // If the autoload call came from `class_exists` or `file_exists`,
+ // we skipped and return FALSE
+ return FALSE;
+ }
+ elseif (($autoloader = spl_autoload_functions()) && end($autoloader) !== __FUNCTION__)
+ {
+ // If there was other custom autoloader, passed away
return FALSE;
}