fix(browser): allow save source as raw content

zenstruck · Feb 21, 2023 · 5ddaf68 · 5ddaf68
1 parent 41a5316
commit 5ddaf68
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 12 deletions.
diff --git a/src/Browser/KernelBrowser.php b/src/Browser/KernelBrowser.php
@@ -442,28 +442,36 @@ final public function assertHeaderContains(string $header, string $expected): se
         return $this;
     }
 
+    /**
+     * @return static
+     */
+    final public function assertContentType(string $contentType): self
+    {
+        return $this->assertHeaderContains('Content-Type', $contentType);
+    }
+
     /**
      * @return static
      */
     final public function assertJson(): self
     {
-        return $this->assertHeaderContains('Content-Type', 'json');
+        return $this->assertContentType('json');
     }
 
     /**
      * @return static
      */
     final public function assertXml(): self
     {
-        return $this->assertHeaderContains('Content-Type', 'xml');
+        return $this->assertContentType('xml');
     }
 
     /**
      * @return static
      */
     final public function assertHtml(): self
     {
-        return $this->assertHeaderContains('Content-Type', 'html');
+        return $this->assertContentType('html');
     }
 
     /**

diff --git a/src/Browser/Session.php b/src/Browser/Session.php
@@ -13,6 +13,7 @@
 
 use Behat\Mink\Element\DocumentElement;
 use Behat\Mink\Exception\DriverException;
+use Behat\Mink\Exception\UnsupportedDriverActionException;
 use Behat\Mink\Session as MinkSession;
 use Behat\Mink\WebAssert;
 use Symfony\Component\BrowserKit\AbstractBrowser;
@@ -95,26 +96,38 @@ public function expectException($expectedException, ?string $expectedMessage = n
 
     public function source(): string
     {
-        $ret = "<!--\n";
+        $ret = '';
 
         try {
-            $ret .= "URL: {$this->getCurrentUrl()} ({$this->getStatusCode()})\n\n";
+            $isTextContent = str_contains((string) $this->getResponseHeader('content-type'), 'text')
+                || str_contains((string) $this->getResponseHeader('content-type'), 'json');
+        } catch (UnsupportedDriverActionException) {
+            $isTextContent = true;
+        }
+
+        if ($isTextContent) {
+            $ret .= "<!--\n";
+
+            try {
+                $ret .= "URL: {$this->getCurrentUrl()} ({$this->getStatusCode()})\n\n";
 
-            foreach ($this->getResponseHeaders() as $header => $values) {
-                foreach ((array) $values as $value) {
-                    $ret .= "{$header}: {$value}\n";
+                foreach ($this->getResponseHeaders() as $header => $values) {
+                    foreach ((array) $values as $value) {
+                        $ret .= "{$header}: {$value}\n";
+                    }
                 }
+            } catch (DriverException $e) {
+                $ret = "URL: {$this->getCurrentUrl()}\n";
             }
-        } catch (DriverException $e) {
-            $ret = "URL: {$this->getCurrentUrl()}\n";
+
+            $ret .= "-->\n";
         }
 
-        $ret .= "-->\n";
 
         try {
             $ret .= $this->json();
         } catch (DriverException $e) {
-            $ret .= \trim($this->getDriver()->getContent());
+            $ret .= $isTextContent ? \trim($this->getDriver()->getContent()) : $this->getDriver()->getContent();
         }
 
         return $ret;

diff --git a/tests/BrowserTests.php b/tests/BrowserTests.php
@@ -255,6 +255,24 @@ public function can_save_source(): void
         $this->assertStringContainsString('<h1>h1 title</h1>', $contents);
     }
 
+    /**
+     * @test
+     */
+    public function can_save_source_as_zip(): void
+    {
+        $contents = self::catchFileContents(__DIR__.'/../var/browser/source/attachment.zip', function() {
+            $this->browser()
+                ->visit('/zip')
+                ->saveSource('attachment.zip')
+            ;
+        });
+
+        $this->assertEquals(
+            file_get_contents(__DIR__.'/../var/browser/source/attachment.zip'),
+            $contents
+        );
+    }
+
     /**
      * @test
      */

diff --git a/tests/Fixture/Kernel.php b/tests/Fixture/Kernel.php
@@ -18,6 +18,7 @@
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
+use Symfony\Component\HttpFoundation\HeaderUtils;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
@@ -157,6 +158,14 @@ public function logout(): Response
         return new Response();
     }
 
+    public function zip(): Response
+    {
+        return new Response(\file_get_contents(__DIR__.'/files/attachment.zip'), 200, [
+            'Content-Disposition' => HeaderUtils::makeDisposition(HeaderUtils::DISPOSITION_ATTACHMENT, 'attachment.zip'),
+            'Content-Type' => 'application/zip',
+        ]);
+    }
+
     public function registerBundles(): iterable
     {
         yield new FrameworkBundle();
@@ -213,5 +222,6 @@ private function configureRoutes(RoutingConfigurator $routes): void
         $routes->add('user', '/user')->controller('kernel::user');
         $routes->add('login', '/login')->controller('kernel::login');
         $routes->add('logout', '/logout')->controller('kernel::logout');
+        $routes->add('zip', '/zip')->controller('kernel::zip');
     }
 }
diff --git a/tests/Fixture/files/attachment.zip b/tests/Fixture/files/attachment.zip
diff --git a/tests/KernelBrowserTests.php b/tests/KernelBrowserTests.php
@@ -362,6 +362,8 @@ public function assert_content_types(): void
             ->assertXml()
             ->get('/page1')
             ->assertHtml()
+            ->get('/zip')
+            ->assertContentType('zip')
         ;
     }