summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2012-03-09 18:21:08 +0100
committerPhil Sturgeon <email@philsturgeon.co.uk>2012-03-09 18:21:08 +0100
commit7dfee6f194dac87371d40872a94e20f572c0b200 (patch)
treecca16174d0a05a195c4d2f72c328f8e1ccad8755 /tests
parent0f2cb79b976086cb73140c25f4c568e865177426 (diff)
parenta03cbc5d2d2747b48be47c6fdef51f338701c583 (diff)
Merge pull request #1055 from toopay/unit-tests
Unit tests
Diffstat (limited to 'tests')
-rw-r--r--tests/Bootstrap.php10
-rw-r--r--tests/README.md2
2 files changed, 2 insertions, 10 deletions
diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php
index 657671ab0..94dafdce4 100644
--- a/tests/Bootstrap.php
+++ b/tests/Bootstrap.php
@@ -17,14 +17,4 @@ define('APPPATH', PROJECT_BASE.'application/');
require_once $dir.'/lib/common.php';
require_once $dir.'/lib/ci_testcase.php';
-
-// Omit files in the PEAR & PHP Paths from ending up in the coverage report
-PHP_CodeCoverage_Filter::getInstance()->addDirectoryToBlacklist(PEAR_INSTALL_DIR);
-PHP_CodeCoverage_Filter::getInstance()->addDirectoryToBlacklist(PHP_LIBDIR);
-PHP_CodeCoverage_Filter::getInstance()->addDirectoryToBlacklist(PROJECT_BASE.'tests');
-
-// Omit Tests from the coverage reports.
-// PHP_CodeCoverage_Filter::getInstance()->addDirectoryToWhiteList('../system/core');
-PHP_CodeCoverage_Filter::getInstance()->addFileToBlackList('../system/core/CodeIgniter.php');
-
unset($dir); \ No newline at end of file
diff --git a/tests/README.md b/tests/README.md
index ad8051618..6d83c34d8 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -1,5 +1,7 @@
# CodeIgniter Unit Tests #
+Status : [![Build Status](https://secure.travis-ci.org/EllisLab/CodeIgniter.png?branch=feature/unit-tests)](http://travis-ci.org/EllisLab/CodeIgniter)
+
*Do not merge to default until these issues have been addressed*
- Clean up naming conventions