diff --git a/testing/web-platform/tests/soft-navigation-heuristics/image-lcp-followed-by-two-image-softnavs-lcp.tentative.html b/testing/web-platform/tests/soft-navigation-heuristics/image-lcp-followed-by-two-image-softnavs-lcp.tentative.html index 2bdc2e8c5ea6..143d5006bde7 100644 --- a/testing/web-platform/tests/soft-navigation-heuristics/image-lcp-followed-by-two-image-softnavs-lcp.tentative.html +++ b/testing/web-platform/tests/soft-navigation-heuristics/image-lcp-followed-by-two-image-softnavs-lcp.tentative.html @@ -296,7 +296,7 @@ ( ) ; -interact +click ( link ) @@ -439,7 +439,7 @@ ( ) ; -interact +click ( link ) diff --git a/testing/web-platform/tests/soft-navigation-heuristics/keydown.tentative.html b/testing/web-platform/tests/soft-navigation-heuristics/keydown.tentative.html deleted file mode 100644 index a5fa8763ffbd..000000000000 --- a/testing/web-platform/tests/soft-navigation-heuristics/keydown.tentative.html +++ /dev/null @@ -1,220 +0,0 @@ -< -! -DOCTYPE -HTML -> -< -html -> -< -head -> -< -meta -charset -= -" -utf -- -8 -" -> -< -title -> -Detect -hashchange -event -. -< -/ -title -> -< -script -src -= -" -/ -resources -/ -testharness -. -js -" -> -< -/ -script -> -< -script -src -= -" -/ -resources -/ -testharnessreport -. -js -" -> -< -/ -script -> -< -script -src -= -" -/ -resources -/ -testdriver -. -js -" -> -< -/ -script -> -< -script -src -= -" -/ -resources -/ -testdriver -- -vendor -. -js -" -> -< -/ -script -> -< -script -src -= -" -resources -/ -soft -- -navigation -- -helper -. -js -" -> -< -/ -script -> -< -/ -head -> -< -! -- -- -Not -including -a -body -element -to -ensure -the -keydown -heuristic -works -on -malformed -HTML -- -- -> -< -main -id -= -main -> -< -div -> -First -LCP -! -< -/ -div -> -< -/ -main -> -< -script -> -testSoftNavigation -( -{ -addContent -: -( -) -= -> -{ -addTextToDivOnMain -( -) -; -} -link -: -document -. -body -interactionType -: -" -keydown -" -eventType -: -" -keydown -" -test -: -" -Keydown -on -body -triggers -SoftNavigationHeuristics -" -} -) -; -< -/ -script -> -< -/ -html -> diff --git a/testing/web-platform/tests/soft-navigation-heuristics/navigate-child.html b/testing/web-platform/tests/soft-navigation-heuristics/navigate-child.html index a629b296de07..b1731077b91d 100644 --- a/testing/web-platform/tests/soft-navigation-heuristics/navigate-child.html +++ b/testing/web-platform/tests/soft-navigation-heuristics/navigate-child.html @@ -234,7 +234,7 @@ " ) ; -interact +click ( link ) diff --git a/testing/web-platform/tests/soft-navigation-heuristics/resources/soft-navigation-helper.js b/testing/web-platform/tests/soft-navigation-heuristics/resources/soft-navigation-helper.js index 442f21840d73..8128ccca0020 100644 --- a/testing/web-platform/tests/soft-navigation-heuristics/resources/soft-navigation-helper.js +++ b/testing/web-platform/tests/soft-navigation-heuristics/resources/soft-navigation-helper.js @@ -4,7 +4,7 @@ counter 0 ; var -interacted +clicked ; var timestamps @@ -168,19 +168,6 @@ click ) ; const -interactionType -= -readValue -( -options -. -interactionType -' -click -' -) -; -const expectLCP = options @@ -262,14 +249,13 @@ expectLCP firstClick ) ; -interacted +clicked = false ; -interact +click ( link -interactionType ) ; await @@ -458,7 +444,7 @@ waitOnPaintEntriesPromise ( ) ; -interact +click ( link ) @@ -585,7 +571,7 @@ options eventHandler ) ; -interact +click ( options . @@ -913,16 +899,9 @@ element } ; const -interact +click = -( link -interactionType -= -' -click -' -) = > { @@ -931,16 +910,6 @@ if test_driver ) { -if -( -interactionType -= -= -' -click -' -) -{ test_driver . click @@ -948,20 +917,6 @@ click link ) ; -} -else -{ -test_driver -. -send_keys -( -link -' -j -' -) -; -} timestamps [ counter @@ -969,7 +924,7 @@ counter = { " -syncPostInteraction +syncPostClick " : performance @@ -1002,17 +957,9 @@ eventObject eventType = = -' +" click -' -| -| -eventType -= -= -' -keydown -' +" ) ? button @@ -1154,7 +1101,7 @@ url + counter ; -interacted +clicked = true ; @@ -1329,7 +1276,7 @@ i ] [ " -syncPostInteraction +syncPostClick " ] entryTimestamp