summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-10-05 12:08:53 +0200
committerAndrey Andreev <narf@bofh.bg>2012-10-05 12:08:53 +0200
commit6dba0cded0999ccfecce07b55df2c11e3e6cce86 (patch)
tree8a595af2bd1980e4a475f5db5f4ce9f7bc8cd170
parentf20bca9e065751fc271cb650f9246073492eccea (diff)
parentfad389699e2e851af09c1f4508646194c2f45660 (diff)
Merge pull request #1848 from blyxx86/develop
Unit test bugfix to allow setting columns for report method.
-rw-r--r--system/libraries/Unit_test.php5
-rw-r--r--user_guide_src/source/changelog.rst1
2 files changed, 6 insertions, 0 deletions
diff --git a/system/libraries/Unit_test.php b/system/libraries/Unit_test.php
index 70ad8dc41..435c32693 100644
--- a/system/libraries/Unit_test.php
+++ b/system/libraries/Unit_test.php
@@ -240,6 +240,11 @@ class CI_Unit_test {
{
foreach ($val as $k => $v)
{
+ if ( ! in_array($k, $this->_test_items_visible))
+ {
+ continue;
+ }
+
if (FALSE !== ($line = $CI->lang->line(strtolower('ut_'.$v))))
{
$v = $line;
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 0316c38ab..cafdf1083 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -349,6 +349,7 @@ Bug fixes for 3.0
- Fixed a bug in SQLSRV's ``affected_rows()`` method where an erroneous function name was used.
- Fixed a bug (#1000) - Change syntax of ``$view_file`` to ``$_ci_view_file`` to prevent being overwritten by application.
- Fixed a bug (#1757) - :doc:`Directory Helper <helpers/directory_helper>` function ``directory_map()`` was skipping files and directories named *0*.
+- Fixed a bug (#395) - :doc:`Unit Testing Library <libraries/Unit_test>` method ``result()`` didn't properly check array result columns against _test_items_visible when called from ``report()`` method.
- Fixed a bug (#1789) - :doc:`Database Library <libraries/database>` method ``escape_str()`` escaped quote characters in LIKE conditions twice under MySQL.
Version 2.1.2