chore: adjusts tests

Author: nunomaduro

src/Playwright/Client.php

@@ -60,7 +60,7 @@ public function execute(string $guid, string $method, array $params = [], array
             'id' => $requestId,
             'guid' => $guid,
             'method' => $method,
-            'params' => $params,
+            'params' => ['timeout' => 30_000, ...$params],
             'metadata' => $meta,
         ]);
 

src/Playwright/Locator.php

@@ -470,8 +470,9 @@ public function count(): int
     }
 
     /**
-     * Get the Element handle for this locator.
-     * Returns the first element matching the locator.
+     * Get the Element handle for this locator. Returns the first element matching the locator.
+     *
+     * @internal
      */
     public function elementHandle(): ?Element
     {

tests/Browser/Expectations/ToBeEmptyTest.php

@@ -13,17 +13,17 @@
 it('fails when element is not empty', function (): void {
     $page = $this->page()->goto('/test/form-inputs');
 
-    expect($page->locator('input[name="default-checkbox"]'))->toBeEmpty();
+    expect($page->locator('label[for="email"]'))->toBeEmpty();
 })->throws(ExpectationFailedException::class);
 
 it('passes when element is not empty and we expect it not to be', function (): void {
     $page = $this->page()->goto('/test/form-inputs');
 
-    expect($page->locator('input[name="default-checkbox"]'))->not->toBeEmpty();
+    expect($page->locator('label[for="email"]'))->not->toBeEmpty();
 });
 
 it('fails when element is empty but we expect it not to be', function (): void {
     $page = $this->page()->goto('/test/form-inputs');
 
-    expect($page->locator('input[name="empty-input"]'))->not->toBeEmpty();
+    expect($page->locator('#empty-element'))->not->toBeEmpty();
 })->throws(ExpectationFailedException::class);

tests/Browser/Expectations/ToHaveRoleTest.php

@@ -4,26 +4,13 @@
 
 use PHPUnit\Framework\ExpectationFailedException;
 
-it('passes when element has the expected role', function (): void {
+it('passes when has the expected role', function (): void {
     $page = $this->page()->goto('/test/element-tests');
-    expect($page->getByTestId('enabled-button'))->toHaveRole('button');
-});
 
-it('fails when element does not have the expected role', function (): void {
-    $page = $this->page()->goto('/test/element-tests');
-    $containerLocator = $page->getByTestId('enabled-button');
-    $container = $containerLocator->elementHandle();
-    expect($container)->toHaveRole('checkbox');
-})->throws(ExpectationFailedException::class);
-
-it('passes when element does not have the role and we expect it not to', function (): void {
-    $page = $this->page()->goto('/test/element-tests');
-    $containerLocator = $page->getByTestId('enabled-button');
-    $container = $containerLocator->elementHandle();
-    expect($container)->not->toHaveRole('checkbox');
+    expect($page->getByTestId('enabled-button'))->toHaveRole('button');
 });
 
-it('fails when element has the role but we expect it not to', function (): void {
+it('fails when has the role but we expect it not to', function (): void {
     $page = $this->page()->goto('/test/element-tests');
     expect($page->getByTestId('enabled-button'))->not->toHaveRole('button');
 })->throws(ExpectationFailedException::class);

tests/Browser/Playwright/Page/TextContentTest.php

@@ -13,14 +13,15 @@
     $page = $this->page('/test/frame-tests');
     $text = $page->textContent('#mixed-content');
 
-
     expect($text)->toContain('Paragraph with bold and italic text');
     expect($text)->toContain('List item 1');
     expect($text)->toContain('List item 2');
 });
 
 it('gets text content as empty string when no content', function (): void {
-    $text = $this->page->textContent('#empty-id');
+    $page = $this->page('/test/frame-tests');
+
+    $text = $page->textContent('#empty-id');
 
     expect($text)->toBe('');
 });

tests/Pest.php

@@ -5,6 +5,7 @@
 use Pest\Browser\Playwright\Locator;
 use Pest\Browser\Playwright\Page;
 use Pest\Expectation;
+use Pest\Mixins\Expectation as ExpectationMixin;
 
 // todo: move this to Pest core
 expect()->extend('toHaveTitle', function (string $title): Expectation {
@@ -85,8 +86,8 @@
 
 expect()->extend('toHaveId', function (string $id): Expectation {
 
-    if (! $this->value instanceof Element && ! $this->value instanceof Locator) {
-        throw new InvalidArgumentException('Expected value to be an Element or Locator instance');
+    if (! $this->value instanceof Locator) {
+        throw new InvalidArgumentException('Expected value to be an Locator instance');
     }
 
     expect($this->value->getAttribute('id'))->toBe($id);
@@ -96,8 +97,8 @@
 
 expect()->extend('toHaveClass', function (string $id): Expectation {
 
-    if (! $this->value instanceof Element && ! $this->value instanceof Locator) {
-        throw new InvalidArgumentException('Expected value to be an Element or Locator instance');
+    if (! $this->value instanceof Locator) {
+        throw new InvalidArgumentException('Expected value to be an Locator instance');
     }
 
     expect($this->value->getAttribute('class'))->toBe($id);
@@ -106,29 +107,26 @@
 });
 
 expect()->extend('toHaveRole', function (string $role): Expectation {
-
-    if (! $this->value instanceof Element && ! $this->value instanceof Locator) {
-        throw new InvalidArgumentException('Expected value to be an Element or Locator instance');
+    if (! $this->value instanceof Locator) {
+        throw new InvalidArgumentException('Expected value to be an Locator instance');
     }
 
     expect($this->value->getByRole($role))->not->toBeNull();
 
     return $this;
 });
 
-expect()->intercept(
-    'toBeEmpty',
-    Locator::class,
-    function (string $id): Expectation {
-        if (! $this->value instanceof Element && ! $this->value instanceof Locator) {
-            throw new InvalidArgumentException('Expected value to be an Element or Locator instance');
+expect()->intercept('toBeEmpty', Locator::class,
+    function (): ExpectationMixin {
+
+        if (! $this->value instanceof Locator) {
+            throw new InvalidArgumentException('Expected value to be an Locator instance');
         }
 
         expect($this->value->textContent())->toBe('');
 
         return $this;
     }
 );
-        
 
 // todo: move this to Pest core end