From 18c77df78494a1f3ba3b09d30aafade35b6ffaec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20L=C3=BCck?= Date: Fri, 9 Feb 2018 10:11:33 +0100 Subject: [PATCH] Forward compatibility with PHPUnit 7 --- composer.json | 2 +- tests/FunctionalBrowserTest.php | 30 ++++++++++++++++++++++++------ 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 80cc86f..c85df1f 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "require-dev": { "clue/block-react": "^1.0", "clue/socks-react": "^0.8", - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4", + "phpunit/phpunit": "^7.0 || ^6.4 || ^5.7 || ^4.8.35", "react/http": "^0.7.2" } } diff --git a/tests/FunctionalBrowserTest.php b/tests/FunctionalBrowserTest.php index 37ac024..d63dbdc 100644 --- a/tests/FunctionalBrowserTest.php +++ b/tests/FunctionalBrowserTest.php @@ -24,7 +24,10 @@ public function setUp() $this->browser = new Browser($this->loop); } - /** @group online */ + /** + * @group online + * @doesNotPerformAssertions + */ public function testSimpleRequest() { Block\await($this->browser->get($this->base . 'get'), $this->loop); @@ -42,19 +45,28 @@ public function testCancelPromiseWillRejectRequest() Block\await($promise, $this->loop); } - /** @group online */ + /** + * @group online + * @doesNotPerformAssertions + */ public function testRedirectRequestRelative() { Block\await($this->browser->get($this->base . 'redirect-to?url=get'), $this->loop); } - /** @group online */ + /** + * @group online + * @doesNotPerformAssertions + */ public function testRedirectRequestAbsolute() { Block\await($this->browser->get($this->base . 'redirect-to?url=' . urlencode($this->base . 'get')), $this->loop); } - /** @group online */ + /** + * @group online + * @doesNotPerformAssertions + */ public function testNotFollowingRedirectsResolvesWithRedirectResult() { $browser = $this->browser->withOptions(array('followRedirects' => false)); @@ -73,7 +85,10 @@ public function testRejectingRedirectsRejects() Block\await($browser->get($this->base . 'redirect/3'), $this->loop); } - /** @group online */ + /** + * @group online + * @doesNotPerformAssertions + */ public function testCanAccessHttps() { if (!function_exists('stream_socket_enable_crypto')) { @@ -104,7 +119,10 @@ public function testVerifyPeerEnabledForBadSslRejects() Block\await($browser->get('https://self-signed.badssl.com/'), $this->loop); } - /** @group online */ + /** + * @group online + * @doesNotPerformAssertions + */ public function testVerifyPeerDisabledForBadSslResolves() { if (!function_exists('stream_socket_enable_crypto')) {