Testing new implementations

Author: agg23

playwright/_impl/_assertions.py

@@ -309,9 +309,15 @@ async def to_contain_class(
         timeout: float = None,
     ) -> None:
         __tracebackhide__ = True
+        if isinstance(expected, collections.abc.Sequence) and not isinstance(
+            expected, str
+        ):
+            expected_text = to_expected_text_values(expected)
+        else:
+            expected_text = to_expected_text_values([expected])
         await self._expect_impl(
             "to.contain.class",
-            FrameExpectOptions(expectedValue=expected, timeout=timeout),
+            FrameExpectOptions(expectedText=expected_text, timeout=timeout),
             expected,
             "Locator expected to contain class",
         )

tests/async/test_assertions.py

@@ -145,6 +145,18 @@ async def test_assertions_locator_to_have_class(page: Page, server: Server) -> N
         await expect(page.locator("div.foobar")).to_have_class("oh-no", timeout=100)
 
 
+async def test_assertions_locator_to_contain_class(page: Page, server: Server) -> None:
+    await page.goto(server.EMPTY_PAGE)
+    await page.set_content("<div class='foo bar another foobar'>kek</div>")
+    await expect(page.locator("div.foobar")).to_contain_class("foobar")
+    await expect(page.locator("div.foobar")).to_contain_class(["another foobar"])
+    await expect(page.locator("div.foobar")).not_to_contain_class(
+        "kekstar", timeout=100
+    )
+    with pytest.raises(AssertionError):
+        await expect(page.locator("div.foobar")).to_contain_class("oh-no", timeout=100)
+
+
 async def test_assertions_locator_to_have_count(page: Page, server: Server) -> None:
     await page.goto(server.EMPTY_PAGE)
     await page.set_content("<div class=foobar>kek</div><div class=foobar>kek</div>")

tests/async/test_fetch_global.py

@@ -524,3 +524,23 @@ async def test_should_not_throw_when_fail_on_status_code_is_false(
     response = await request.fetch(server.EMPTY_PAGE)
     assert response.status == 404
     await request.dispose()
+
+
+async def test_should_follow_max_redirects(
+    playwright: Playwright, server: Server
+) -> None:
+    redirect_count = 0
+
+    def _handle_request(req: TestServerRequest) -> None:
+        nonlocal redirect_count
+        redirect_count += 1
+        req.setResponseCode(301),
+        req.setHeader("Location", server.EMPTY_PAGE),
+        req.finish(),
+
+    server.set_route("/empty.html", _handle_request)
+    request = await playwright.request.new_context(max_redirects=1)
+    with pytest.raises(Error, match="Max redirect count exceeded"):
+        await request.fetch(server.EMPTY_PAGE)
+    assert redirect_count == 2
+    await request.dispose()

tests/async/test_page_aria_snapshot.py

@@ -88,7 +88,8 @@ async def test_should_snapshot_complex(page: Page) -> None:
         """
       - list:
         - listitem:
-          - link "link"
+          - link "link":
+            - /url: about:blank
     """,
     )
 

tests/sync/test_assertions.py

@@ -124,6 +124,16 @@ def test_assertions_locator_to_have_class(page: Page, server: Server) -> None:
         expect(page.locator("div.foobar")).to_have_class("oh-no", timeout=100)
 
 
+def test_assertions_locator_to_contain_class(page: Page, server: Server) -> None:
+    page.goto(server.EMPTY_PAGE)
+    page.set_content("<div class='foo bar another foobar'>kek</div>")
+    expect(page.locator("div.foobar")).to_contain_class("foobar")
+    expect(page.locator("div.foobar")).to_contain_class(["another foobar"])
+    expect(page.locator("div.foobar")).not_to_contain_class("kekstar", timeout=100)
+    with pytest.raises(AssertionError):
+        expect(page.locator("div.foobar")).to_contain_class("oh-no", timeout=100)
+
+
 def test_assertions_locator_to_have_count(page: Page, server: Server) -> None:
     page.goto(server.EMPTY_PAGE)
     page.set_content("<div class=foobar>kek</div><div class=foobar>kek</div>")

tests/sync/test_fetch_global.py

@@ -19,7 +19,7 @@
 import pytest
 
 from playwright.sync_api import APIResponse, Error, Playwright, StorageState
-from tests.server import Server
+from tests.server import Server, TestServerRequest
 
 
 @pytest.mark.parametrize(
@@ -361,3 +361,21 @@ def test_should_not_throw_when_fail_on_status_code_is_false(
     response = request.fetch(server.EMPTY_PAGE)
     assert response.status == 404
     request.dispose()
+
+
+def test_should_follow_max_redirects(playwright: Playwright, server: Server) -> None:
+    redirect_count = 0
+
+    def _handle_request(req: TestServerRequest) -> None:
+        nonlocal redirect_count
+        redirect_count += 1
+        req.setResponseCode(301),
+        req.setHeader("Location", server.EMPTY_PAGE),
+        req.finish(),
+
+    server.set_route("/empty.html", _handle_request)
+    request = playwright.request.new_context(max_redirects=1)
+    with pytest.raises(Error, match="Max redirect count exceeded"):
+        request.fetch(server.EMPTY_PAGE)
+    assert redirect_count == 2
+    request.dispose()

tests/sync/test_page_aria_snapshot.py

@@ -88,6 +88,18 @@ def test_should_snapshot_complex(page: Page) -> None:
         """
       - list:
         - listitem:
-          - link "link"
+          - link "link":
+            - /url: about:blank
     """,
     )
+
+
+def test_should_snapshot_with_ref(page: Page) -> None:
+    page.set_content('<ul><li><a href="about:blank">link</a></li></ul>')
+    expected = """
+      - list [ref=s1e3]:
+        - listitem [ref=s1e4]:
+          - link "link" [ref=s1e5]:
+            - /url: about:blank
+    """
+    assert page.locator("body").aria_snapshot(ref=True) == _unshift(expected)