Do not use buffered response in tests

stefandoorn · Oct 1, 2024 · b719556 · b719556
1 parent dc8aaf5
commit b719556
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 19 deletions.
diff --git a/tests/Controller/MultiChannelSitemapIndexControllerApiTest.php b/tests/Controller/MultiChannelSitemapIndexControllerApiTest.php
@@ -11,10 +11,10 @@ public function testShowActionResponse()
         $this->loadFixturesFromFiles(['multi_channel.yaml']);
         $this->generateSitemaps();
 
-        $response = $this->getBufferedResponse('http://localhost/sitemap_index.xml');
+        $response = $this->getResponse('http://localhost/sitemap_index.xml');
         $this->assertResponse($response, 'show_sitemap_index');
 
-        $response = $this->getBufferedResponse('http://store.fr/sitemap_index.xml');
+        $response = $this->getResponse('http://store.fr/sitemap_index.xml');
         $this->assertResponse($response, 'show_second_sitemap_index');
 
         $this->deleteSitemaps();

diff --git a/tests/Controller/MultiChannelSitemapStaticControllerApiTest.php b/tests/Controller/MultiChannelSitemapStaticControllerApiTest.php
@@ -11,7 +11,7 @@ public function testShowActionResponse()
         $this->loadFixturesFromFiles(['multi_channel.yaml']);
         $this->generateSitemaps();
 
-        $response = $this->getBufferedResponse('http://store.fr/sitemap/static.xml');
+        $response = $this->getResponse('http://store.fr/sitemap/static.xml');
 
         $this->assertResponse($response, 'show_sitemap_static_fr');
     }

diff --git a/tests/Controller/SitemapIndexControllerApiTest.php b/tests/Controller/SitemapIndexControllerApiTest.php
@@ -14,21 +14,21 @@ protected function setUp(): void
 
     public function testRedirectActionResponse()
     {
-        $response = $this->getBufferedResponse('/sitemap.xml');
+        $response = $this->getResponse('/sitemap.xml');
         self::assertResponseRedirects('http://localhost/sitemap_index.xml', 301);
         $this->deleteSitemaps();
     }
 
     public function testShowActionResponse()
     {
-        $response = $this->getBufferedResponse('/sitemap_index.xml');
+        $response = $this->getResponse('/sitemap_index.xml');
         $this->assertResponse($response, 'show_sitemap_index');
         $this->deleteSitemaps();
     }
 
     public function testRedirectResponse()
     {
-        $response = $this->getBufferedResponse('/sitemap.xml');
+        $response = $this->getResponse('/sitemap.xml');
 
         $this->assertResponseCode($response, 301);
         $this->assertTrue($response->isRedirect());

diff --git a/tests/Controller/SitemapProductControllerApiImagesTest.php b/tests/Controller/SitemapProductControllerApiImagesTest.php
@@ -10,7 +10,7 @@ public function testShowActionResponse()
     {
         $this->loadFixturesFromFiles(['channel.yaml', 'product_images.yaml']);
         $this->generateSitemaps();
-        $response = $this->getBufferedResponse('/sitemap/products.xml');
+        $response = $this->getResponse('/sitemap/products.xml');
 
         $this->assertResponse($response, 'show_sitemap_products_image');
         $this->deleteSitemaps();

diff --git a/tests/Controller/SitemapProductControllerApiLocalesImagesTest.php b/tests/Controller/SitemapProductControllerApiLocalesImagesTest.php
@@ -10,7 +10,7 @@ public function testShowActionResponse()
     {
         $this->loadFixturesFromFiles(['channel.yaml', 'product_locale_image.yaml']);
         $this->generateSitemaps();
-        $response = $this->getBufferedResponse('/sitemap/products.xml');
+        $response = $this->getResponse('/sitemap/products.xml');
 
         $this->assertResponse($response, 'show_sitemap_products_locale_image');
         $this->deleteSitemaps();

diff --git a/tests/Controller/SitemapProductControllerApiLocalesTest.php b/tests/Controller/SitemapProductControllerApiLocalesTest.php
@@ -10,7 +10,7 @@ public function testShowActionResponse()
     {
         $this->loadFixturesFromFiles(['channel.yaml', 'product_locale.yaml']);
         $this->generateSitemaps();
-        $response = $this->getBufferedResponse('/sitemap/products.xml');
+        $response = $this->getResponse('/sitemap/products.xml');
         $this->assertResponse($response, 'show_sitemap_products_locale');
         $this->deleteSitemaps();
     }

diff --git a/tests/Controller/SitemapProductControllerApiTest.php b/tests/Controller/SitemapProductControllerApiTest.php
@@ -11,7 +11,7 @@ public function testShowActionResponse()
         $this->loadFixturesFromFiles(['channel.yaml', 'product.yaml']);
         $this->generateSitemaps();
 
-        $response = $this->getBufferedResponse('/sitemap/products.xml');
+        $response = $this->getResponse('/sitemap/products.xml');
         $this->assertResponse($response, 'show_sitemap_products');
         $this->deleteSitemaps();
     }

diff --git a/tests/Controller/SitemapProductControllerApiUniqueLocaleChannelTest.php b/tests/Controller/SitemapProductControllerApiUniqueLocaleChannelTest.php
@@ -11,7 +11,7 @@ public function testShowActionResponse()
         $this->loadFixturesFromFiles(['product_unique_locale_channel.yaml']);
         $this->generateSitemaps();
 
-        $response = $this->getBufferedResponse('/sitemap/products.xml');
+        $response = $this->getResponse('/sitemap/products.xml');
 
         $this->assertResponse($response, 'show_sitemap_products_unique_channel_locale');
         $this->deleteSitemaps();

diff --git a/tests/Controller/SitemapStaticControllerApiTest.php b/tests/Controller/SitemapStaticControllerApiTest.php
@@ -10,7 +10,7 @@ public function testShowActionResponse()
     {
         $this->loadFixturesFromFiles(['channel.yaml']);
         $this->generateSitemaps();
-        $response = $this->getBufferedResponse('/sitemap/static.xml');
+        $response = $this->getResponse('/sitemap/static.xml');
 
         $this->assertResponse($response, 'show_sitemap_static');
         $this->deleteSitemaps();

diff --git a/tests/Controller/SitemapTaxonControllerApiLocalesTest.php b/tests/Controller/SitemapTaxonControllerApiLocalesTest.php
@@ -10,7 +10,7 @@ public function testShowActionResponse()
     {
         $this->loadFixturesFromFiles(['channel.yaml', 'taxon_locale.yaml']);
         $this->generateSitemaps();
-        $response = $this->getBufferedResponse('/sitemap/taxons.xml');
+        $response = $this->getResponse('/sitemap/taxons.xml');
 
         $this->assertResponse($response, 'show_sitemap_taxons_locale');
         $this->deleteSitemaps();

diff --git a/tests/Controller/SitemapTaxonControllerApiTest.php b/tests/Controller/SitemapTaxonControllerApiTest.php
@@ -10,7 +10,7 @@ public function testShowActionResponse()
     {
         $this->loadFixturesFromFiles(['channel.yaml', 'taxon.yaml']);
         $this->generateSitemaps();
-        $response = $this->getBufferedResponse('/sitemap/taxons.xml');
+        $response = $this->getResponse('/sitemap/taxons.xml');
 
         $this->assertResponse($response, 'show_sitemap_taxons');
         $this->deleteSitemaps();

diff --git a/tests/Controller/XmlApiTestCase.php b/tests/Controller/XmlApiTestCase.php
@@ -32,14 +32,11 @@ protected function generateSitemaps(): void
         $commandTester->execute(['command' => $command->getName()]);
     }
 
-    protected function getBufferedResponse(string $uri): Response
+    protected function getResponse(string $uri): Response
     {
-        \ob_start();
         $this->client->request('GET', $uri);
-        $response = $this->client->getResponse();
-        $contents = \ob_get_clean();
 
-        return new Response($contents, $response->getStatusCode(), $response->headers->all());
+        return $this->client->getResponse();
     }
 
     protected function deleteSitemaps(): void