Merge pull request microsoft#1 from microsoft/main

Sync with source

Author: kaliiiiiiiiii

README.md

@@ -1,14 +1,14 @@
 # 🎭 Playwright
 
-[![npm version](https://img.shields.io/npm/v/playwright.svg)](https://www.npmjs.com/package/playwright) <!-- GEN:chromium-version-badge -->[![Chromium version](https://img.shields.io/badge/chromium-120.0.6099.5-blue.svg?logo=google-chrome)](https://www.chromium.org/Home)<!-- GEN:stop --> <!-- GEN:firefox-version-badge -->[![Firefox version](https://img.shields.io/badge/firefox-119.0-blue.svg?logo=firefoxbrowser)](https://www.mozilla.org/en-US/firefox/new/)<!-- GEN:stop --> <!-- GEN:webkit-version-badge -->[![WebKit version](https://img.shields.io/badge/webkit-17.4-blue.svg?logo=safari)](https://webkit.org/)<!-- GEN:stop -->
+[![npm version](https://img.shields.io/npm/v/playwright.svg)](https://www.npmjs.com/package/playwright) <!-- GEN:chromium-version-badge -->[![Chromium version](https://img.shields.io/badge/chromium-120.0.6099.18-blue.svg?logo=google-chrome)](https://www.chromium.org/Home)<!-- GEN:stop --> <!-- GEN:firefox-version-badge -->[![Firefox version](https://img.shields.io/badge/firefox-119.0-blue.svg?logo=firefoxbrowser)](https://www.mozilla.org/en-US/firefox/new/)<!-- GEN:stop --> <!-- GEN:webkit-version-badge -->[![WebKit version](https://img.shields.io/badge/webkit-17.4-blue.svg?logo=safari)](https://webkit.org/)<!-- GEN:stop -->
 
 ## [Documentation](https://playwright.dev) | [API reference](https://playwright.dev/docs/api/class-playwright)
 
 Playwright is a framework for Web Testing and Automation. It allows testing [Chromium](https://www.chromium.org/Home), [Firefox](https://www.mozilla.org/en-US/firefox/new/) and [WebKit](https://webkit.org/) with a single API. Playwright is built to enable cross-browser web automation that is **ever-green**, **capable**, **reliable** and **fast**.
 
 |          | Linux | macOS | Windows |
 |   :---   | :---: | :---: | :---:   |
-| Chromium <!-- GEN:chromium-version -->120.0.6099.5<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| Chromium <!-- GEN:chromium-version -->120.0.6099.18<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
 | WebKit <!-- GEN:webkit-version -->17.4<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
 | Firefox <!-- GEN:firefox-version -->119.0<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
 

docs/src/release-notes-js.md

@@ -30,7 +30,7 @@ test('pass', async ({ page }) => {
 });
 ```
 
-See the documentation [for a full example](./test-configuration.md#add-custom-matchers-using-expectextend).
+See the documentation [for a full example](./test-assertions.md#add-custom-matchers-using-expectextend).
 
 ### Merge test fixtures
 

docs/src/test-assertions-js.md

@@ -94,7 +94,7 @@ Prefer [auto-retrying](#auto-retrying-assertions) assertions whenever possible.
 | [`method: GenericAssertions.stringContaining`] | String contains a substring |
 | [`method: GenericAssertions.stringMatching`] | String matches a regular expression |
 
-## Negating Matchers
+## Negating matchers
 
 In general, we can expect the opposite to be true by adding a `.not` to the front
 of the matchers:
@@ -104,7 +104,7 @@ expect(value).not.toEqual(0);
 await expect(locator).not.toContainText('some text');
 ```
 
-## Soft Assertions
+## Soft assertions
 
 By default, failed assertion will terminate test execution. Playwright also
 supports *soft assertions*: failed soft assertions **do not** terminate test execution,
@@ -134,7 +134,7 @@ expect(test.info().errors).toHaveLength(0);
 
 Note that soft assertions only work with Playwright test runner.
 
-## Custom Expect Message
+## Custom expect message
 
 You can specify a custom error message as a second argument to the `expect` function, for example:
 
@@ -236,3 +236,86 @@ await expect(async () => {
   timeout: 60_000
 });
 ```
+
+## Add custom matchers using expect.extend
+
+You can extend Playwright assertions by providing custom matchers. These matchers will be available on the `expect` object.
+
+In this example we add a custom `toHaveAmount` function. Custom matcher should return a `message` callback and a `pass` flag indicating whether the assertion passed.
+
+```js title="fixtures.ts"
+import { expect as baseExpect } from '@playwright/test';
+import type { Page, Locator } from '@playwright/test';
+
+export { test } from '@playwright/test';
+
+export const expect = baseExpect.extend({
+  async toHaveAmount(locator: Locator, expected: number, options?: { timeout?: number }) {
+    const assertionName = 'toHaveAmount';
+    let pass: boolean;
+    let matcherResult: any;
+    try {
+      await baseExpect(locator).toHaveAttribute('data-amount', String(expected), options);
+      pass = true;
+    } catch (e: any) {
+      matcherResult = e.matcherResult;
+      pass = false;
+    }
+
+    const message = pass
+      ? () => this.utils.matcherHint(assertionName, undefined, undefined, { isNot: this.isNot }) +
+          '\n\n' +
+          `Locator: ${locator}\n` +
+          `Expected: ${this.isNot ? 'not' : ''}${this.utils.printExpected(expected)}\n` +
+          (matcherResult ? `Received: ${this.utils.printReceived(matcherResult.actual)}` : '')
+      : () =>  this.utils.matcherHint(assertionName, undefined, undefined, { isNot: this.isNot }) +
+          '\n\n' +
+          `Locator: ${locator}\n` +
+          `Expected: ${this.utils.printExpected(expected)}\n` +
+          (matcherResult ? `Received: ${this.utils.printReceived(matcherResult.actual)}` : '');
+
+    return {
+      message,
+      pass,
+      name: assertionName,
+      expected,
+      actual: matcherResult?.actual,
+    };
+  },
+});
+```
+
+Now we can use `toHaveAmount` in the test.
+
+```js title="example.spec.ts"
+import { test, expect } from './fixtures';
+
+test('amount', async () => {
+  await expect(page.locator('.cart')).toHaveAmount(4);
+});
+```
+
+:::note
+Do not confuse Playwright's `expect` with the [`expect` library](https://jestjs.io/docs/expect). The latter is not fully integrated with Playwright test runner, so make sure to use Playwright's own `expect`.
+:::
+
+### Combine custom matchers from multiple modules
+
+You can combine custom matchers from multiple files or modules.
+
+```js title="fixtures.ts"
+import { mergeTests, mergeExpects } from '@playwright/test';
+import { test as dbTest, expect as dbExpect } from 'database-test-utils';
+import { test as a11yTest, expect as a11yExpect } from 'a11y-test-utils';
+
+export const expect = mergeExpects(dbExpect, a11yExpect);
+export const test = mergeTests(dbTest, a11yTest);
+```
+
+```js title="test.spec.ts"
+import { test, expect } from './fixtures';
+
+test('passes', async ({ database }) => {
+  await expect(database).toHaveDatabaseUser('admin');
+});
+```

docs/src/test-configuration-js.md

@@ -150,86 +150,3 @@ export default defineConfig({
 | [`method: PageAssertions.toHaveScreenshot#1`] | Configuration for the `expect(locator).toHaveScreeshot()` method. |
 | [`method: SnapshotAssertions.toMatchSnapshot#1`]| Configuration for the `expect(locator).toMatchSnapshot()` method.|
 
-
-### Add custom matchers using expect.extend
-
-You can extend Playwright assertions by providing custom matchers. These matchers will be available on the `expect` object.
-
-In this example we add a custom `toHaveAmount` function. Custom matcher should return a `message` callback and a `pass` flag indicating whether the assertion passed.
-
-```js title="fixtures.ts"
-import { expect as baseExpect } from '@playwright/test';
-import type { Page, Locator } from '@playwright/test';
-
-export { test } from '@playwright/test';
-
-export const expect = baseExpect.extend({
-  async toHaveAmount(locator: Locator, expected: number, options?: { timeout?: number }) {
-    const assertionName = 'toHaveAmount';
-    let pass: boolean;
-    let matcherResult: any;
-    try {
-      await baseExpect(locator).toHaveAttribute('data-amount', String(expected), options);
-      pass = true;
-    } catch (e: any) {
-      matcherResult = e.matcherResult;
-      pass = false;
-    }
-
-    const message = pass
-      ? () => this.utils.matcherHint(assertionName, undefined, undefined, { isNot: this.isNot }) +
-          '\n\n' +
-          `Locator: ${locator}\n` +
-          `Expected: ${this.isNot ? 'not' : ''}${this.utils.printExpected(expected)}\n` +
-          (matcherResult ? `Received: ${this.utils.printReceived(matcherResult.actual)}` : '')
-      : () =>  this.utils.matcherHint(assertionName, undefined, undefined, { isNot: this.isNot }) +
-          '\n\n' +
-          `Locator: ${locator}\n` +
-          `Expected: ${this.utils.printExpected(expected)}\n` +
-          (matcherResult ? `Received: ${this.utils.printReceived(matcherResult.actual)}` : '');
-
-    return {
-      message,
-      pass,
-      name: assertionName,
-      expected,
-      actual: matcherResult?.actual,
-    };
-  },
-});
-```
-
-Now we can use `toHaveAmount` in the test.
-
-```js title="example.spec.ts"
-import { test, expect } from './fixtures';
-
-test('amount', async () => {
-  await expect(page.locator('.cart')).toHaveAmount(4);
-});
-```
-
-:::note
-Do not confuse Playwright's `expect` with the [`expect` library](https://jestjs.io/docs/expect). The latter is not fully integrated with Playwright test runner, so make sure to use Playwright's own `expect`.
-:::
-
-### Combine custom matchers from multiple modules
-
-You can combine custom matchers from multiple files or modules.
-
-```js title="fixtures.ts"
-import { mergeTests, mergeExpects } from '@playwright/test';
-import { test as dbTest, expect as dbExpect } from 'database-test-utils';
-import { test as a11yTest, expect as a11yExpect } from 'a11y-test-utils';
-
-export const expect = mergeExpects(dbExpect, a11yExpect);
-export const test = mergeTests(dbTest, a11yTest);
-```
-
-```js title="test.spec.ts"
-import { test, expect } from './fixtures';
-
-test('passes', async ({ database }) => {
-  await expect(database).toHaveDatabaseUser('admin');
-});
-```

packages/playwright-core/browsers.json

@@ -3,21 +3,21 @@
   "browsers": [
     {
       "name": "chromium",
-      "revision": "1089",
+      "revision": "1090",
       "installByDefault": true,
-      "browserVersion": "120.0.6099.5"
+      "browserVersion": "120.0.6099.18"
     },
     {
       "name": "chromium-with-symbols",
-      "revision": "1089",
+      "revision": "1090",
       "installByDefault": false,
-      "browserVersion": "120.0.6099.5"
+      "browserVersion": "120.0.6099.18"
     },
     {
       "name": "chromium-tip-of-tree",
-      "revision": "1166",
+      "revision": "1167",
       "installByDefault": false,
-      "browserVersion": "121.0.6113.0"
+      "browserVersion": "121.0.6117.0"
     },
     {
       "name": "firefox",
@@ -39,7 +39,7 @@
     },
     {
       "name": "webkit",
-      "revision": "1932",
+      "revision": "1942",
       "installByDefault": true,
       "revisionOverrides": {
         "mac10.14": "1446",

packages/playwright-core/src/client/android.ts

@@ -274,8 +274,10 @@ export class AndroidDevice extends ChannelOwner<channels.AndroidDeviceChannel> i
 
   async launchBrowser(options: types.BrowserContextOptions & { pkg?: string } = {}): Promise<BrowserContext> {
     const contextOptions = await prepareBrowserContextParams(options);
-    const { context } = await this._channel.launchBrowser(contextOptions);
-    return BrowserContext.from(context) as BrowserContext;
+    const result = await this._channel.launchBrowser(contextOptions);
+    const context = BrowserContext.from(result.context) as BrowserContext;
+    context._setOptions(contextOptions, {});
+    return context;
   }
 
   async waitForEvent(event: string, optionsOrPredicate: types.WaitForEventOptions = {}): Promise<any> {

packages/playwright-core/src/client/page.ts

@@ -42,6 +42,7 @@ import { Keyboard, Mouse, Touchscreen } from './input';
 import { assertMaxArguments, JSHandle, parseResult, serializeArgument } from './jsHandle';
 import type { FrameLocator, Locator, LocatorOptions } from './locator';
 import type { ByRoleOptions } from '../utils/isomorphic/locatorUtils';
+import { trimStringWithEllipsis } from '../utils/isomorphic/stringUtils';
 import { type RouteHandlerCallback, type Request, Response, Route, RouteHandler, validateHeaders, WebSocket } from './network';
 import type { FilePayload, Headers, LifecycleEvent, SelectOption, SelectOptionOptions, Size, URLMatch, WaitForEventOptions, WaitForFunctionOptions } from './types';
 import { Video } from './video';
@@ -751,15 +752,9 @@ export class BindingCall extends ChannelOwner<channels.BindingCallChannel> {
   }
 }
 
-function trimEnd(s: string): string {
-  if (s.length > 50)
-    s = s.substring(0, 50) + '\u2026';
-  return s;
-}
-
 function trimUrl(param: any): string | undefined {
   if (isRegExp(param))
-    return `/${trimEnd(param.source)}/${param.flags}`;
+    return `/${trimStringWithEllipsis(param.source, 50)}/${param.flags}`;
   if (isString(param))
-    return `"${trimEnd(param)}"`;
+    return `"${trimStringWithEllipsis(param, 50)}"`;
 }

packages/playwright-core/src/server/chromium/protocol.d.ts

@@ -878,7 +878,7 @@ Should be updated alongside RequestIdTokenStatus in
 third_party/blink/public/mojom/devtools/inspector_issue.mojom to include
 all cases except for success.
      */
-    export type FederatedAuthRequestIssueReason = "ShouldEmbargo"|"TooManyRequests"|"WellKnownHttpNotFound"|"WellKnownNoResponse"|"WellKnownInvalidResponse"|"WellKnownListEmpty"|"WellKnownInvalidContentType"|"ConfigNotInWellKnown"|"WellKnownTooBig"|"ConfigHttpNotFound"|"ConfigNoResponse"|"ConfigInvalidResponse"|"ConfigInvalidContentType"|"ClientMetadataHttpNotFound"|"ClientMetadataNoResponse"|"ClientMetadataInvalidResponse"|"ClientMetadataInvalidContentType"|"DisabledInSettings"|"ErrorFetchingSignin"|"InvalidSigninResponse"|"AccountsHttpNotFound"|"AccountsNoResponse"|"AccountsInvalidResponse"|"AccountsListEmpty"|"AccountsInvalidContentType"|"IdTokenHttpNotFound"|"IdTokenNoResponse"|"IdTokenInvalidResponse"|"IdTokenInvalidRequest"|"IdTokenInvalidContentType"|"ErrorIdToken"|"Canceled"|"RpPageNotVisible"|"SilentMediationFailure"|"ThirdPartyCookiesBlocked"|"NotSignedInWithIdp";
+    export type FederatedAuthRequestIssueReason = "ShouldEmbargo"|"TooManyRequests"|"WellKnownHttpNotFound"|"WellKnownNoResponse"|"WellKnownInvalidResponse"|"WellKnownListEmpty"|"WellKnownInvalidContentType"|"ConfigNotInWellKnown"|"WellKnownTooBig"|"ConfigHttpNotFound"|"ConfigNoResponse"|"ConfigInvalidResponse"|"ConfigInvalidContentType"|"ClientMetadataHttpNotFound"|"ClientMetadataNoResponse"|"ClientMetadataInvalidResponse"|"ClientMetadataInvalidContentType"|"DisabledInSettings"|"ErrorFetchingSignin"|"InvalidSigninResponse"|"AccountsHttpNotFound"|"AccountsNoResponse"|"AccountsInvalidResponse"|"AccountsListEmpty"|"AccountsInvalidContentType"|"IdTokenHttpNotFound"|"IdTokenNoResponse"|"IdTokenInvalidResponse"|"IdTokenIdpErrorResponse"|"IdTokenCrossSiteIdpErrorResponse"|"IdTokenInvalidRequest"|"IdTokenInvalidContentType"|"ErrorIdToken"|"Canceled"|"RpPageNotVisible"|"SilentMediationFailure"|"ThirdPartyCookiesBlocked"|"NotSignedInWithIdp";
     export interface FederatedAuthUserInfoRequestIssueDetails {
       federatedAuthUserInfoRequestIssueReason: FederatedAuthUserInfoRequestIssueReason;
     }