@

Restore InnerBrowser navigation state for Codeception runs (#231)

The 3.9.0 audit decoupled amOnRoute/amOnAction, seePageIsAvailable,
seePageRedirectsTo and submitSymfonyForm from codeception/lib-innerbrowser
so they can also run from plain PHPUnit test cases. They now drive the
BrowserKit client directly (request()/submit()) and discard the returned
Crawler.

Under Codeception that broke downstream DOM assertions: only
InnerBrowser::_loadPage() writes the Crawler back into the cached $crawler
(and resets $baseUrl/$forms), so see(), click() and the form helpers ended
up operating on a null or stale Crawler after those methods.

Keep the decoupling but branch per runner inside each method: when the
module is an InnerBrowser (Codeception) navigation/submission is delegated
to amOnPage()/submitForm() so the cached state stays in sync; otherwise
(PHPUnit) it keeps driving the client directly.

A matching functional test still needs to land in
Codeception/symfony-module-tests per CONTRIBUTING.md.
@

Author: TavoNiievez

src/Codeception/Module/Symfony/BrowserAssertionsTrait.php

@@ -4,6 +4,7 @@
 
 namespace Codeception\Module\Symfony;
 
+use Codeception\Lib\InnerBrowser;
 use PHPUnit\Framework\Constraint\Constraint;
 use PHPUnit\Framework\Constraint\LogicalAnd;
 use PHPUnit\Framework\Constraint\LogicalNot;
@@ -22,7 +23,6 @@
 use Symfony\Component\HttpFoundation\Test\Constraint\ResponseStatusCodeSame;
 
 use function class_exists;
-use function count;
 use function sprintf;
 
 trait BrowserAssertionsTrait
@@ -318,8 +318,15 @@ protected function doRebootClientKernel(): void {}
     public function seePageIsAvailable(?string $url = null): void
     {
         if ($url !== null) {
-            $this->getClient()->request('GET', $url);
-            $this->assertStringContainsString($url, $this->getClient()->getRequest()->getRequestUri());
+            $client = $this->getClient();
+
+            if ($this instanceof InnerBrowser) {
+                $this->amOnPage($url);
+            } else {
+                $client->request('GET', $url);
+            }
+
+            $this->assertStringContainsString($url, $client->getRequest()->getRequestUri());
         }
 
         $this->assertResponseIsSuccessful();
@@ -337,7 +344,12 @@ public function seePageRedirectsTo(string $page, string $redirectsTo): void
     {
         $client = $this->getClient();
         $client->followRedirects(false);
-        $client->request('GET', $page);
+
+        if ($this instanceof InnerBrowser) {
+            $this->amOnPage($page);
+        } else {
+            $client->request('GET', $page);
+        }
 
         $this->assertThatForResponse(new ResponseIsRedirected(), 'The response is not a redirection.');
 
@@ -364,17 +376,24 @@ public function seePageRedirectsTo(string $page, string $redirectsTo): void
      */
     public function submitSymfonyForm(string $name, array $fields): void
     {
+        $client = $this->getClient();
         $selector = sprintf('form[name=%s]', $name);
 
         $params = [];
         foreach ($fields as $key => $value) {
             $params[$name . $key] = $value;
         }
 
-        $node = $this->getClient()->getCrawler()->filter($selector);
-        $this->assertGreaterThan(0, count($node), sprintf('Form "%s" not found.', $selector));
+        if ($this instanceof InnerBrowser) {
+            $this->submitForm($selector, $params, sprintf('%s_submit', $name));
+
+            return;
+        }
+
+        $node = $client->getCrawler()->filter($selector);
+        $this->assertGreaterThan(0, $node->count(), sprintf('Form "%s" not found.', $selector));
         $form = $node->form();
-        $this->getClient()->submit($form, $params);
+        $client->submit($form, $params);
     }
 
     protected function assertThatForClient(Constraint $constraint, string $message = ''): void

src/Codeception/Module/Symfony/RouterAssertionsTrait.php

@@ -4,6 +4,7 @@
 
 namespace Codeception\Module\Symfony;
 
+use Codeception\Lib\InnerBrowser;
 use PHPUnit\Framework\Assert;
 use Symfony\Component\Routing\RouterInterface;
 
@@ -157,7 +158,16 @@ private function assertRouteExists(string $routeName): void
     /** @param array<string, mixed> $params */
     private function openRoute(string $routeName, array $params = []): void
     {
-        $this->getClient()->request('GET', $this->grabRouterService()->generate($routeName, $params));
+        $client = $this->getClient();
+        $url = $this->grabRouterService()->generate($routeName, $params);
+
+        if ($this instanceof InnerBrowser) {
+            $this->amOnPage($url);
+
+            return;
+        }
+
+        $client->request('GET', $url);
     }
 
     protected function grabRouterService(): RouterInterface