From 3a63e44c998e9a934dd3f9e9692dde1625ea42f1 Mon Sep 17 00:00:00 2001 From: Taufan Aditya Date: Fri, 17 Feb 2012 23:28:17 +0700 Subject: Automated testing via Travis --- .travis.yml | 12 ++++++++++++ readme.rst | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..a2449c593 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,12 @@ +language: php + +phps: + - 5.2 + - 5.3 + - 5.4 + +before_script: + - pyrus channel-discover pear.php-tools.net + - pyrus install pat/vfsStream-alpha + +script: phpunit --configuration tests/phpunit.xml \ No newline at end of file diff --git a/readme.rst b/readme.rst index 26e04ceac..69d82c2f3 100644 --- a/readme.rst +++ b/readme.rst @@ -13,7 +13,7 @@ for a given task. ******************* Release Information ******************* - +Status : [![Build Status](https://secure.travis-ci.org/toopay/CodeIgniter?branch=unit-tests)](http://travis-ci.org/toopay/CodeIgniter) This repo contains in development code for future releases. To download the latest stable release please visit the `CodeIgniter Downloads `_ page. -- cgit v1.2.3-24-g4f1b From 418c0bf6b473b79d2c043df9727bf689b371e25c Mon Sep 17 00:00:00 2001 From: Taufan Aditya Date: Fri, 17 Feb 2012 23:42:08 +0700 Subject: vfsStream via pyrus --- .travis.yml | 4 ++-- readme.rst | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index a2449c593..87e528f36 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ phps: - 5.4 before_script: - - pyrus channel-discover pear.php-tools.net - - pyrus install pat/vfsStream-alpha + - pyrus install http://pear.php-tools.net/get/vfsStream-0.11.2.tgz + - phpenv rehash script: phpunit --configuration tests/phpunit.xml \ No newline at end of file diff --git a/readme.rst b/readme.rst index 69d82c2f3..c209345b7 100644 --- a/readme.rst +++ b/readme.rst @@ -13,7 +13,7 @@ for a given task. ******************* Release Information ******************* -Status : [![Build Status](https://secure.travis-ci.org/toopay/CodeIgniter?branch=unit-tests)](http://travis-ci.org/toopay/CodeIgniter) +Status : [![Build Status](https://secure.travis-ci.org/toopay/CodeIgniter.png?branch=unit-tests)](http://travis-ci.org/toopay/CodeIgniter) This repo contains in development code for future releases. To download the latest stable release please visit the `CodeIgniter Downloads `_ page. -- cgit v1.2.3-24-g4f1b From cfc59244c6cd83a3031fa7cbe45bd6a7056f2791 Mon Sep 17 00:00:00 2001 From: Taufan Aditya Date: Fri, 17 Feb 2012 23:53:13 +0700 Subject: vfsStream via pyrus --- .travis.yml | 1 + readme.rst | 2 +- tests/README.md | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 87e528f36..405d0a94c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ phps: - 5.4 before_script: + - pyrus channel-discover pear.php-tools.net - pyrus install http://pear.php-tools.net/get/vfsStream-0.11.2.tgz - phpenv rehash diff --git a/readme.rst b/readme.rst index c209345b7..26e04ceac 100644 --- a/readme.rst +++ b/readme.rst @@ -13,7 +13,7 @@ for a given task. ******************* Release Information ******************* -Status : [![Build Status](https://secure.travis-ci.org/toopay/CodeIgniter.png?branch=unit-tests)](http://travis-ci.org/toopay/CodeIgniter) + This repo contains in development code for future releases. To download the latest stable release please visit the `CodeIgniter Downloads `_ page. diff --git a/tests/README.md b/tests/README.md index ad8051618..f565fa760 100644 --- a/tests/README.md +++ b/tests/README.md @@ -1,5 +1,7 @@ # CodeIgniter Unit Tests # +Status : [![Build Status](https://secure.travis-ci.org/toopay/CodeIgniter.png?branch=unit-tests)](http://travis-ci.org/toopay/CodeIgniter) + *Do not merge to default until these issues have been addressed* - Clean up naming conventions -- cgit v1.2.3-24-g4f1b From 32a99ff4c781865cf010596fc99c763f5dac37a1 Mon Sep 17 00:00:00 2001 From: Taufan Aditya Date: Sat, 18 Feb 2012 00:01:20 +0700 Subject: PHPunit force to continue --- tests/phpunit.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/phpunit.xml b/tests/phpunit.xml index e07aa96a7..2f18dae93 100644 --- a/tests/phpunit.xml +++ b/tests/phpunit.xml @@ -2,7 +2,13 @@ + colors="true" + convertNoticesToExceptions="true" + convertWarningsToExceptions="true" + stopOnError="false" + stopOnFailure="false" + stopOnIncomplete="false" + stopOnSkipped="false"> codeigniter/Setup_test.php -- cgit v1.2.3-24-g4f1b From 57d6d2e5c904aae88572aafc2cbcc2ee337d8e4a Mon Sep 17 00:00:00 2001 From: Taufan Aditya Date: Sat, 18 Feb 2012 00:12:51 +0700 Subject: temporary commenting PHP_CodeCoverage_Filter::get_instance() --- tests/Bootstrap.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php index 657671ab0..28c63f0b2 100644 --- a/tests/Bootstrap.php +++ b/tests/Bootstrap.php @@ -19,12 +19,12 @@ 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'); +// 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'); +// PHP_CodeCoverage_Filter::getInstance()->addFileToBlackList('../system/core/CodeIgniter.php'); unset($dir); \ No newline at end of file -- cgit v1.2.3-24-g4f1b From 4054c56b882ad40495f2d227990d73437af51038 Mon Sep 17 00:00:00 2001 From: Taufan Aditya Date: Sat, 18 Feb 2012 01:12:10 +0700 Subject: Pointed the report to EllisLab repo --- tests/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/README.md b/tests/README.md index f565fa760..6d83c34d8 100644 --- a/tests/README.md +++ b/tests/README.md @@ -1,6 +1,6 @@ # CodeIgniter Unit Tests # -Status : [![Build Status](https://secure.travis-ci.org/toopay/CodeIgniter.png?branch=unit-tests)](http://travis-ci.org/toopay/CodeIgniter) +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* -- cgit v1.2.3-24-g4f1b From a03cbc5d2d2747b48be47c6fdef51f338701c583 Mon Sep 17 00:00:00 2001 From: Taufan Aditya Date: Fri, 9 Mar 2012 17:00:56 +0700 Subject: Add tiyowan suggestion #1147 --- phpunit.xml | 13 +++++++++++++ tests/Bootstrap.php | 10 ---------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/phpunit.xml b/phpunit.xml index aca7809cc..2ae7ba3b8 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -22,4 +22,17 @@ + + + PEAR_INSTALL_DIR + PHP_LIBDIR + PROJECT_BASE.'tests' + '../system/core/CodeIgniter.php' + + + + + \ No newline at end of file diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php index 28c63f0b2..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 -- cgit v1.2.3-24-g4f1b