fix: navigation started

src/utils/EventEmitter.ts

@@ -43,8 +43,11 @@ export class EventEmitter<Events extends Record<EventType, unknown>> {
    * @param handler The handler function to run when the event occurs
    * @return `this` to enable chaining method calls.
    */
-  once(event: EventType, handler: Handler): this {
-    const onceHandler: Handler = (eventData) => {
+  once<Key extends keyof Events>(
+    event: Key,
+    handler: Handler<Events[Key]>
+  ): this {
+    const onceHandler = (eventData: Events[Key]) => {
       handler(eventData);
       this.off(event, onceHandler);
     };

tests/browsing_context/test_fragment_navigated.py

@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import pytest
+from anys import ANY_STR
 from test_helpers import (ANY_TIMESTAMP, goto_url, read_JSON_message,
                           send_JSON_command, subscribe)
 
@@ -43,7 +44,7 @@ async def test_browsingContext_fragmentNavigated_event(websocket, context_id):
         "method": "browsingContext.fragmentNavigated",
         "params": {
             "context": context_id,
-            "navigation": None,
+            "navigation": ANY_STR,
             "timestamp": ANY_TIMESTAMP,
             "url": url + "#test",
         }

tests/browsing_context/test_navigate.py

@@ -207,10 +207,10 @@ async def test_browsingContext_navigateSameDocumentNavigation_waitNone_navigated
     await goto_url(websocket, context_id, url, "complete")
 
     resp = await goto_url(websocket, context_id, url_with_hash_1, "none")
-    assert resp == {'navigation': None, 'url': url_with_hash_1}
+    assert resp == {'navigation': ANY_STR, 'url': url_with_hash_1}
 
     resp = await goto_url(websocket, context_id, url_with_hash_2, "none")
-    assert resp == {'navigation': None, 'url': url_with_hash_2}
+    assert resp == {'navigation': ANY_STR, 'url': url_with_hash_2}
 
 
 @pytest.mark.asyncio
@@ -225,7 +225,7 @@ async def test_browsingContext_navigateSameDocumentNavigation_waitInteractive_na
 
     resp = await goto_url(websocket, context_id, url_with_hash_1,
                           "interactive")
-    assert resp == {'navigation': None, 'url': url_with_hash_1}
+    assert resp == {'navigation': ANY_STR, 'url': url_with_hash_1}
 
     result = await get_tree(websocket, context_id)
 
@@ -241,7 +241,7 @@ async def test_browsingContext_navigateSameDocumentNavigation_waitInteractive_na
 
     resp = await goto_url(websocket, context_id, url_with_hash_2,
                           "interactive")
-    assert resp == {'navigation': None, 'url': url_with_hash_2}
+    assert resp == {'navigation': ANY_STR, 'url': url_with_hash_2}
 
     result = await get_tree(websocket, context_id)
 
@@ -267,7 +267,7 @@ async def test_browsingContext_navigateSameDocumentNavigation_waitComplete_navig
     await goto_url(websocket, context_id, url, "complete")
 
     resp = await goto_url(websocket, context_id, url_with_hash_1, "complete")
-    assert resp == {'navigation': None, 'url': url_with_hash_1}
+    assert resp == {'navigation': ANY_STR, 'url': url_with_hash_1}
 
     result = await get_tree(websocket, context_id)
 
@@ -282,7 +282,7 @@ async def test_browsingContext_navigateSameDocumentNavigation_waitComplete_navig
     } == result
 
     resp = await goto_url(websocket, context_id, url_with_hash_2, "complete")
-    assert resp == {'navigation': None, 'url': url_with_hash_2}
+    assert resp == {'navigation': ANY_STR, 'url': url_with_hash_2}
 
     result = await get_tree(websocket, context_id)
 
@@ -344,13 +344,15 @@ async def test_browsingContext_navigationStartedEvent_viaScript(
             }
         })
 
+    await read_JSON_message(websocket)
+
     response = await read_JSON_message(websocket)
     assert response == {
         'type': 'event',
         "method": "browsingContext.navigationStarted",
         "params": {
             "context": context_id,
-            "navigation": None,
+            "navigation": ANY_STR,
             "timestamp": ANY_TIMESTAMP,
             # TODO: Should report correct string
             "url": ANY_STR,
@@ -381,7 +383,7 @@ async def test_browsingContext_navigationStartedEvent_viaCommand(
         "method": "browsingContext.navigationStarted",
         "params": {
             "context": context_id,
-            "navigation": None,
+            "navigation": ANY_STR,
             "timestamp": ANY_TIMESTAMP,
             # TODO: Should report correct string
             "url": ANY_STR,

tests/browsing_context/test_nested_browsing_context.py

@@ -167,10 +167,10 @@ async def test_nestedBrowsingContext_navigateSameDocumentNavigation_waitNone_nav
     await goto_url(websocket, iframe_id, url, "complete")
 
     resp = await goto_url(websocket, iframe_id, url_with_hash_1, "none")
-    assert resp == {'navigation': None, 'url': url_with_hash_1}
+    assert resp == {'navigation': ANY_STR, 'url': url_with_hash_1}
 
     resp = await goto_url(websocket, iframe_id, url_with_hash_2, "none")
-    assert resp == {'navigation': None, 'url': url_with_hash_2}
+    assert resp == {'navigation': ANY_STR, 'url': url_with_hash_2}
 
 
 @pytest.mark.asyncio
@@ -184,7 +184,7 @@ async def test_nestedBrowsingContext_navigateSameDocumentNavigation_waitInteract
     await goto_url(websocket, iframe_id, url, "complete")
 
     resp = await goto_url(websocket, iframe_id, url_with_hash_1, "interactive")
-    assert resp == {'navigation': None, 'url': url_with_hash_1}
+    assert resp == {'navigation': ANY_STR, 'url': url_with_hash_1}
 
     result = await get_tree(websocket, iframe_id)
 
@@ -199,7 +199,7 @@ async def test_nestedBrowsingContext_navigateSameDocumentNavigation_waitInteract
     } == result
 
     resp = await goto_url(websocket, iframe_id, url_with_hash_2, "interactive")
-    assert resp == {'navigation': None, 'url': url_with_hash_2}
+    assert resp == {'navigation': ANY_STR, 'url': url_with_hash_2}
 
     result = await get_tree(websocket, iframe_id)
 
@@ -225,7 +225,7 @@ async def test_nestedBrowsingContext_navigateSameDocumentNavigation_waitComplete
     await goto_url(websocket, iframe_id, url, "complete")
 
     resp = await goto_url(websocket, iframe_id, url_with_hash_1, "complete")
-    assert resp == {'navigation': None, 'url': url_with_hash_1}
+    assert resp == {'navigation': ANY_STR, 'url': url_with_hash_1}
 
     result = await get_tree(websocket, iframe_id)
 
@@ -240,7 +240,7 @@ async def test_nestedBrowsingContext_navigateSameDocumentNavigation_waitComplete
     } == result
 
     resp = await goto_url(websocket, iframe_id, url_with_hash_2, "complete")
-    assert resp == {'navigation': None, 'url': url_with_hash_2}
+    assert resp == {'navigation': ANY_STR, 'url': url_with_hash_2}
 
     result = await get_tree(websocket, iframe_id)
 

wpt-metadata/chromedriver/headful/webdriver/tests/bidi/browsing_context/navigation_started/navigation_started.py.ini

@@ -2,9 +2,6 @@
   [test_subscribe]
     expected: FAIL
 
-  [test_timestamp]
-    expected: FAIL
-
   [test_iframe]
     expected: FAIL
 
@@ -34,6 +31,3 @@
 
   [test_redirect_navigation]
     expected: FAIL
-
-  [test_navigate_history_pushstate]
-    expected: FAIL

wpt-metadata/chromedriver/headless/webdriver/tests/bidi/browsing_context/navigation_started/navigation_started.py.ini

@@ -2,9 +2,6 @@
   [test_subscribe]
     expected: FAIL
 
-  [test_timestamp]
-    expected: FAIL
-
   [test_iframe]
     expected: FAIL
 
@@ -34,6 +31,3 @@
 
   [test_redirect_navigation]
     expected: FAIL
-
-  [test_navigate_history_pushstate]
-    expected: FAIL

wpt-metadata/mapper/headful/webdriver/tests/bidi/browsing_context/navigation_started/navigation_started.py.ini

@@ -2,9 +2,6 @@
   [test_subscribe]
     expected: FAIL
 
-  [test_timestamp]
-    expected: FAIL
-
   [test_iframe]
     expected: FAIL
 
@@ -34,6 +31,3 @@
 
   [test_redirect_navigation]
     expected: FAIL
-
-  [test_navigate_history_pushstate]
-    expected: FAIL

wpt-metadata/mapper/headless/webdriver/tests/bidi/browsing_context/navigation_started/navigation_started.py.ini

@@ -2,9 +2,6 @@
   [test_subscribe]
     expected: FAIL
 
-  [test_timestamp]
-    expected: FAIL
-
   [test_iframe]
     expected: FAIL
 
@@ -34,6 +31,3 @@
 
   [test_redirect_navigation]
     expected: FAIL
-
-  [test_navigate_history_pushstate]
-    expected: FAIL