joshtronic/pickles
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity Actions

Cleaned up issues with phpunit 4.2.x

Browse source
This commit is contained in:
Josh Sherman 2014-09-13 16:43:29 -04:00
parent 0c40241b45
commit 3e08d173a1
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.travis.yml
View file

@ -30,16 +30,16 @@ before_script:
- echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
- echo "extension = redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
- echo -e "zend_$(cat ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini)" > ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
- echo "zend_extension = /home/travis/.phpenv/versions/$(php -r 'echo phpversion();')/lib/php/extensions/no-debug-zts-20100525/uopz.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
- echo "[uopz]" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
- echo "uopz.overloads=1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
- phpunit --version
- mysql -e "create database IF NOT EXISTS test;" -u root
- mysql test < tests/schema.sql -u root
- mkdir -p build/logs
- phpenv rehash
script:
- phpunit --colors --coverage-clover /home/travis/build/joshtronic/pickles/build/logs/clover.xml --bootstrap ./tests/bootstrap.php ./tests
- phpunit --stderr --colors --coverage-clover /home/travis/build/joshtronic/pickles/build/logs/clover.xml --bootstrap ./tests/bootstrap.php ./tests
after_success:
- php vendor/bin/coveralls --config ../.coveralls.yml -v

6
tests/classes/DisplayTest.php
View file

@ -40,6 +40,9 @@ class DisplayTest extends PHPUnit_Framework_TestCase
{
$this->display->return = 'invalid';
$this->assertEquals('Invalid return type.', $this->display->render());
// Gotta do this or the test will be considered "risky"
ob_end_clean();
}
public function testPHPSESSID()
@ -50,6 +53,9 @@ class DisplayTest extends PHPUnit_Framework_TestCase
$this->assertTrue(in_array('Location: ' . $request_uri, xdebug_get_headers()));
$this->assertEquals('Requested URI contains PHPSESSID, redirecting.', $return);
// Gotta do this or the test will be considered "risky"
ob_end_clean();
}
public function testNoParentTemplate()