diff options
| author | Alex Bilbie <alex@alexbilbie.com> | 2012-09-19 17:17:18 +0200 |
|---|---|---|
| committer | Alex Bilbie <alex@alexbilbie.com> | 2012-09-19 17:17:18 +0200 |
| commit | a434f90f1fb15abc494b18126dc3563f12d2b9b3 (patch) | |
| tree | a80f7fe213c708c7282f2fbe791a5d7861dd5d32 /tests | |
| parent | 935d42f91a55a409ca02857ef1ef660c921ff1db (diff) | |
| parent | c2300c827f769ecde286419fcab29c4ec9698822 (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into codeigniter/develop
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/codeigniter/helpers/directory_helper_test.php | 4 | ||||
| -rw-r--r-- | tests/travis/mysql.phpunit.xml | 2 | ||||
| -rw-r--r-- | tests/travis/pdo/mysql.phpunit.xml | 2 | ||||
| -rw-r--r-- | tests/travis/pdo/pgsql.phpunit.xml | 2 | ||||
| -rw-r--r-- | tests/travis/pdo/sqlite.phpunit.xml | 2 | ||||
| -rw-r--r-- | tests/travis/pgsql.phpunit.xml | 2 | ||||
| -rw-r--r-- | tests/travis/sqlite.phpunit.xml | 2 |
7 files changed, 9 insertions, 7 deletions
diff --git a/tests/codeigniter/helpers/directory_helper_test.php b/tests/codeigniter/helpers/directory_helper_test.php index 176ff1d78..c39ccd8d0 100644 --- a/tests/codeigniter/helpers/directory_helper_test.php +++ b/tests/codeigniter/helpers/directory_helper_test.php @@ -19,6 +19,7 @@ class Directory_helper_test extends CI_TestCase { 'benchmark.html' => '', 'database' => array('active_record.html' => '', 'binds.html' => ''), 'email.html' => '', + '0' => '', '.hiddenfile.txt' => '' ) ); @@ -30,7 +31,8 @@ class Directory_helper_test extends CI_TestCase { 'libraries' => array( 'benchmark.html', 'database' => array('active_record.html', 'binds.html'), - 'email.html' + 'email.html', + '0' ) ); diff --git a/tests/travis/mysql.phpunit.xml b/tests/travis/mysql.phpunit.xml index 38c8eba48..06d4a011b 100644 --- a/tests/travis/mysql.phpunit.xml +++ b/tests/travis/mysql.phpunit.xml @@ -18,7 +18,7 @@ </testsuite> </testsuites> <filter> - <whitelist addUncoveredFilesFromWhitelist="true"> + <whitelist addUncoveredFilesFromWhitelist="false"> <directory suffix=".php">../../system</directory> </whitelist> </filter> diff --git a/tests/travis/pdo/mysql.phpunit.xml b/tests/travis/pdo/mysql.phpunit.xml index c3113a66f..7121edc45 100644 --- a/tests/travis/pdo/mysql.phpunit.xml +++ b/tests/travis/pdo/mysql.phpunit.xml @@ -18,7 +18,7 @@ </testsuite> </testsuites> <filter> - <whitelist addUncoveredFilesFromWhitelist="true"> + <whitelist addUncoveredFilesFromWhitelist="false"> <directory suffix=".php">../../../system</directory> </whitelist> </filter> diff --git a/tests/travis/pdo/pgsql.phpunit.xml b/tests/travis/pdo/pgsql.phpunit.xml index 232025523..df3ff986e 100644 --- a/tests/travis/pdo/pgsql.phpunit.xml +++ b/tests/travis/pdo/pgsql.phpunit.xml @@ -18,7 +18,7 @@ </testsuite> </testsuites> <filter> - <whitelist addUncoveredFilesFromWhitelist="true"> + <whitelist addUncoveredFilesFromWhitelist="false"> <directory suffix=".php">../../../system</directory> </whitelist> </filter> diff --git a/tests/travis/pdo/sqlite.phpunit.xml b/tests/travis/pdo/sqlite.phpunit.xml index 3d1256721..7d867f6d1 100644 --- a/tests/travis/pdo/sqlite.phpunit.xml +++ b/tests/travis/pdo/sqlite.phpunit.xml @@ -18,7 +18,7 @@ </testsuite> </testsuites> <filter> - <whitelist addUncoveredFilesFromWhitelist="true"> + <whitelist addUncoveredFilesFromWhitelist="false"> <directory suffix=".php">../../../system</directory> </whitelist> </filter> diff --git a/tests/travis/pgsql.phpunit.xml b/tests/travis/pgsql.phpunit.xml index 51e433d76..bfddbf6b5 100644 --- a/tests/travis/pgsql.phpunit.xml +++ b/tests/travis/pgsql.phpunit.xml @@ -18,7 +18,7 @@ </testsuite> </testsuites> <filter> - <whitelist addUncoveredFilesFromWhitelist="true"> + <whitelist addUncoveredFilesFromWhitelist="false"> <directory suffix=".php">../../system</directory> </whitelist> </filter> diff --git a/tests/travis/sqlite.phpunit.xml b/tests/travis/sqlite.phpunit.xml index 701165734..75c946aee 100644 --- a/tests/travis/sqlite.phpunit.xml +++ b/tests/travis/sqlite.phpunit.xml @@ -18,7 +18,7 @@ </testsuite> </testsuites> <filter> - <whitelist addUncoveredFilesFromWhitelist="true"> + <whitelist addUncoveredFilesFromWhitelist="false"> <directory suffix=".php">../../system</directory> </whitelist> </filter> |