diff --git a/docs/src/api/class-locatorassertions.md b/docs/src/api/class-locatorassertions.md
new file mode 100644
index 0000000000..cec73cc9bb
--- /dev/null
+++ b/docs/src/api/class-locatorassertions.md
@@ -0,0 +1,272 @@
+# class: LocatorAssertions
+* langs: java
+
+The [LocatorAssertions] class provides assertion methods that can be used to make assertions about the [Locator] state in the tests. A new instance of [LocatorAssertions] is created by calling [`method: PlaywrightAssertions.assertThatLocator`].
+
+## method: LocatorAssertions.containsText
+
+Ensures the [Locator] points to an element that contains the given text. You can use regular expressions for the value as well.
+
+```java
+assertThat(page.locator(".title")).containsText("substring");
+```
+
+Note that if array is passed as an expected value, entire lists can be asserted:
+
+```java
+assertThat(page.locator("list > .list-item")).containsText(Arrays.asList("Text 1", "Text 4", "Text 5"));
+```
+
+### param: LocatorAssertions.containsText.expected
+- `expected` <[string]|[RegExp]|[Array]<[string]>|[Array]<[RegExp]>>
+
+Expected substring or RegExp or a list of those.
+
+### option: LocatorAssertions.containsText.useInnerText
+- `useInnerText` <[boolean]>
+
+Whether to use `element.innerText` instead of `element.textContent` when retrieving DOM node text.
+
+### option: LocatorAssertions.containsText.timeout = %%-assertions-timeout-%%
+
+## method: LocatorAssertions.hasAttribute
+
+Ensures the [Locator] points to an element with given attribute.
+
+```java
+assertThat(page.locator("input")).hasAttribute("type", "text");
+```
+
+### param: LocatorAssertions.hasAttribute.name
+- `name` <[string]>
+
+Attribute name.
+
+### param: LocatorAssertions.hasAttribute.value
+- `value` <[string]|[RegExp]>
+
+Expected attribute value.
+
+### option: LocatorAssertions.hasAttribute.timeout = %%-assertions-timeout-%%
+
+## method: LocatorAssertions.hasClass
+
+Ensures the [Locator] points to an element with given CSS class.
+
+```java
+assertThat(page.locator("#component")).hasClass(Pattern.compile("selected"));
+```
+
+Note that if array is passed as an expected value, entire lists can be asserted:
+
+```java
+assertThat(page.locator("list > .component")).hasClass(Arrays.asList("component", "component selected", "component"));
+```
+
+### param: LocatorAssertions.hasClass.expected
+- `expected` <[string]|[RegExp]|[Array]<[string]>|[Array]<[RegExp]>>
+
+Expected class or RegExp or a list of those.
+
+### option: LocatorAssertions.hasClass.timeout = %%-assertions-timeout-%%
+
+## method: LocatorAssertions.hasCount
+
+Ensures the [Locator] resolves to an exact number of DOM nodes.
+
+```java
+assertThat(page.locator("list > .component")).hasCount(3);
+```
+
+### param: LocatorAssertions.hasCount.count
+- `count` <[int]>
+
+Expected count.
+
+### option: LocatorAssertions.hasCount.timeout = %%-assertions-timeout-%%
+
+## method: LocatorAssertions.hasCSS
+
+Ensures the [Locator] resolves to an element with the given computed CSS style.
+
+```java
+assertThat(page.locator("button")).hasCSS("display", "flex");
+```
+
+### param: LocatorAssertions.hasCSS.name
+- `name` <[string]>
+
+CSS property name.
+
+### param: LocatorAssertions.hasCSS.value
+- `value` <[string]|[RegExp]>
+
+CSS property value.
+
+### option: LocatorAssertions.hasCSS.timeout = %%-assertions-timeout-%%
+
+## method: LocatorAssertions.hasId
+
+Ensures the [Locator] points to an element with the given DOM Node ID.
+
+```java
+assertThat(page.locator("input")).hasId("lastname");
+```
+
+### param: LocatorAssertions.hasId.id
+- `id` <[string]>
+
+Element id.
+
+### option: LocatorAssertions.hasId.timeout = %%-assertions-timeout-%%
+
+## method: LocatorAssertions.hasJSProperty
+
+Ensures the [Locator] points to an element with given JavaScript property. Note that this property can be of a primitive type as well as a plain serializable JavaScript object.
+
+```java
+assertThat(page.locator("input")).hasJSProperty("type", "text");
+```
+
+### param: LocatorAssertions.hasJSProperty.name
+- `name` <[string]>
+
+Property name.
+
+### param: LocatorAssertions.hasJSProperty.value
+- `value` <[Serializable]>
+
+Property value.
+
+### option: LocatorAssertions.hasJSProperty.timeout = %%-assertions-timeout-%%
+
+## method: LocatorAssertions.hasText
+
+Ensures the [Locator] points to an element with the given text. You can use regular expressions for the value as well.
+
+```java
+assertThat(page.locator(".title")).hasText(Pattern.compile("Welcome, Test User"));
+assertThat(page.locator(".title")).hasText(Pattern.compile("Welcome, .*"));
+```
+
+Note that if array is passed as an expected value, entire lists can be asserted:
+
+```java
+assertThat(page.locator("list > .component")).hasText(Arrays.asList("Text 1", "Text 2", "Text 3"));
+```
+
+### param: LocatorAssertions.hasText.expected
+- `expected` <[string]|[RegExp]|[Array]<[string]>|[Array]<[RegExp]>>
+
+Expected substring or RegExp or a list of those.
+
+### option: LocatorAssertions.hasText.useInnerText
+- `useInnerText` <[boolean]>
+
+Whether to use `element.innerText` instead of `element.textContent` when retrieving DOM node text.
+
+### option: LocatorAssertions.hasText.timeout = %%-assertions-timeout-%%
+
+## method: LocatorAssertions.hasValue
+
+Ensures the [Locator] points to an element with the given input value. You can use regular expressions for the value as well.
+
+```java
+assertThat(page.locator("input[type=number]")).hasValue(Pattern.compile("[0-9]"));
+```
+
+### param: LocatorAssertions.hasValue.value
+- `value` <[string]|[RegExp]>
+
+Expected value.
+
+### option: LocatorAssertions.hasValue.timeout = %%-assertions-timeout-%%
+
+## method: LocatorAssertions.isChecked
+
+Ensures the [Locator] points to a checked input.
+
+```java
+assertThat(page.locator(".subscribe")).isChecked();
+```
+
+### option: LocatorAssertions.isChecked.timeout = %%-assertions-timeout-%%
+
+## method: LocatorAssertions.isDisabled
+
+Ensures the [Locator] points to a disabled element.
+
+```java
+assertThat(page.locator("button.submit")).isDisabled();
+```
+
+### option: LocatorAssertions.isDisabled.timeout = %%-assertions-timeout-%%
+
+## method: LocatorAssertions.isEditable
+
+Ensures the [Locator] points to an editable element.
+
+```java
+assertThat(page.locator("input")).isEditable();
+```
+
+### option: LocatorAssertions.isEditable.timeout = %%-assertions-timeout-%%
+
+## method: LocatorAssertions.isEmpty
+
+Ensures the [Locator] points to an empty editable element or to a DOM node that has no text.
+
+```java
+assertThat(page.locator("div.warning")).isEmpty();
+```
+
+### option: LocatorAssertions.isEmpty.timeout = %%-assertions-timeout-%%
+
+## method: LocatorAssertions.isEnabled
+
+Ensures the [Locator] points to an enabled element.
+
+```java
+assertThat(page.locator("button.submit")).isEnabled();
+```
+
+### option: LocatorAssertions.isEnabled.timeout = %%-assertions-timeout-%%
+
+## method: LocatorAssertions.isFocused
+
+Ensures the [Locator] points to a focused DOM node.
+
+```java
+assertThat(page.locator("input")).isFocused();
+```
+
+### option: LocatorAssertions.isFocused.timeout = %%-assertions-timeout-%%
+
+## method: LocatorAssertions.isHidden
+
+Ensures the [Locator] points to a hidden DOM node, which is the opposite of [visible](./actionability.md#visible).
+
+```java
+assertThat(page.locator(".my-element")).isHidden();
+```
+
+### option: LocatorAssertions.isHidden.timeout = %%-assertions-timeout-%%
+
+## method: LocatorAssertions.isVisible
+
+Ensures the [Locator] points to a [visible](./actionability.md#visible) DOM node.
+
+```java
+assertThat(page.locator(".my-element")).isVisible();
+```
+
+### option: LocatorAssertions.isVisible.timeout = %%-assertions-timeout-%%
+
+## method: LocatorAssertions.not
+- returns: <[LocatorAssertions]>
+
+Makes the assertion check for the opposite condition. For example, this code tests that the Locator doesn't contain text `"error"`:
+
+```java
+assertThat(locator).not().containsText("error");
+```
diff --git a/docs/src/api/class-pageassertions.md b/docs/src/api/class-pageassertions.md
index 2fa418e366..2edef1818f 100644
--- a/docs/src/api/class-pageassertions.md
+++ b/docs/src/api/class-pageassertions.md
@@ -1,11 +1,11 @@
 # class: PageAssertions
 * langs: java
 
-The [PageAssertions] class provides assertion methods that can be used to make assertions about the [Page] state in the tests.
+The [PageAssertions] class provides assertion methods that can be used to make assertions about the [Page] state in the tests. A new instance of [LocatorAssertions] is created by calling [`method: PlaywrightAssertions.assertThatPage`].
 
 ## method: PageAssertions.hasTitle
 
-Ensures the page has a given title.
+Ensures the page has the given title.
 
 ```java
 assertThat(page).hasTitle("Playwright");
@@ -16,10 +16,7 @@ assertThat(page).hasTitle("Playwright");
 
 Expected title or RegExp.
 
-### option: PageAssertions.hasTitle.timeout
-- `timeout` <[float]>
-
-Time to retry assertion for.
+### option: PageAssertions.hasTitle.timeout = %%-assertions-timeout-%%
 
 ## method: PageAssertions.hasURL
 
@@ -34,10 +31,7 @@ assertThat(page).hasURL('.com');
 
 Expected substring or RegExp.
 
-### option: PageAssertions.hasURL.timeout
-- `timeout` <[float]>
-
-Time to retry the assertion for.
+### option: PageAssertions.hasURL.timeout = %%-assertions-timeout-%%
 
 ## method: PageAssertions.not
 - returns: <[PageAssertions]>
diff --git a/docs/src/api/class-playwrightassertions.md b/docs/src/api/class-playwrightassertions.md
index 2f6b3af540..cb33be943e 100644
--- a/docs/src/api/class-playwrightassertions.md
+++ b/docs/src/api/class-playwrightassertions.md
@@ -15,7 +15,22 @@ reached. You can pass this timeout as an option.
 
 By default, the timeout for assertions is set to 5 seconds.
 
-## method: PlaywrightAssertions.assertThat
+## method: PlaywrightAssertions.assertThatLocator
+* langs: java
+- returns: <[LocatorAssertions]>
+
+Creates a [LocatorAssertions] object for the given [Locator].
+
+```java
+PlaywrightAssertions.assertThat(locator).isVisible();
+```
+
+### param: PlaywrightAssertions.assertThatLocator.locator
+- `locator` <[Locator]>
+
+[Locator] object to use for assertions.
+
+## method: PlaywrightAssertions.assertThatPage
 * langs: java
 - returns: <[PageAssertions]>
 
@@ -25,8 +40,7 @@ Creates a [PageAssertions] object for the given [Page].
 PlaywrightAssertions.assertThat(page).hasTitle("News");
 ```
 
-### param: PlaywrightAssertions.assertThat.page
+### param: PlaywrightAssertions.assertThatPage.page
 - `page` <[Page]>
 
 [Page] object to use for assertions.
-
diff --git a/docs/src/api/params.md b/docs/src/api/params.md
index 07f1abcc02..101cf84975 100644
--- a/docs/src/api/params.md
+++ b/docs/src/api/params.md
@@ -688,6 +688,11 @@ The default value can be changed by using the [`method: BrowserContext.setDefaul
 Maximum time in milliseconds, defaults to 30 seconds, pass `0` to disable timeout. The default value can be changed by
 using the [`method: AndroidDevice.setDefaultTimeout`] method.
 
+## assertions-timeout
+- `timeout` <[float]>
+
+Time to retry the assertion for.
+
 ## shared-context-params-list
 - %%-context-option-acceptdownloads-%%
 - %%-context-option-ignorehttpserrors-%%