Skip to content

Fix unit tests #345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
datagutten wants to merge 7 commits into from
Closed

Fix unit tests #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e69f9e0
Do not check exception message
datagutten Jun 28, 2019
6b243e8
Fix PHPUnit 6 compatibility
datagutten Jun 29, 2019
b4a8b35
Lock PHPUnit version with composer.json #282
datagutten Jun 29, 2019
757cd1e
PHP 5.6 is only supported by PHPUnit 5.0
datagutten Jun 29, 2019
8edec45
Allow any PHPUnit version below 6.0
datagutten Jun 29, 2019
a605b14
Use built-in phpunit for PHP 5.*
datagutten Jun 29, 2019
3a6a2e2
New attempt to control PHPUnit version
datagutten Jun 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 25 additions & 14 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,26 @@ language: php
matrix:
fast_finish: true
include:
- php: 5.2
dist: precise
- php: 5.3
dist: precise
- php: 5.4
- php: 5.5
- php: 5.6
env: TEST_COVERAGE=1
- php: 7.0
- php: 7.1
- php: 7.2
- php: nightly
- php: 5.2
dist: precise
env: COMPOSER_PHPUNIT=false
- php: 5.3
dist: precise
env: COMPOSER_PHPUNIT=false
- php: 5.4
env: COMPOSER_PHPUNIT=false
- php: 5.5
env: COMPOSER_PHPUNIT=false
- php: 5.6
env: TEST_COVERAGE=1 COMPOSER_PHPUNIT=true
- php: 7.0
env: COMPOSER_PHPUNIT=true
- php: 7.1
env: COMPOSER_PHPUNIT=true
- php: 7.2
env: COMPOSER_PHPUNIT=true
- php: nightly
env: COMPOSER_PHPUNIT=true

allow_failures:
- php: nightly
Expand All @@ -30,6 +38,7 @@ cache:
install:
# Setup the test server
- phpenv local $( phpenv versions | grep 5.6 | tail -1 )
- if [ "$COMPOSER_PHPUNIT" == 'false' ]; then composer remove phpunit/phpunit --dev; fi
- composer install --dev --no-interaction
- TESTPHPBIN=$(phpenv which php)
- phpenv local --unset
Expand All @@ -54,10 +63,12 @@ before_script:
- curl -s -I http://requests-php-tests.herokuapp.com/ > /dev/null

# Environment checks
- phpunit --version
- if [ "$COMPOSER_PHPUNIT" == 'false' ]; then phpunit --version; else ../vendor/bin/phpunit --version; fi

script:
- phpunit --coverage-clover clover.xml
- if [ "$COMPOSER_PHPUNIT" == 'false' ]; then phpunit --coverage-clover clover.xml;
else ../vendor/bin/phpunit --coverage-clover clover.xml;
fi

after_script:
- utils/proxy/stop.sh
Expand Down
3 changes: 2 additions & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
"php": ">=5.2"
},
"require-dev": {
"requests/test-server": "dev-master"
"requests/test-server": "dev-master",
"phpunit/phpunit": "<6.0"
},
"type": "library",
"autoload": {
Expand Down
8 changes: 4 additions & 4 deletions tests/Transport/Base.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public function setExpectedException( $exception, $message = '', $code = null )
parent::setExpectedException( $exception, $message, $code );
} else {
$this->expectException( $exception );
if ( '' !== $message ) {
if ( null !== $message ) {
$this->expectExceptionMessage( $message );
}
if ( null !== $code ) {
Expand Down Expand Up @@ -414,10 +414,10 @@ public function testStatusCodeThrow($code, $success) {

if (!$success) {
if ($code >= 400) {
$this->setExpectedException('Requests_Exception_HTTP_' . $code, '', $code);
$this->setExpectedException('Requests_Exception_HTTP_' . $code, null, $code);
}
elseif ($code >= 300 && $code < 400) {
$this->setExpectedException('Requests_Exception');
$this->setExpectedException('Requests_Exception', null);
}
}
$request = Requests::get($url, array(), $options);
Expand All @@ -439,7 +439,7 @@ public function testStatusCodeThrowAllowRedirects($code, $success) {

if (!$success) {
if ($code >= 400 || $code === 304 || $code === 305 || $code === 306) {
$this->setExpectedException('Requests_Exception_HTTP_' . $code, '', $code);
$this->setExpectedException('Requests_Exception_HTTP_' . $code, null, $code);
}
}
$request = Requests::get($url, array(), $options);
Expand Down