fix: replace expect(generic) with expect(value) (#1109)

dotnet/docs/api/class-apiresponseassertions.mdx

@@ -35,7 +35,7 @@ Makes the assertion check for the opposite condition. For example, this code tes
 **Usage**
 
 ```csharp
-Expect(ApiResponse).Not
+Expect(Response).Not
 ```
 
 **Type**

dotnet/docs/release-notes.mdx

@@ -288,7 +288,7 @@ This version was also tested against the following stable channels:
 - [Expect(Locator).ToHaveTextAsync()](/api/class-locatorassertions.mdx#locator-assertions-to-have-text) now pierces open shadow roots.
 - New option `Editable` for [Expect(Locator).ToBeEditableAsync()](/api/class-locatorassertions.mdx#locator-assertions-to-be-editable).
 - New option `Visible` for [Expect(Locator).ToBeVisibleAsync()](/api/class-locatorassertions.mdx#locator-assertions-to-be-visible).
-- [Expect(ApiResponse).ToBeOKAsync()](/api/class-apiresponseassertions.mdx#api-response-assertions-to-be-ok) is now available.
+- [Expect(Response).ToBeOKAsync()](/api/class-apiresponseassertions.mdx#api-response-assertions-to-be-ok) is now available.
 
 ### Other highlights
 - New option `MaxRedirects` for [ApiRequestContext.GetAsync()](/api/class-apirequestcontext.mdx#api-request-context-get) and others to limit redirect count.

dotnet/docs/test-assertions.mdx

@@ -30,7 +30,7 @@ import HTMLCard from '@site/src/components/HTMLCard';
 | [Expect(Locator).ToHaveValuesAsync()](/api/class-locatorassertions.mdx#locator-assertions-to-have-values) | Select has options selected |
 | [Expect(Page).ToHaveTitleAsync()](/api/class-pageassertions.mdx#page-assertions-to-have-title) | Page has a title |
 | [Expect(Page).ToHaveURLAsync()](/api/class-pageassertions.mdx#page-assertions-to-have-url) | Page has a URL |
-| [Expect(ApiResponse).ToBeOKAsync()](/api/class-apiresponseassertions.mdx#api-response-assertions-to-be-ok) | Response has an OK status |
+| [Expect(Response).ToBeOKAsync()](/api/class-apiresponseassertions.mdx#api-response-assertions-to-be-ok) | Response has an OK status |
 
 
 [Accessibility]: /api/class-accessibility.mdx "Accessibility"

java/docs/api/class-apiresponseassertions.mdx

@@ -58,7 +58,7 @@ assertThat(response).not().isOK();
 **Usage**
 
 ```java
-assertThat(apiResponse).not()
+assertThat(response).not()
 ```
 
 **Returns**

java/docs/test-assertions.mdx

@@ -30,7 +30,7 @@ import HTMLCard from '@site/src/components/HTMLCard';
 | [assertThat(locator).hasValues()](/api/class-locatorassertions.mdx#locator-assertions-to-have-values) | Select has options selected |
 | [assertThat(page).hasTitle()](/api/class-pageassertions.mdx#page-assertions-to-have-title) | Page has a title |
 | [assertThat(page).hasURL()](/api/class-pageassertions.mdx#page-assertions-to-have-url) | Page has a URL |
-| [assertThat(apiResponse).isOK()](/api/class-apiresponseassertions.mdx#api-response-assertions-to-be-ok) | Response has an OK status |
+| [assertThat(response).isOK()](/api/class-apiresponseassertions.mdx#api-response-assertions-to-be-ok) | Response has an OK status |
 
 
 [APIRequest]: /api/class-apirequest.mdx "APIRequest"

nodejs/docs/api/class-apiresponseassertions.mdx

@@ -53,7 +53,7 @@ await expect(response).not.toBeOK();
 **Usage**
 
 ```js
-expect(apiResponse).not
+expect(response).not
 ```
 
 **Type**

nodejs/docs/api/class-genericassertions.mdx

@@ -49,7 +49,7 @@ expect(value.prop).toBe(1);
 
 <font size="2" style={{position: "relative", top: "-20px"}}>Added in: v1.9</font><x-search>genericAssertions.toBeCloseTo</x-search>
 
-Compares floating point numbers for approximate equality. Use this method instead of [expect(generic).toBe()](/api/class-genericassertions.mdx#generic-assertions-to-be) when comparing floating point numbers.
+Compares floating point numbers for approximate equality. Use this method instead of [expect(value).toBe()](/api/class-genericassertions.mdx#generic-assertions-to-be) when comparing floating point numbers.
 
 **Usage**
 
@@ -308,9 +308,9 @@ expect(new Set(value)).toContain(2);
 
 Ensures that value is an `Array` or `Set` and contains an item equal to the expected.
 
-For objects, this method recursively checks equality of all fields, rather than comparing objects by reference as performed by [expect(generic).toContain()](/api/class-genericassertions.mdx#generic-assertions-to-contain-2).
+For objects, this method recursively checks equality of all fields, rather than comparing objects by reference as performed by [expect(value).toContain()](/api/class-genericassertions.mdx#generic-assertions-to-contain-2).
 
-For primitive values, this method is equivalent to [expect(generic).toContain()](/api/class-genericassertions.mdx#generic-assertions-to-contain-2).
+For primitive values, this method is equivalent to [expect(value).toContain()](/api/class-genericassertions.mdx#generic-assertions-to-contain-2).
 
 **Usage**
 
@@ -337,9 +337,9 @@ expect(new Set(value)).toContainEqual({ another: 2 });
 
 Compares contents of the value with contents of `expected`, performing "deep equality" check.
 
-For objects, this method recursively checks equality of all fields, rather than comparing objects by reference as performed by [expect(generic).toBe()](/api/class-genericassertions.mdx#generic-assertions-to-be).
+For objects, this method recursively checks equality of all fields, rather than comparing objects by reference as performed by [expect(value).toBe()](/api/class-genericassertions.mdx#generic-assertions-to-be).
 
-For primitive values, this method is equivalent to [expect(generic).toBe()](/api/class-genericassertions.mdx#generic-assertions-to-be).
+For primitive values, this method is equivalent to [expect(value).toBe()](/api/class-genericassertions.mdx#generic-assertions-to-be).
 
 **Usage**
 
@@ -379,7 +379,7 @@ expect([1, 2, 3]).toHaveLength(3);
 
 <font size="2" style={{position: "relative", top: "-20px"}}>Added in: v1.9</font><x-search>genericAssertions.toHaveProperty</x-search>
 
-Ensures that property at provided `keyPath` exists on the object and optionally checks that property is equal to the `expected`. Equality is checked recursively, similarly to [expect(generic).toEqual()](/api/class-genericassertions.mdx#generic-assertions-to-equal).
+Ensures that property at provided `keyPath` exists on the object and optionally checks that property is equal to the `expected`. Equality is checked recursively, similarly to [expect(value).toEqual()](/api/class-genericassertions.mdx#generic-assertions-to-equal).
 
 **Usage**
 
@@ -431,7 +431,7 @@ expect(value).toMatch(/Is \d+ enough/);
 
 <font size="2" style={{position: "relative", top: "-20px"}}>Added in: v1.9</font><x-search>genericAssertions.toMatchObject</x-search>
 
-Compares contents of the value with contents of `expected`, performing "deep equality" check. Allows extra properties to be present in the value, unlike [expect(generic).toEqual()](/api/class-genericassertions.mdx#generic-assertions-to-equal), so you can check just a subset of object properties.
+Compares contents of the value with contents of `expected`, performing "deep equality" check. Allows extra properties to be present in the value, unlike [expect(value).toEqual()](/api/class-genericassertions.mdx#generic-assertions-to-equal), so you can check just a subset of object properties.
 
 When comparing arrays, the number of items must match, and each item is checked recursively.
 
@@ -462,7 +462,7 @@ expect([{ a: 1, b: 2 }]).toMatchObject([{ a: 1 }]);
 
 Compares contents of the value with contents of `expected` **and** their types.
 
-Differences from [expect(generic).toEqual()](/api/class-genericassertions.mdx#generic-assertions-to-equal):
+Differences from [expect(value).toEqual()](/api/class-genericassertions.mdx#generic-assertions-to-equal):
 * Keys with undefined properties are checked. For example, `{ a: undefined, b: 2 }` does not match `{ b: 2 }`.
 * Array sparseness is checked. For example, `[, 1]` does not match `[undefined, 1]`.
 * Object types are checked to be equal. For example, a class instance with fields `a` and `b` will not equal a literal object with fields `a` and `b`.
@@ -520,7 +520,7 @@ expect(() => {
 
 <font size="2" style={{position: "relative", top: "-20px"}}>Added in: v1.9</font><x-search>genericAssertions.toThrowError</x-search>
 
-An alias for [expect(generic).toThrow()](/api/class-genericassertions.mdx#generic-assertions-to-throw).
+An alias for [expect(value).toThrow()](/api/class-genericassertions.mdx#generic-assertions-to-throw).
 
 **Usage**
 
@@ -553,7 +553,7 @@ await expect(value).not.toBe(2);
 **Usage**
 
 ```js
-expect(generic).not
+expect(value).not
 ```
 
 **Type**

nodejs/docs/api/class-testconfig.mdx

@@ -111,7 +111,7 @@ export default defineConfig({
 
       an acceptable ratio of pixels that are different to the total amount of pixels, between `0` and `1` , unset by default.
 
-    Configuration for the [expect(snapshot).toMatchSnapshot()](/api/class-snapshotassertions.mdx#snapshot-assertions-to-match-snapshot-1) method.
+    Configuration for the [expect(value).toMatchSnapshot()](/api/class-snapshotassertions.mdx#snapshot-assertions-to-match-snapshot-1) method.
 
 ---
 
@@ -603,7 +603,7 @@ export default defineConfig({
 
 <font size="2" style={{position: "relative", top: "-20px"}}>Added in: v1.28</font><x-search>testConfig.snapshotPathTemplate</x-search>
 
-This option configures a template controlling location of snapshots generated by [expect(page).toHaveScreenshot()](/api/class-pageassertions.mdx#page-assertions-to-have-screenshot-1) and [expect(snapshot).toMatchSnapshot()](/api/class-snapshotassertions.mdx#snapshot-assertions-to-match-snapshot-1).
+This option configures a template controlling location of snapshots generated by [expect(page).toHaveScreenshot()](/api/class-pageassertions.mdx#page-assertions-to-have-screenshot-1) and [expect(value).toMatchSnapshot()](/api/class-snapshotassertions.mdx#snapshot-assertions-to-match-snapshot-1).
 
 **Usage**
 

nodejs/docs/api/class-testproject.mdx

@@ -148,7 +148,7 @@ testProject.expect
 
       an acceptable ratio of pixels that are different to the total amount of pixels, between `0` and `1` , unset by default.
 
-    Configuration for the [expect(snapshot).toMatchSnapshot()](/api/class-snapshotassertions.mdx#snapshot-assertions-to-match-snapshot-1) method.
+    Configuration for the [expect(value).toMatchSnapshot()](/api/class-snapshotassertions.mdx#snapshot-assertions-to-match-snapshot-1) method.
 
 ---
 
@@ -341,7 +341,7 @@ testProject.snapshotDir
 
 <font size="2" style={{position: "relative", top: "-20px"}}>Added in: v1.28</font><x-search>testProject.snapshotPathTemplate</x-search>
 
-This option configures a template controlling location of snapshots generated by [expect(page).toHaveScreenshot()](/api/class-pageassertions.mdx#page-assertions-to-have-screenshot-1) and [expect(snapshot).toMatchSnapshot()](/api/class-snapshotassertions.mdx#snapshot-assertions-to-match-snapshot-1).
+This option configures a template controlling location of snapshots generated by [expect(page).toHaveScreenshot()](/api/class-pageassertions.mdx#page-assertions-to-have-screenshot-1) and [expect(value).toMatchSnapshot()](/api/class-snapshotassertions.mdx#snapshot-assertions-to-match-snapshot-1).
 
 **Usage**
 

nodejs/docs/release-notes.mdx

@@ -468,7 +468,7 @@ This version was also tested against the following stable channels:
   test('runs second', async ({ page }) => {});
   ```
 
-* Use [testProject.snapshotPathTemplate](/api/class-testproject.mdx#test-project-snapshot-path-template) and [testConfig.snapshotPathTemplate](/api/class-testconfig.mdx#test-config-snapshot-path-template) to configure a template controlling location of snapshots generated by [expect(page).toHaveScreenshot()](/api/class-pageassertions.mdx#page-assertions-to-have-screenshot-1) and [expect(snapshot).toMatchSnapshot()](/api/class-snapshotassertions.mdx#snapshot-assertions-to-match-snapshot-1).
+* Use [testProject.snapshotPathTemplate](/api/class-testproject.mdx#test-project-snapshot-path-template) and [testConfig.snapshotPathTemplate](/api/class-testconfig.mdx#test-config-snapshot-path-template) to configure a template controlling location of snapshots generated by [expect(page).toHaveScreenshot()](/api/class-pageassertions.mdx#page-assertions-to-have-screenshot-1) and [expect(value).toMatchSnapshot()](/api/class-snapshotassertions.mdx#snapshot-assertions-to-match-snapshot-1).
 
   ```js title="playwright.config.ts"
   import { defineConfig } from '@playwright/test';
@@ -927,7 +927,7 @@ WebServer is now considered "ready" if request to the specified url has any of t
   await expect(page).toHaveScreenshot();
   ```
   
-  The new [expect(page).toHaveScreenshot()](/api/class-pageassertions.mdx#page-assertions-to-have-screenshot-1) saves screenshots at the same location as [expect(snapshot).toMatchSnapshot()](/api/class-snapshotassertions.mdx#snapshot-assertions-to-match-snapshot-1).
+  The new [expect(page).toHaveScreenshot()](/api/class-pageassertions.mdx#page-assertions-to-have-screenshot-1) saves screenshots at the same location as [expect(value).toMatchSnapshot()](/api/class-snapshotassertions.mdx#snapshot-assertions-to-match-snapshot-1).
 
 ## Version 1.21
 

nodejs/docs/test-assertions.mdx

@@ -50,7 +50,7 @@ By default, the timeout for assertions is set to 5 seconds. Learn more about [va
 | [expect(page).toHaveScreenshot()](/api/class-pageassertions.mdx#page-assertions-to-have-screenshot-1) | Page has a screenshot |
 | [expect(page).toHaveTitle()](/api/class-pageassertions.mdx#page-assertions-to-have-title) | Page has a title |
 | [expect(page).toHaveURL()](/api/class-pageassertions.mdx#page-assertions-to-have-url) | Page has a URL |
-| [expect(apiResponse).toBeOK()](/api/class-apiresponseassertions.mdx#api-response-assertions-to-be-ok) | Response has an OK status |
+| [expect(response).toBeOK()](/api/class-apiresponseassertions.mdx#api-response-assertions-to-be-ok) | Response has an OK status |
 
 ## Negating Matchers
 

nodejs/docs/test-configuration.mdx

@@ -148,7 +148,7 @@ export default defineConfig({
 | :- | :- |
 | [testConfig.expect](/api/class-testconfig.mdx#test-config-expect) | [Web first assertions](./test-assertions.mdx) like `expect(locator).toHaveText()` have a separate timeout of 5 seconds by default. This is the maximum time the `expect()` should wait for the condition to be met. Learn more about [test and expect timeouts](./test-timeouts.mdx) and how to set them for a single test. |
 | [expect(page).toHaveScreenshot()](/api/class-pageassertions.mdx#page-assertions-to-have-screenshot-1) | Configuration for the `expect(locator).toHaveScreeshot()` method. |
-| [expect(snapshot).toMatchSnapshot()](/api/class-snapshotassertions.mdx#snapshot-assertions-to-match-snapshot-1)| Configuration for the `expect(locator).toMatchSnapshot()` method.|
+| [expect(value).toMatchSnapshot()](/api/class-snapshotassertions.mdx#snapshot-assertions-to-match-snapshot-1)| Configuration for the `expect(locator).toMatchSnapshot()` method.|
 
 ### Add custom matchers using expect.extend
 

python/docs/api/class-apiresponseassertions.mdx

@@ -52,12 +52,12 @@ async def test_navigates_to_login_page(page: Page) -> None:
 
 <font size="2" style={{position: "relative", top: "-20px"}}>Added in: v1.19</font><x-search>apiResponseAssertions.not_to_be_ok</x-search>
 
-The opposite of [expect(api_response).to_be_ok()](/api/class-apiresponseassertions.mdx#api-response-assertions-to-be-ok).
+The opposite of [expect(response).to_be_ok()](/api/class-apiresponseassertions.mdx#api-response-assertions-to-be-ok).
 
 **Usage**
 
 ```python
-expect(api_response).not_to_be_ok()
+expect(response).not_to_be_ok()
 ```
 
 ---

python/docs/test-assertions.mdx

@@ -30,7 +30,7 @@ import HTMLCard from '@site/src/components/HTMLCard';
 | [expect(locator).to_have_values()](/api/class-locatorassertions.mdx#locator-assertions-to-have-values) | Select has options selected |
 | [expect(page).to_have_title()](/api/class-pageassertions.mdx#page-assertions-to-have-title) | Page has a title |
 | [expect(page).to_have_url()](/api/class-pageassertions.mdx#page-assertions-to-have-url) | Page has a URL |
-| [expect(api_response).to_be_ok()](/api/class-apiresponseassertions.mdx#api-response-assertions-to-be-ok) | Response has an OK status |
+| [expect(response).to_be_ok()](/api/class-apiresponseassertions.mdx#api-response-assertions-to-be-ok) | Response has an OK status |
 
 ## Custom Expect Message
 

src/format_csharp.js

@@ -17,7 +17,7 @@
 //@ts-check
 
 const Documentation = require('./documentation');
-const { toTitleCase } = require('./generator');
+const { toTitleCase, assertionArgument } = require('./generator');
 /** @typedef {import('./generator').GeneratorFormatter} GeneratorFormatter */
 
 /**
@@ -29,7 +29,7 @@ class CSharpFormatter {
   }
 
   /**
-   * @param {Documentation.Member} member 
+   * @param {Documentation.Member} member
    */
   formatMember(member) {
     let args = [];
@@ -38,9 +38,7 @@ class CSharpFormatter {
     if (member.clazz.varName === 'playwrightAssertions') {
       prefix = '';
     } else if (member.clazz.varName.includes('Assertions')) {
-      const varName = member.clazz.varName.substring(0, member.clazz.varName.length -'Assertions'.length);
-      // Generate `expect(locator).` instead of `locatorAssertions.`
-      prefix = `Expect(${toTitleCase(varName)}).`;
+      prefix = `Expect(${toTitleCase(assertionArgument(member.clazz))}).`;
     }
 
     let name = toTitleCase(member.alias);
@@ -109,7 +107,7 @@ class CSharpFormatter {
   }
 
   /**
-   * @param {Documentation.Type} type 
+   * @param {Documentation.Type} type
    * @param {string} direction
    * @param {Documentation.Member} member
    */
@@ -181,7 +179,7 @@ class CSharpFormatter {
   }
 
   /**
-   * @param {import('./markdown').MarkdownNode} spec 
+   * @param {import('./markdown').MarkdownNode} spec
    * @returns boolean
    */
    filterComment(spec) {

src/format_java.js

@@ -17,7 +17,7 @@
 //@ts-check
 
 const Documentation = require('./documentation');
-const { toTitleCase, renderJSSignatures } = require('./generator');
+const { toTitleCase, renderJSSignatures, assertionArgument } = require('./generator');
 /** @typedef {import('./generator').GeneratorFormatter} GeneratorFormatter */
 /** @typedef {import('./generator').FormatMode} FormatMode */
 
@@ -30,7 +30,7 @@ class JavaFormatter {
   }
 
   /**
-   * @param {Documentation.Member} member 
+   * @param {Documentation.Member} member
    */
   formatMember(member) {
     let args = [];
@@ -39,10 +39,8 @@ class JavaFormatter {
     if (member.clazz.varName === 'playwrightAssertions') {
       prefix = '';
     } else if (member.clazz.varName.includes('Assertions')) {
-      const varName = member.clazz.varName.substring(0, member.clazz.varName.length -'Assertions'.length);
-      // Generate `expect(locator).` instead of `locatorAssertions.`
-      prefix = `assertThat(${varName}).`;
-    }  
+      prefix = `assertThat(${assertionArgument(member.clazz)}).`;
+    }
 
     let name = member.alias;
     if (member.kind === 'property')
@@ -52,7 +50,7 @@ class JavaFormatter {
 
     let usages = [`${prefix}${name}`];
     let link = `${prefix}${name}`;
-  
+
     let signatures;
     if (member.kind === 'method') {
       args = member.argsArray;
@@ -109,7 +107,7 @@ class JavaFormatter {
   }
 
   /**
-   * @param {Documentation.Type} type 
+   * @param {Documentation.Type} type
    * @param {string} direction
    * @param {Documentation.Member} member
    */
@@ -176,7 +174,7 @@ class JavaFormatter {
   }
 
   /**
-   * @param {import('./markdown').MarkdownNode} spec 
+   * @param {import('./markdown').MarkdownNode} spec
    * @returns boolean
    */
    filterComment(spec) {

src/format_js.js

@@ -17,7 +17,7 @@
 //@ts-check
 
 const Documentation = require('./documentation');
-const { renderJSSignatures } = require('./generator');
+const { renderJSSignatures, assertionArgument } = require('./generator');
 /** @typedef {import('./generator').GeneratorFormatter} GeneratorFormatter */
 /** @typedef {import('./markdown').MarkdownNode} MarkdownNode */
 /** @typedef {import('./documentation').Member} Member */
@@ -31,7 +31,7 @@ class JavaScriptFormatter {
   }
 
   /**
-   * @param {Documentation.Member} member 
+   * @param {Documentation.Member} member
    */
   formatMember(member) {
     let args = [];
@@ -41,10 +41,8 @@ class JavaScriptFormatter {
     if (member.clazz.varName === 'playwrightAssertions') {
       prefix = '';
     } else if (member.clazz.varName.includes('Assertions')) {
-      const varName = member.clazz.varName.substring(0, member.clazz.varName.length -'Assertions'.length);
-      // Generate `expect(locator).` instead of `locatorAssertions.`
-      prefix = `expect(${varName}).`;
-    }  
+      prefix = `expect(${assertionArgument(member.clazz)}).`;
+    }
 
     let name = member.alias;
     let usages = [`${prefix}${name}`];
@@ -106,7 +104,7 @@ class JavaScriptFormatter {
   }
 
   /**
-   * @param {MarkdownNode} spec 
+   * @param {MarkdownNode} spec
    * @returns boolean
    */
   filterComment(spec) {