third_party/WebKit/LayoutTests/external/wpt/webusb/usb-manual.https.html - Issue 2789723003: Migrate WebUSB LayoutTests into external/wpt

Unified Diff: third_party/WebKit/LayoutTests/external/wpt/webusb/usb-manual.https.html

Issue 2789723003: Migrate WebUSB LayoutTests into external/wpt (Closed)

Patch Set: Add README.md and more comments explaining the polyfill Created 3 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « third_party/WebKit/LayoutTests/external/wpt/webusb/resources/usb-helpers.js ('k') | third_party/WebKit/LayoutTests/external/wpt/webusb/usbConnectionEvent.https.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/LayoutTests/external/wpt/webusb/usb-manual.https.html

diff --git a/third_party/WebKit/LayoutTests/usb/usb.html b/third_party/WebKit/LayoutTests/external/wpt/webusb/usb-manual.https.html

similarity index 79%

rename from third_party/WebKit/LayoutTests/usb/usb.html

rename to third_party/WebKit/LayoutTests/external/wpt/webusb/usb-manual.https.html

index 16c659cf2688af7834e0447ef0189488824edac6..7a8c03ac99e47d84cc0b5bb27bf406c9fa16970f 100644

--- a/third_party/WebKit/LayoutTests/usb/usb.html

+++ b/third_party/WebKit/LayoutTests/external/wpt/webusb/usb-manual.https.html

@@ -1,9 +1,8 @@

<!DOCTYPE html>

-<script src="../resources/testharness.js"></script>

-<script src="../resources/testharnessreport.js"></script>

+<script src="/resources/testharness.js"></script>

+<script src="/resources/testharnessreport.js"></script>

-<script src="resources/webusb-test.js"></script>

'use strict';

@@ -39,7 +38,7 @@ usb_test(() => {

}, 'requestDevice rejects when called without a user gesture');

usb_test(() => {

- return callWithKeyDown(() => navigator.usb.requestDevice({ filters: [] })

+ return callWithTrustedClick(() => navigator.usb.requestDevice({ filters: [] })

.then(device => {

assert_unreachable('requestDevice should reject when no device selected');

})

@@ -52,7 +51,7 @@ usb_test(() => {

usb_test(() => {

return getFakeDevice().then(({ device, fakeDevice }) => {

navigator.usb.test.chosenDevice = fakeDevice;

- return callWithKeyDown(() => {

+ return callWithTrustedClick(() => {

return navigator.usb.requestDevice({ filters: [] }).then(chosenDevice => {

assert_equals(chosenDevice, device);

});

@@ -63,7 +62,7 @@ usb_test(() => {

usb_test(() => {

return getFakeDevice().then(({ device, fakeDevice }) => {

navigator.usb.test.chosenDevice = fakeDevice;

- return callWithKeyDown(() => {

+ return callWithTrustedClick(() => {

return navigator.usb.requestDevice({ filters: [] }).then(chosenDevice => {

assert_equals(chosenDevice, device);

return navigator.usb.getDevices().then(devices => {

@@ -81,18 +80,19 @@ usb_test(() => {

{ vendorId: 5678, productId: 0xF00F }

];

- return callWithKeyDown(() => navigator.usb.requestDevice({ filters: expectedFilters })

- .then(device => {

- assert_unreachable('requestDevice should reject because no device selected');

- })

- .catch(error => {

- assert_equals(error.code, DOMException.NOT_FOUND_ERR);

- let actualFilters = navigator.usb.test.lastFilters;

- assert_equals(actualFilters.length, expectedFilters.length);

- for (var i = 0; i < actualFilters.length; ++i)

- assert_object_equals(actualFilters[i], expectedFilters[i]);

- })

- );

+ return callWithTrustedClick(() => {

+ return navigator.usb.requestDevice({ filters: expectedFilters })

+ .then(device => {

+ assert_unreachable('requestDevice should reject because no device selected');

+ })

+ .catch(error => {

+ assert_equals(error.code, DOMException.NOT_FOUND_ERR);

+ let actualFilters = navigator.usb.test.lastFilters;

+ assert_equals(actualFilters.length, expectedFilters.length);

+ for (var i = 0; i < actualFilters.length; ++i)

+ assert_object_equals(actualFilters[i], expectedFilters[i]);

+ });

}, 'filters are sent correctly');

usb_test(() => {