[Tests] Streamline

OskarStark · nicolas-grekas · commit 0ed1f634a366 · 2023-10-31T08:58:33.000+01:00
diff --git a/Tests/AbstractBrowserTest.php b/Tests/AbstractBrowserTest.php
@@ -47,11 +47,12 @@ public function testGetRequest()
 
     public function testGetRequestNull()
     {
+        $client = $this->getBrowser();
+
         $this->expectException(BadMethodCallException::class);
         $this->expectExceptionMessage('The "request()" method must be called before "Symfony\\Component\\BrowserKit\\AbstractBrowser::getRequest()".');
 
-        $client = $this->getBrowser();
-        $this->assertNull($client->getRequest());
+        $client->getRequest();
     }
 
     public function testXmlHttpRequest()
@@ -95,20 +96,22 @@ public function testGetResponse()
 
     public function testGetResponseNull()
     {
+        $client = $this->getBrowser();
+
         $this->expectException(BadMethodCallException::class);
         $this->expectExceptionMessage('The "request()" method must be called before "Symfony\\Component\\BrowserKit\\AbstractBrowser::getResponse()".');
 
-        $client = $this->getBrowser();
-        $this->assertNull($client->getResponse());
+        $client->getResponse();
     }
 
     public function testGetInternalResponseNull()
     {
+        $client = $this->getBrowser();
+
         $this->expectException(BadMethodCallException::class);
         $this->expectExceptionMessage('The "request()" method must be called before "Symfony\\Component\\BrowserKit\\AbstractBrowser::getInternalResponse()".');
 
-        $client = $this->getBrowser();
-        $this->assertNull($client->getInternalResponse());
+        $client->getInternalResponse();
     }
 
     public function testGetContent()
@@ -131,11 +134,12 @@ public function testGetCrawler()
 
     public function testGetCrawlerNull()
     {
+        $client = $this->getBrowser();
+
         $this->expectException(BadMethodCallException::class);
         $this->expectExceptionMessage('The "request()" method must be called before "Symfony\\Component\\BrowserKit\\AbstractBrowser::getCrawler()".');
 
-        $client = $this->getBrowser();
-        $this->assertNull($client->getCrawler());
+        $client->getCrawler();
     }
 
     public function testRequestHttpHeaders()
@@ -384,7 +388,7 @@ public function testSubmitPreserveAuth()
         $this->assertSame('bar', $server['PHP_AUTH_PW']);
     }
 
-    public function testSubmitPassthrewHeaders()
+    public function testSubmitPassthroughHeaders()
     {
         $client = $this->getBrowser();
         $client->setNextResponse(new Response('<html><form action="/foo"><input type="submit" /></form></html>'));
@@ -623,7 +627,7 @@ public function testFollowMetaRefresh(string $content, string $expectedEndingUrl
         $this->assertSame($expectedEndingUrl, $client->getRequest()->getUri());
     }
 
-    public static function getTestsForMetaRefresh()
+    public static function getTestsForMetaRefresh(): array
     {
         return [
             ['<html><head><meta http-equiv="Refresh" content="4" /><meta http-equiv="refresh" content="0; URL=http://www.example.com/redirected"/></head></html>', 'http://www.example.com/redirected'],
@@ -844,10 +848,11 @@ public function testInternalRequest()
 
     public function testInternalRequestNull()
     {
+        $client = $this->getBrowser();
+
         $this->expectException(BadMethodCallException::class);
         $this->expectExceptionMessage('The "request()" method must be called before "Symfony\\Component\\BrowserKit\\AbstractBrowser::getInternalRequest()".');
 
-        $client = $this->getBrowser();
-        $this->assertNull($client->getInternalRequest());
+        $client->getInternalRequest();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -47,11 +47,12 @@ public function testGetRequest()`
`47`	`47`
`48`	`48`	`public function testGetRequestNull()`
`49`	`49`	`{`
	`50`	`+ $client = $this->getBrowser();`
	`51`	`+`
`50`	`52`	`$this->expectException(BadMethodCallException::class);`
`51`	`53`	`$this->expectExceptionMessage('The "request()" method must be called before "Symfony\\Component\\BrowserKit\\AbstractBrowser::getRequest()".');`
`52`	`54`
`53`		`- $client = $this->getBrowser();`
`54`		`- $this->assertNull($client->getRequest());`
	`55`	`+ $client->getRequest();`
`55`	`56`	`}`
`56`	`57`
`57`	`58`	`public function testXmlHttpRequest()`
`@@ -95,20 +96,22 @@ public function testGetResponse()`
`95`	`96`
`96`	`97`	`public function testGetResponseNull()`
`97`	`98`	`{`
	`99`	`+ $client = $this->getBrowser();`
	`100`	`+`
`98`	`101`	`$this->expectException(BadMethodCallException::class);`
`99`	`102`	`$this->expectExceptionMessage('The "request()" method must be called before "Symfony\\Component\\BrowserKit\\AbstractBrowser::getResponse()".');`
`100`	`103`
`101`		`- $client = $this->getBrowser();`
`102`		`- $this->assertNull($client->getResponse());`
	`104`	`+ $client->getResponse();`
`103`	`105`	`}`
`104`	`106`
`105`	`107`	`public function testGetInternalResponseNull()`
`106`	`108`	`{`
	`109`	`+ $client = $this->getBrowser();`
	`110`	`+`
`107`	`111`	`$this->expectException(BadMethodCallException::class);`
`108`	`112`	`$this->expectExceptionMessage('The "request()" method must be called before "Symfony\\Component\\BrowserKit\\AbstractBrowser::getInternalResponse()".');`
`109`	`113`
`110`		`- $client = $this->getBrowser();`
`111`		`- $this->assertNull($client->getInternalResponse());`
	`114`	`+ $client->getInternalResponse();`
`112`	`115`	`}`
`113`	`116`
`114`	`117`	`public function testGetContent()`
`@@ -131,11 +134,12 @@ public function testGetCrawler()`
`131`	`134`
`132`	`135`	`public function testGetCrawlerNull()`
`133`	`136`	`{`
	`137`	`+ $client = $this->getBrowser();`
	`138`	`+`
`134`	`139`	`$this->expectException(BadMethodCallException::class);`
`135`	`140`	`$this->expectExceptionMessage('The "request()" method must be called before "Symfony\\Component\\BrowserKit\\AbstractBrowser::getCrawler()".');`
`136`	`141`
`137`		`- $client = $this->getBrowser();`
`138`		`- $this->assertNull($client->getCrawler());`
	`142`	`+ $client->getCrawler();`
`139`	`143`	`}`
`140`	`144`
`141`	`145`	`public function testRequestHttpHeaders()`
`@@ -384,7 +388,7 @@ public function testSubmitPreserveAuth()`
`384`	`388`	`$this->assertSame('bar', $server['PHP_AUTH_PW']);`
`385`	`389`	`}`
`386`	`390`
`387`		`- public function testSubmitPassthrewHeaders()`
	`391`	`+ public function testSubmitPassthroughHeaders()`
`388`	`392`	`{`
`389`	`393`	`$client = $this->getBrowser();`
`390`	`394`	`$client->setNextResponse(new Response('<html><form action="/foo"><input type="submit" /></form></html>'));`
`@@ -623,7 +627,7 @@ public function testFollowMetaRefresh(string $content, string $expectedEndingUrl`
`623`	`627`	`$this->assertSame($expectedEndingUrl, $client->getRequest()->getUri());`
`624`	`628`	`}`
`625`	`629`
`626`		`- public static function getTestsForMetaRefresh()`
	`630`	`+ public static function getTestsForMetaRefresh(): array`
`627`	`631`	`{`
`628`	`632`	`return [`
`629`	`633`	`['<html><head><meta http-equiv="Refresh" content="4" /><meta http-equiv="refresh" content="0; URL=http://www.example.com/redirected"/></head></html>', 'http://www.example.com/redirected'],`
`@@ -844,10 +848,11 @@ public function testInternalRequest()`
`844`	`848`
`845`	`849`	`public function testInternalRequestNull()`
`846`	`850`	`{`
	`851`	`+ $client = $this->getBrowser();`
	`852`	`+`
`847`	`853`	`$this->expectException(BadMethodCallException::class);`
`848`	`854`	`$this->expectExceptionMessage('The "request()" method must be called before "Symfony\\Component\\BrowserKit\\AbstractBrowser::getInternalRequest()".');`
`849`	`855`
`850`		`- $client = $this->getBrowser();`
`851`		`- $this->assertNull($client->getInternalRequest());`
	`856`	`+ $client->getInternalRequest();`
`852`	`857`	`}`
`853`	`858`	`}`