Merge branch 'pestphp:4.x' into feature/configurable-browser-launch-args

Author: cyppe

composer.json

@@ -17,9 +17,9 @@
         "amphp/amp": "^3.1.1",
         "amphp/http-server": "^3.4.3",
         "amphp/websocket-client": "^2.0.2",
-        "pestphp/pest": "^4.0.4",
+        "pestphp/pest": "^4.1.0",
         "pestphp/pest-plugin": "^4.0.0",
-        "symfony/process": "^7.3.3"
+        "symfony/process": "^7.3.4"
     },
     "autoload": {
         "psr-4": {

src/Api/Concerns/MakesElementAssertions.php

@@ -199,6 +199,19 @@ public function assertSourceHas(string $code): Webpage
         return $this;
     }
 
+    /**
+     * Assert that the given source code is present within the selector.
+     */
+    public function assertSourceInHas(string $selector, string $code): Webpage
+    {
+        $locator = $this->guessLocator($selector);
+        $html = $locator->innerHTML();
+        $message = "Expected page source to contain [{$code}] on the page initially with the url [{$this->initialUrl}], but it was not found.";
+        expect(str_contains($html, $code))->toBeTrue($message);
+
+        return $this;
+    }
+
     /**
      * Assert that the given source code is not present on the page.
      */
@@ -211,6 +224,19 @@ public function assertSourceMissing(string $code): Webpage
         return $this;
     }
 
+    /**
+     * Assert that the given source code is not present within the selector.
+     */
+    public function assertSourceInMissing(string $selector, string $code): Webpage
+    {
+        $locator = $this->guessLocator($selector);
+        $html = $locator->innerHTML();
+        $message = "Expected page source not to contain [{$code}] on the page initially with the url [{$this->initialUrl}], but it was found.";
+        expect(str_contains($html, $code))->toBeFalse($message);
+
+        return $this;
+    }
+
     /**
      * Assert that the given link is present on the page.
      */

src/Browsable.php

@@ -60,4 +60,12 @@ public function visit(array|string $url, array $options = []): ArrayablePendingA
             ), $url),
         );
     }
+
+    /**
+     * @return array <string, string>
+     */
+    protected function serverVariables(): array
+    {
+        return property_exists($this, 'serverVariables') ? $this->serverVariables : [];
+    }
 }

src/Drivers/LaravelHttpServer.php

@@ -5,6 +5,7 @@
 namespace Pest\Browser\Drivers;
 
 use Amp\ByteStream\ReadableResourceStream;
+use Amp\Http\Cookie\RequestCookie;
 use Amp\Http\Server\DefaultErrorHandler;
 use Amp\Http\Server\HttpServer as AmpHttpServer;
 use Amp\Http\Server\HttpServerStatus;
@@ -242,14 +243,18 @@ private function handleRequest(AmpRequest $request): Response
         if ($method !== 'GET' && str_starts_with(mb_strtolower($contentType), 'application/x-www-form-urlencoded')) {
             parse_str($rawBody, $parameters);
         }
+        $cookies = array_map(fn (RequestCookie $cookie): string => urldecode($cookie->getValue()), $request->getCookies());
+        $cookies = array_merge($cookies, test()->prepareCookiesForRequest()); // @phpstan-ignore-line
+        /** @var array<string, string> $serverVariables */
+        $serverVariables = test()->serverVariables(); // @phpstan-ignore-line
 
         $symfonyRequest = Request::create(
             $absoluteUrl,
             $method,
             $parameters,
-            $request->getCookies(),
+            $cookies,
             [], // @TODO files...
-            [], // @TODO server variables...
+            $serverVariables,
             $rawBody
         );
 

src/Support/JavaScriptSerializer.php

@@ -148,7 +148,7 @@ public static function parseValue(mixed $value): mixed
 
         // Handle arrays
         if (isset($value['a'])) {
-            return array_map(fn (mixed $item): mixed => self::parseValue($item), $value['a']);
+            return array_map(self::parseValue(...), $value['a']);
         }
 
         // Handle objects

src/Support/Selector.php

@@ -21,15 +21,16 @@ public static function isExplicit(string $selector): bool
             return false;
         }
 
-        $cssSpecialChars = ['[', ']', '#', '.', '>', '+', '~', ':', '*', '|', '^', ',', '=', ',', '(', ')'];
+        $cssSpecialChars = ['[', ']', '#', '>', '+', '~', ':', '*', '|', '^', ',', '=', ',', '(', ')'];
 
         foreach ($cssSpecialChars as $cssSpecialChar) {
             if (str_contains($selector, $cssSpecialChar)) {
                 return true;
             }
         }
 
-        return false;
+        // A period is a CSS selector if it's followed by a valid CSS class name pattern
+        return (bool) preg_match('/\.[a-zA-Z_-][a-zA-Z0-9_-]*/', $selector);
     }
 
     /**

tests/Browser/Visit/SingleUrl.php

@@ -27,7 +27,7 @@
 
     $page->assertSee('Experience elegance across every device.')
         ->assertScreenshotMatches();
-})->with($methods)->skipOnCI();
+})->with($methods)->onlyOnMac()->skipOnCI();
 
 it('may visit a page in light/dark mode', function (ColorScheme $scheme): void {
     Route::get('/', fn (): string => '
@@ -71,7 +71,7 @@
     };
 
     $page->assertScreenshotMatches();
-})->with(ColorScheme::cases())->skipOnCI();
+})->with(ColorScheme::cases())->onlyOnMac()->skipOnCI();
 
 it('may visit a page with custom locale and timezone', function (): void {
     Route::get('/', fn (): string => '

tests/Browser/Webpage/AssertScreenshotMatchesTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-beforeEach()->skipOnCI();
+beforeEach()->onlyOnMac()->skipOnCI();
 
 it('may match a screenshot', function (): void {
     Route::get('/', fn (): string => '

tests/Browser/Webpage/AssertSourceTest.php

@@ -20,6 +20,22 @@
     $page->assertSourceHas('<div id="content">Hello Universe</div>');
 })->throws(ExpectationFailedException::class);
 
+it('may assert source code is present within a selector', function (): void {
+    Route::get('/', fn (): string => '<div id="content"><strong>Hello World</strong></div>');
+
+    $page = visit('/');
+
+    $page->assertSourceInHas('#content', '<strong>Hello World</strong>');
+});
+
+it('may fail when asserting source code is present within a selector but it is not', function (): void {
+    Route::get('/', fn (): string => '<div id="content">Hello World</div>');
+
+    $page = visit('/');
+
+    $page->assertSourceInHas('#content', '<strong>Hello World</strong>');
+})->throws(ExpectationFailedException::class);
+
 it('may assert source code is not present on the page', function (): void {
     Route::get('/', fn (): string => '<div id="content">Hello World</div>');
 
@@ -35,3 +51,19 @@
 
     $page->assertSourceMissing('<div id="content">Hello World</div>');
 })->throws(ExpectationFailedException::class);
+
+it('may assert source code is not present within a selector', function (): void {
+    Route::get('/', fn (): string => '<div id="content">Hello World</div>');
+
+    $page = visit('/');
+
+    $page->assertSourceInMissing('#content', '<strong>Hello World</strong>');
+});
+
+it('may fail when asserting source code is not present within a selector but it is', function (): void {
+    Route::get('/', fn (): string => '<div id="content"><strong>Hello World</strong></div>');
+
+    $page = visit('/');
+
+    $page->assertSourceInMissing('#content', '<strong>Hello World</strong>');
+})->throws(ExpectationFailedException::class);

tests/Unit/Drivers/Laravel/LaravelHttpServerTest.php

@@ -2,6 +2,11 @@
 
 declare(strict_types=1);
 
+use Illuminate\Http\Request;
+
+use function Pest\Laravel\withServerVariables;
+use function Pest\Laravel\withUnencryptedCookie;
+
 it('rewrites the URLs on JS files', function (): void {
     @file_put_contents(
         public_path('app.js'),
@@ -15,3 +20,19 @@
     $page->assertSee('http://127.0.0.1')
         ->assertDontSee('http://localhost');
 });
+
+it('includes cookies set in the test', function (): void {
+    Route::get('/cookies', fn (Request $request): array => $request->cookies->all());
+
+    withUnencryptedCookie('test-cookie', value: 'test value');
+    visit('/cookies')
+        ->assertSee(json_encode(['test-cookie' => 'test value']));
+});
+
+it('includes server variables set in the test', function (): void {
+    Route::get('/server-variables', fn (Request $request): array => $request->server->all());
+
+    withServerVariables(['test-server-key' => 'test value']);
+    visit('/server-variables')
+        ->assertSee('"test-server-key":"test value"');
+});