Upgrade testing dependencies

casperboone · casperboone · commit d9f199ddb1ec · 2020-09-13T21:39:25.000+02:00
diff --git a/composer.json b/composer.json
@@ -18,9 +18,9 @@
         "illuminate/support": " ^8.0"
     },
     "require-dev": {
-        "mockery/mockery": "^1.0",
-        "phpunit/phpunit": "~8.0",
-        "orchestra/testbench": "^4.0 || ^5.0",
+        "mockery/mockery": "^1.3.1",
+        "phpunit/phpunit": "^9.3",
+        "orchestra/testbench": "^6.0",
         "dms/phpunit-arraysubset-asserts": ">=0.1.0"
     },
     "autoload": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -14,16 +14,17 @@
             <directory>tests</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src/</directory>
-        </whitelist>
-    </filter>
+    <coverage>
+        <include>
+            <directory suffix=".php">./src</directory>
+        </include>
+        <report>
+            <html outputDirectory="build/coverage"/>
+            <text outputFile="build/coverage.txt"/>
+            <clover outputFile="build/logs/clover.xml"/>
+        </report>
+    </coverage>
     <logging>
-        <log type="tap" target="build/report.tap"/>
-        <log type="junit" target="build/report.junit.xml"/>
-        <log type="coverage-html" target="build/coverage" charset="UTF-8" yui="true" highlight="true"/>
-        <log type="coverage-text" target="build/coverage.txt"/>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
+        <junit outputFile="build/report.junit.xml"/>
     </logging>
 </phpunit>
diff --git a/tests/PushoverTest.php b/tests/PushoverTest.php
@@ -80,7 +80,7 @@ public function it_throws_an_exception_when_pushover_returns_an_error_with_inval
         $guzzleResponse->shouldReceive('getStatusCode')->andReturn(400);
         $guzzleResponse->shouldReceive('getBody')->andReturn('');
 
-        $this->guzzleClient->shouldReceive('post')->andThrow(new RequestException(null, $guzzleRequest, $guzzleResponse));
+        $this->guzzleClient->shouldReceive('post')->andThrow(new RequestException('message', $guzzleRequest, $guzzleResponse));
 
         $this->pushover->send([]);
     }
@@ -96,7 +96,7 @@ public function it_throws_an_exception_when_pushover_returns_an_error_with_valid
         $guzzleResponse->shouldReceive('getStatusCode')->andReturn(400);
         $guzzleResponse->shouldReceive('getBody')->andReturn('{"errors": ["error_message_1", "error_message_2"]}');
 
-        $this->guzzleClient->shouldReceive('post')->andThrow(new RequestException(null, $guzzleRequest, $guzzleResponse));
+        $this->guzzleClient->shouldReceive('post')->andThrow(new RequestException('message', $guzzleRequest, $guzzleResponse));
 
         $this->pushover->send([]);
     }
@@ -109,7 +109,7 @@ public function it_throws_an_exception_when_pushover_returns_nothing()
 
         $guzzleRequest = Mockery::mock(\Psr\Http\Message\RequestInterface::class);
 
-        $this->guzzleClient->shouldReceive('post')->andThrow(new RequestException(null, $guzzleRequest, null));
+        $this->guzzleClient->shouldReceive('post')->andThrow(new RequestException('message', $guzzleRequest, null));
 
         $this->pushover->send([]);
     }

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public function it_throws_an_exception_when_pushover_returns_an_error_with_inval`
`80`	`80`	`$guzzleResponse->shouldReceive('getStatusCode')->andReturn(400);`
`81`	`81`	`$guzzleResponse->shouldReceive('getBody')->andReturn('');`
`82`	`82`
`83`		`- $this->guzzleClient->shouldReceive('post')->andThrow(new RequestException(null, $guzzleRequest, $guzzleResponse));`
	`83`	`+ $this->guzzleClient->shouldReceive('post')->andThrow(new RequestException('message', $guzzleRequest, $guzzleResponse));`
`84`	`84`
`85`	`85`	`$this->pushover->send([]);`
`86`	`86`	`}`
`@@ -96,7 +96,7 @@ public function it_throws_an_exception_when_pushover_returns_an_error_with_valid`
`96`	`96`	`$guzzleResponse->shouldReceive('getStatusCode')->andReturn(400);`
`97`	`97`	`$guzzleResponse->shouldReceive('getBody')->andReturn('{"errors": ["error_message_1", "error_message_2"]}');`
`98`	`98`
`99`		`- $this->guzzleClient->shouldReceive('post')->andThrow(new RequestException(null, $guzzleRequest, $guzzleResponse));`
	`99`	`+ $this->guzzleClient->shouldReceive('post')->andThrow(new RequestException('message', $guzzleRequest, $guzzleResponse));`
`100`	`100`
`101`	`101`	`$this->pushover->send([]);`
`102`	`102`	`}`
`@@ -109,7 +109,7 @@ public function it_throws_an_exception_when_pushover_returns_nothing()`
`109`	`109`
`110`	`110`	`$guzzleRequest = Mockery::mock(\Psr\Http\Message\RequestInterface::class);`
`111`	`111`
`112`		`- $this->guzzleClient->shouldReceive('post')->andThrow(new RequestException(null, $guzzleRequest, null));`
	`112`	`+ $this->guzzleClient->shouldReceive('post')->andThrow(new RequestException('message', $guzzleRequest, null));`
`113`	`113`
`114`	`114`	`$this->pushover->send([]);`
`115`	`115`	`}`