From 02181c6dd9bd1c899ba238e91012249a4c29466f Mon Sep 17 00:00:00 2001 From: Luke Bjerring Date: Mon, 30 Jul 2018 14:12:57 +0000 Subject: [PATCH] Bug 1478107 [wpt PR 12164] - Don't wait for Picture-in-Picture when expecting reject on second request, a=testonly Automatic update from web-platform-testsDon't wait for Picture-in-Picture when expecting reject on second request (#12164) -- wpt-commits: 2a8d821bd0a29656ff27eac35d9dd071d27be779 wpt-pr: 12164 --- testing/web-platform/meta/MANIFEST.json | 6 +++--- .../picture-in-picture/disable-picture-in-picture.html | 2 +- .../request-picture-in-picture-twice.html | 4 ++-- .../resources/picture-in-picture-helpers.js | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/testing/web-platform/meta/MANIFEST.json b/testing/web-platform/meta/MANIFEST.json index 7ad2d8455596..691b8e8ff1f2 100644 --- a/testing/web-platform/meta/MANIFEST.json +++ b/testing/web-platform/meta/MANIFEST.json @@ -603737,7 +603737,7 @@ "support" ], "picture-in-picture/disable-picture-in-picture.html": [ - "f80cdccd1c6edcf6a859a1ae2315a9f65188d812", + "3da36cdc69fef19a84da9d27b688b12d43179688", "testharness" ], "picture-in-picture/enter-picture-in-picture.html": [ @@ -603765,7 +603765,7 @@ "testharness" ], "picture-in-picture/request-picture-in-picture-twice.html": [ - "c45cc223ec4336916d46c3d4db8bc4decbbd3332", + "b678b793cd36252dd3b76709e9ff4ab0535e8931", "testharness" ], "picture-in-picture/request-picture-in-picture.html": [ @@ -603773,7 +603773,7 @@ "testharness" ], "picture-in-picture/resources/picture-in-picture-helpers.js": [ - "b41a3c97a777a69ab28eea3b33f464379303da3d", + "ccc8105dfe2ace32ed87e05b69c2a09bbc839724", "support" ], "picture-in-picture/shadow-dom.html": [ diff --git a/testing/web-platform/tests/picture-in-picture/disable-picture-in-picture.html b/testing/web-platform/tests/picture-in-picture/disable-picture-in-picture.html index fdd8e9798e07..efde31bc3a30 100644 --- a/testing/web-platform/tests/picture-in-picture/disable-picture-in-picture.html +++ b/testing/web-platform/tests/picture-in-picture/disable-picture-in-picture.html @@ -33,7 +33,7 @@ promise_test(async t => { promise_test(async t => { const video = await loadVideo(); - return test_driver.bless('request picture in picture', async () => { + return test_driver.bless('request Picture-in-Picture', async () => { const promise = video.requestPictureInPicture(); video.disablePictureInPicture = true; await promise_rejects(t, 'InvalidStateError', promise); diff --git a/testing/web-platform/tests/picture-in-picture/request-picture-in-picture-twice.html b/testing/web-platform/tests/picture-in-picture/request-picture-in-picture-twice.html index 556cf83b83eb..0924ad21a4f5 100644 --- a/testing/web-platform/tests/picture-in-picture/request-picture-in-picture-twice.html +++ b/testing/web-platform/tests/picture-in-picture/request-picture-in-picture-twice.html @@ -11,9 +11,9 @@ promise_test(async t => { const video1 = await loadVideo(); const video2 = await loadVideo(); return test_driver.bless( - 'request picture in picture', + 'request Picture-in-Picture', async () => { - await video1.requestPictureInPicture(); + video1.requestPictureInPicture(); promise_rejects(t, 'NotAllowedError', video2.requestPictureInPicture()); } ); diff --git a/testing/web-platform/tests/picture-in-picture/resources/picture-in-picture-helpers.js b/testing/web-platform/tests/picture-in-picture/resources/picture-in-picture-helpers.js index 86b9f29ebd7c..55eed5393d62 100644 --- a/testing/web-platform/tests/picture-in-picture/resources/picture-in-picture-helpers.js +++ b/testing/web-platform/tests/picture-in-picture/resources/picture-in-picture-helpers.js @@ -17,6 +17,6 @@ function loadVideo(activeDocument, sourceUrl) { // Calls requestPictureInPicture() in a context that's 'allowed to request PiP'. function requestPictureInPictureWithTrustedClick(videoElement) { return test_driver.bless( - 'request picture in picture', + 'request Picture-in-Picture', () => videoElement.requestPictureInPicture()); }