summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--system/libraries/Unit_test.php2
-rw-r--r--user_guide/changelog.html1
-rw-r--r--user_guide/libraries/unit_testing.html1
3 files changed, 3 insertions, 1 deletions
diff --git a/system/libraries/Unit_test.php b/system/libraries/Unit_test.php
index d1db6297b..29a7fa383 100644
--- a/system/libraries/Unit_test.php
+++ b/system/libraries/Unit_test.php
@@ -59,7 +59,7 @@ class CI_Unit_test {
return FALSE;
}
- if (in_array($expected, array('is_string', 'is_bool', 'is_true', 'is_false', 'is_int', 'is_numeric', 'is_float', 'is_double', 'is_array', 'is_null'), TRUE))
+ if (in_array($expected, array('is_object', 'is_string', 'is_bool', 'is_true', 'is_false', 'is_int', 'is_numeric', 'is_float', 'is_double', 'is_array', 'is_null'), TRUE))
{
$expected = str_replace('is_float', 'is_double', $expected);
$result = ($expected($test)) ? TRUE : FALSE;
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index ed987ff3d..3ff05bb05 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -67,6 +67,7 @@ SVN Revision: </p>
<li>Documented a second argument in the <kbd>decode()</kbd> function for the <a href="libraries/encryption.html">Encryption Class</a>.</li>
<li>Fixed an error in the Zip library that didn't allow downloading on PHP 4 servers.</li>
<li>Fixed a language key in the profiler: "profiler_no_memory_usage" to "profiler_no_memory".</li>
+ <li>Added "is_object" into the list of unit tests capable of being run.</li>
</ul>
</li>
<li>Database
diff --git a/user_guide/libraries/unit_testing.html b/user_guide/libraries/unit_testing.html
index 21666071a..a30343fb5 100644
--- a/user_guide/libraries/unit_testing.html
+++ b/user_guide/libraries/unit_testing.html
@@ -104,6 +104,7 @@ $this->unit->run($test, $expected_result, $test_name);</code>
as the result. Here is a list of allowed comparison types:</p>
<ul>
+<li>is_object</li>
<li>is_string</li>
<li>is_bool</li>
<li>is_true</li>