Changeset 278678 in webkit

Timestamp:

Jun 9, 2021, 3:42:51 PM (5 years ago)

Author:

Devin Rousso

Message:

(r278618) media/modern-media-controls/overflow-support/chapters.html is timing out since introduction
​https://bugs.webkit.org/show_bug.cgi?id=226828
<rdar://problem/79084756>

Unreviewed text fix.

• media/modern-media-controls/overflow-support/chapters.html:
• media/modern-media-controls/overflow-support/chapters-expected.txt:

Wait for the <track kind="chapters"> to load before clicking on the overflow button as
otherwise there won't be any chapter cues to display in the contextmenu, meaning that the
contextmenu would be empty and therefore not be shown.

• http/tests/resources/js-test-pre.js:

(shouldBecomeEqual):
(shouldBecomeDifferent):

• resources/js-test-pre.js:

(shouldBecomeEqual):
(shouldBecomeDifferent):

• resources/js-test.js:

(shouldBecomeEqual):
(shouldBecomeDifferent):
Allow for completionHandler to not be provided, which will cause the function to return a Promise.

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• http/tests/resources/js-test-pre.js (modified) (2 diffs)
• media/modern-media-controls/overflow-support/chapters-expected.txt (modified) (1 diff)
• media/modern-media-controls/overflow-support/chapters.html (modified) (1 diff)
• resources/js-test-pre.js (modified) (2 diffs)
• resources/js-test.js (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-06-09  Devin Rousso  <drousso@apple.com>
+
+        (r278618) media/modern-media-controls/overflow-support/chapters.html is timing out since introduction
+        https://bugs.webkit.org/show_bug.cgi?id=226828
+        <rdar://problem/79084756>
+
+        Unreviewed text fix.
+
+        * media/modern-media-controls/overflow-support/chapters.html:
+        * media/modern-media-controls/overflow-support/chapters-expected.txt:
+        Wait for the `<track kind="chapters">` to load before clicking on the overflow button as
+        otherwise there won't be any chapter cues to display in the contextmenu, meaning that the
+        contextmenu would be empty and therefore not be shown.
+
+        * http/tests/resources/js-test-pre.js:
+        (shouldBecomeEqual):
+        (shouldBecomeDifferent):
+        * resources/js-test-pre.js:
+        (shouldBecomeEqual):
+        (shouldBecomeDifferent):
+        * resources/js-test.js:
+        (shouldBecomeEqual):
+        (shouldBecomeDifferent):
+        Allow for `completionHandler` to not be provided, which will cause the function to return a `Promise`.
+
 2021-06-09  Amir Mark Jr  <amir_mark@apple.com>
 

trunk/LayoutTests/http/tests/resources/js-test-pre.js

@@ -327 +327 @@
         return false;
     }
+
+    if (!completionHandler)
+        return new Promise(resolve => setTimeout(_waitForCondition, 0, condition, resolve));
+
     setTimeout(_waitForCondition, 0, condition, completionHandler);
 }
@@ -439 +443 @@
         return false;
     }
+
+    if (!completionHandler)
+        return new Promise(resolve => setTimeout(_waitForCondition, 0, condition, resolve));
+
     setTimeout(_waitForCondition, 0, condition, completionHandler);
 }

trunk/LayoutTests/media/modern-media-controls/overflow-support/chapters-expected.txt

@@ -6 +6 @@
 PASS shadowRoot.querySelector('button.overflow') became different from null
 PASS shadowRoot.querySelector('button.overflow').getBoundingClientRect().width became different from 0
+PASS media.textTracks[0].mode became different from 'disabled'
 Tapping overflow button...
 Selecting first chapter cue...

trunk/LayoutTests/media/modern-media-controls/overflow-support/chapters.html

@@ -21 +21 @@
 let contextmenu = null;
 
-media.addEventListener("play", function() {
+media.addEventListener("play", async function() {
     media.pause();
 
-    shouldBecomeDifferent("shadowRoot.querySelector('button.overflow')", "null", () => {
-        shouldBecomeDifferent("shadowRoot.querySelector('button.overflow').getBoundingClientRect().width", "0", async () => {
-            debug("Tapping overflow button...");
-            await pressOnElement(shadowRoot.querySelector("button.overflow"));
-            contextmenu = await getTracksContextMenu();
+    await shouldBecomeDifferent("shadowRoot.querySelector('button.overflow')", "null");
 
-            debug("Selecting first chapter cue...");
-            await UIHelper.chooseMenuAction("ipsum");
-            await UIHelper.waitForContextMenuToHide();
+    await shouldBecomeDifferent("shadowRoot.querySelector('button.overflow').getBoundingClientRect().width", "0");
 
-            shouldBeGreaterThanOrEqual("media.currentTime", "5");
+    await shouldBecomeDifferent("media.textTracks[0].mode", "'disabled'");
 
-            media.remove();
-            finishJSTest();
-        });
-    });
+    debug("Tapping overflow button...");
+    await pressOnElement(shadowRoot.querySelector("button.overflow"));
+    contextmenu = await getTracksContextMenu();
+
+    debug("Selecting first chapter cue...");
+    await UIHelper.chooseMenuAction("ipsum");
+    await UIHelper.waitForContextMenuToHide();
+
+    shouldBeGreaterThanOrEqual("media.currentTime", "5");
+
+    media.remove();
+    finishJSTest();
 });
 

trunk/LayoutTests/resources/js-test-pre.js

@@ -327 +327 @@
         return false;
     }
+
+    if (!completionHandler)
+        return new Promise(resolve => setTimeout(_waitForCondition, 0, condition, resolve));
+
     setTimeout(_waitForCondition, 0, condition, completionHandler);
 }
@@ -439 +443 @@
         return false;
     }
+
+    if (!completionHandler)
+        return new Promise(resolve => setTimeout(_waitForCondition, 0, condition, resolve));
+
     setTimeout(_waitForCondition, 0, condition, completionHandler);
 }

trunk/LayoutTests/resources/js-test.js

@@ -351 +351 @@
     return false;
   }
+
+  if (!completionHandler)
+    return new Promise(resolve => setTimeout(_waitForCondition, 0, condition, resolve));
+
   setTimeout(_waitForCondition, 0, condition, completionHandler);
 }
@@ -463 +467 @@
     return false;
   }
+
+  if (!completionHandler)
+    return new Promise(resolve => setTimeout(_waitForCondition, 0, condition, resolve));
+
   setTimeout(_waitForCondition, 0, condition, completionHandler);
 }