fix: emit Page on load/DOMContentLoaded

Fixes microsoft#1399. Ports in microsoft#1374 of microsoft/playwright@cdb8627 was incorrect.
rwoll · Jul 3, 2022 · 185ba86 · 185ba86
1 parent 0f0c735
commit 185ba86
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/playwright/_impl/_frame.py b/playwright/_impl/_frame.py
@@ -100,14 +100,14 @@ def _on_load_state(
             and hasattr(self, "_page")
             and self._page
         ):
-            self._page.emit("load", self)
+            self._page.emit("load", self._page)
         if (
             not self._parent_frame
             and add == "domcontentloaded"
             and hasattr(self, "_page")
             and self._page
         ):
-            self._page.emit("domcontentloaded", self)
+            self._page.emit("domcontentloaded", self._page)
 
     def _on_frame_navigated(self, event: FrameNavigatedEvent) -> None:
         self._url = event["url"]

diff --git a/tests/sync/test_page.py b/tests/sync/test_page.py
@@ -76,3 +76,11 @@ def test_sync_stacks_should_work(page: Page, server: Server) -> None:
         page.goto(server.EMPTY_PAGE)
     assert exc_info.value.stack
     assert __file__ in exc_info.value.stack
+
+
+def test_emitted_for_domcontentloaded_and_load(page: Page, server: Server) -> None:
+    with page.expect_event("domcontentloaded") as dom_info:
+        with page.expect_event("load") as load_info:
+            page.goto(server.EMPTY_PAGE)
+    assert isinstance(dom_info.value, Page)
+    assert isinstance(load_info.value, Page)