Fix assertion messages

Author: agg23

playwright/_impl/_api_structures.py

@@ -218,6 +218,7 @@ class FrameExpectResult(TypedDict):
     matches: bool
     received: Any
     log: List[str]
+    errorMessage: Optional[str]
 
 
 AriaRole = Literal[

playwright/_impl/_assertions.py

@@ -80,8 +80,10 @@ async def _expect_impl(
                 out_message = (
                     f"{message} '{expected}'" if expected is not None else f"{message}"
                 )
+            error_message = result.get("errorMessage")
+            error_message = f"\n{error_message}" if error_message else ""
             raise AssertionError(
-                f"{out_message}\nActual value: {actual} {format_call_log(result.get('log'))}"
+                f"{out_message}\nActual value: {actual}{error_message} {format_call_log(result.get('log'))}"
             )
 
 

tests/async/test_assertions.py

@@ -516,7 +516,7 @@ async def test_to_have_values_fails_when_multiple_not_specified(
     )
     locator = page.locator("select")
     await locator.select_option(["B"])
-    with pytest.raises(Error) as excinfo:
+    with pytest.raises(AssertionError) as excinfo:
         await expect(locator).to_have_values(["R", "G"], timeout=500)
     assert "Error: Not a select element with a multiple attribute" in str(excinfo.value)
 
@@ -530,7 +530,7 @@ async def test_to_have_values_fails_when_not_a_select_element(
     """
     )
     locator = page.locator("input")
-    with pytest.raises(Error) as excinfo:
+    with pytest.raises(AssertionError) as excinfo:
         await expect(locator).to_have_values(["R", "G"], timeout=500)
     assert "Error: Not a select element with a multiple attribute" in str(excinfo.value)
 
@@ -564,7 +564,7 @@ async def test_assertions_boolean_checked_with_intermediate_true_and_checked(
     await page.set_content("<input type=checkbox></input>")
     await page.locator("input").evaluate("e => e.indeterminate = true")
     with pytest.raises(
-        Error, match="Can't assert indeterminate and checked at the same time"
+        AssertionError, match="Can't assert indeterminate and checked at the same time"
     ):
         await expect(page.locator("input")).to_be_checked(
             checked=False, indeterminate=True
@@ -658,7 +658,7 @@ async def test_assertions_locator_to_be_editable_throws(
     await page.goto(server.EMPTY_PAGE)
     await page.set_content("<button disabled>Text</button>")
     with pytest.raises(
-        Error,
+        AssertionError,
         match=r"Element is not an <input>, <textarea>, <select> or \[contenteditable\] and does not have a role allowing \[aria-readonly\]",
     ):
         await expect(page.locator("button")).not_to_be_editable()

tests/sync/test_assertions.py

@@ -492,7 +492,7 @@ def test_to_have_values_fails_when_multiple_not_specified(
     )
     locator = page.locator("select")
     locator.select_option(["B"])
-    with pytest.raises(Error) as excinfo:
+    with pytest.raises(AssertionError) as excinfo:
         expect(locator).to_have_values(["R", "G"], timeout=500)
     assert "Error: Not a select element with a multiple attribute" in str(excinfo.value)
 
@@ -506,7 +506,7 @@ def test_to_have_values_fails_when_not_a_select_element(
     """
     )
     locator = page.locator("input")
-    with pytest.raises(Error) as excinfo:
+    with pytest.raises(AssertionError) as excinfo:
         expect(locator).to_have_values(["R", "G"], timeout=500)
     assert "Error: Not a select element with a multiple attribute" in str(excinfo.value)
 
@@ -540,7 +540,7 @@ def test_assertions_boolean_checked_with_intermediate_true_and_checked(
     page.set_content("<input type=checkbox></input>")
     page.locator("input").evaluate("e => e.indeterminate = true")
     with pytest.raises(
-        Error, match="Can't assert indeterminate and checked at the same time"
+        AssertionError, match="Can't assert indeterminate and checked at the same time"
     ):
         expect(page.locator("input")).to_be_checked(checked=False, indeterminate=True)
 
@@ -626,7 +626,7 @@ def test_assertions_locator_to_be_editable_throws(page: Page, server: Server) ->
     page.goto(server.EMPTY_PAGE)
     page.set_content("<button disabled>Text</button>")
     with pytest.raises(
-        Error,
+        AssertionError,
         match=r"Element is not an <input>, <textarea>, <select> or \[contenteditable\] and does not have a role allowing \[aria-readonly\]",
     ):
         expect(page.locator("button")).not_to_be_editable()