fonts;
};
interface Baseline {
diff --git a/tests/wpt/web-platform-tests/interfaces/html.idl b/tests/wpt/web-platform-tests/interfaces/html.idl
index 0d6445e7f01..f530f3559b6 100644
--- a/tests/wpt/web-platform-tests/interfaces/html.idl
+++ b/tests/wpt/web-platform-tests/interfaces/html.idl
@@ -725,6 +725,8 @@ interface HTMLFormElement : HTMLElement {
[CEReactions] attribute DOMString name;
[CEReactions] attribute boolean noValidate;
[CEReactions] attribute DOMString target;
+ [CEReactions] attribute DOMString rel;
+ [SameObject, PutForwards=value] readonly attribute DOMTokenList relList;
[SameObject] readonly attribute HTMLFormControlsCollection elements;
readonly attribute unsigned long length;
diff --git a/tests/wpt/web-platform-tests/interfaces/storage.idl b/tests/wpt/web-platform-tests/interfaces/storage.idl
index 29603241222..437bc6dd43c 100644
--- a/tests/wpt/web-platform-tests/interfaces/storage.idl
+++ b/tests/wpt/web-platform-tests/interfaces/storage.idl
@@ -5,7 +5,7 @@
[SecureContext]
interface mixin NavigatorStorage {
- readonly attribute StorageManager storage;
+ [SameObject] readonly attribute StorageManager storage;
};
Navigator includes NavigatorStorage;
WorkerNavigator includes NavigatorStorage;
diff --git a/tests/wpt/web-platform-tests/interfaces/web-nfc.idl b/tests/wpt/web-platform-tests/interfaces/web-nfc.idl
index 5a6d6f8a06b..913d1fe808a 100644
--- a/tests/wpt/web-platform-tests/interfaces/web-nfc.idl
+++ b/tests/wpt/web-platform-tests/interfaces/web-nfc.idl
@@ -75,10 +75,4 @@ dictionary NFCReaderOptions {
USVString url = "";
NFCRecordType recordType;
USVString mediaType = "";
- NFCAccept accept = "web-nfc-only";
-};
-
-enum NFCAccept {
- "web-nfc-only",
- "any"
};
diff --git a/tests/wpt/web-platform-tests/kv-storage/backingstore.https.html b/tests/wpt/web-platform-tests/kv-storage/backingstore.https.html
new file mode 100644
index 00000000000..44e634d85bb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/kv-storage/backingstore.https.html
@@ -0,0 +1,33 @@
+
+
+KV Storage: backingStore getter
+
+
+
+
+
+
diff --git a/tests/wpt/web-platform-tests/kv-storage/cause-errors-via-idb.https.html b/tests/wpt/web-platform-tests/kv-storage/cause-errors-via-idb.https.html
index 21fe36b36cb..d77e56621e0 100644
--- a/tests/wpt/web-platform-tests/kv-storage/cause-errors-via-idb.https.html
+++ b/tests/wpt/web-platform-tests/kv-storage/cause-errors-via-idb.https.html
@@ -7,7 +7,7 @@
diff --git a/tests/wpt/web-platform-tests/kv-storage/helpers/kvs-tests.js b/tests/wpt/web-platform-tests/kv-storage/helpers/kvs-tests.js
index a6c4d58dfa5..0cf4c2fd3d5 100644
--- a/tests/wpt/web-platform-tests/kv-storage/helpers/kvs-tests.js
+++ b/tests/wpt/web-platform-tests/kv-storage/helpers/kvs-tests.js
@@ -1,6 +1,17 @@
import { StorageArea, storage as defaultArea } from "std:kv-storage";
import { assertAsyncIteratorEquals, assertAsyncIteratorCustomEquals } from "./equality-asserters.js";
+// Used when we're manually creating the database, and so the IDB helpers also want to clean it up.
+// If we used testWithArea, then the IDB helpers would time out in their cleanup steps when they
+// fail to delete the already-deleted database.
+export function testWithAreaNoCleanup(testFn, description) {
+ promise_test(t => {
+ const area = new StorageArea(description);
+
+ return testFn(area, t);
+ }, description);
+}
+
export function testWithArea(testFn, description) {
promise_test(t => {
const area = new StorageArea(description);
diff --git a/tests/wpt/web-platform-tests/kv-storage/storage-smoke-test.https.html b/tests/wpt/web-platform-tests/kv-storage/storage-smoke-test.https.html
index df6fd8c8181..da48dc7cf13 100644
--- a/tests/wpt/web-platform-tests/kv-storage/storage-smoke-test.https.html
+++ b/tests/wpt/web-platform-tests/kv-storage/storage-smoke-test.https.html
@@ -9,19 +9,6 @@
import { testVariousMethodsWithDefaultArea } from "./helpers/kvs-tests.js";
import { storage } from "std:kv-storage";
-test(() => {
- const { backingStore } = storage;
- assert_array_equals(Object.keys(backingStore), ["database", "store", "version"]);
- assert_own_property(backingStore, "database");
- assert_own_property(backingStore, "store");
- assert_own_property(backingStore, "version");
- assert_equals(Object.getPrototypeOf(backingStore), Object.prototype);
-
- assert_equals(backingStore.database, "kv-storage:default");
- assert_equals(backingStore.store, "store");
- assert_equals(backingStore.version, 1);
-}, "backingStore returns the correct object");
-
testVariousMethodsWithDefaultArea(
"Storage methods smoke test with string key and value", "key", "value", assert_equals
);
diff --git a/tests/wpt/web-platform-tests/payment-request/payment-request-multiple-show-manual.https.html b/tests/wpt/web-platform-tests/payment-request/payment-request-multiple-show-manual.https.html
deleted file mode 100644
index cc412171a6d..00000000000
--- a/tests/wpt/web-platform-tests/payment-request/payment-request-multiple-show-manual.https.html
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-Manual test for multiple PaymentRequest.show()
-
-
-
-
-Manual test for multiple PaymentRequest.show()
-
- Click on the button to bring up the Payment Request UI window and then will
- close it automatically. (If a payment sheet stays open, the test has failed.)
-
-
- -
-
-
-
-
- If you find a buggy test, please file a bug
- and tag one of the suggested reviewers.
-
diff --git a/tests/wpt/web-platform-tests/payment-request/payment-request-show-method-manual.https.html b/tests/wpt/web-platform-tests/payment-request/payment-request-show-method-manual.https.html
deleted file mode 100644
index 6ef98e85a60..00000000000
--- a/tests/wpt/web-platform-tests/payment-request/payment-request-show-method-manual.https.html
+++ /dev/null
@@ -1,97 +0,0 @@
-
-
-Manual tests for PaymentRequest.show() method
-
-
-
-
-Manual tests for PaymentRequest.show() method
-
- Click on each button in sequence from top to bottom without refreshing the
- page. Each button will bring up the Payment Request UI window and then will
- close it automatically. (If a payment sheet stays open, the test has failed.)
-
-
- -
-
-
- -
-
-
- -
-
-
-
-
-
- If you find a buggy test, please file a bug
- and tag one of the suggested reviewers.
-
diff --git a/tests/wpt/web-platform-tests/payment-request/payment-request-show-method.https.html b/tests/wpt/web-platform-tests/payment-request/payment-request-show-method.https.html
index dd04987092b..cc8c881d114 100644
--- a/tests/wpt/web-platform-tests/payment-request/payment-request-show-method.https.html
+++ b/tests/wpt/web-platform-tests/payment-request/payment-request-show-method.https.html
@@ -4,6 +4,8 @@
+
+
If you find a buggy test, please file a bug
diff --git a/tests/wpt/web-platform-tests/resources/testdriver.js b/tests/wpt/web-platform-tests/resources/testdriver.js
index ea380dbd3c3..e328302e4f3 100644
--- a/tests/wpt/web-platform-tests/resources/testdriver.js
+++ b/tests/wpt/web-platform-tests/resources/testdriver.js
@@ -199,25 +199,68 @@
window.test_driver_internal = {
/**
- * Triggers a user-initiated click
+ * This flag should be set to `true` by any code which implements the
+ * internal methods defined below for automation purposes. Doing so
+ * allows the library to signal failure immediately when an automated
+ * implementation of one of the methods is not available.
+ */
+ in_automation: false,
+
+ /**
+ * Waits for a user-initiated click
*
* @param {Element} element - element to be clicked
* @param {{x: number, y: number} coords - viewport coordinates to click at
- * @returns {Promise} fulfilled after click occurs or rejected if click fails
+ * @returns {Promise} fulfilled after click occurs
*/
click: function(element, coords) {
- return Promise.reject(new Error("unimplemented"));
+ if (this.in_automation) {
+ return Promise.reject(new Error('Not implemented'));
+ }
+
+ return new Promise(function(resolve, reject) {
+ element.addEventListener("click", resolve);
+ });
},
/**
- * Triggers a user-initiated click
+ * Waits for an element to receive a series of key presses
*
- * @param {Element} element - element to be clicked
- * @param {String} keys - keys to send to the element
- * @returns {Promise} fulfilled after keys are sent or rejected if click fails
+ * @param {Element} element - element which should receve key presses
+ * @param {String} keys - keys to expect
+ * @returns {Promise} fulfilled after keys are received or rejected if
+ * an incorrect key sequence is received
*/
send_keys: function(element, keys) {
- return Promise.reject(new Error("unimplemented"));
+ if (this.in_automation) {
+ return Promise.reject(new Error('Not implemented'));
+ }
+
+ return new Promise(function(resolve, reject) {
+ var seen = "";
+
+ function remove() {
+ element.removeEventListener("keydown", onKeyDown);
+ }
+
+ function onKeyDown(event) {
+ if (event.key.length > 1) {
+ return;
+ }
+
+ seen += event.key;
+
+ if (keys.indexOf(seen) !== 0) {
+ reject(new Error("Unexpected key sequence: " + seen));
+ remove();
+ } else if (seen === keys) {
+ resolve();
+ remove();
+ }
+ }
+
+ element.addEventListener("keydown", onKeyDown);
+ });
},
/**
diff --git a/tests/wpt/web-platform-tests/screen-capture/feature-policy.https.html b/tests/wpt/web-platform-tests/screen-capture/feature-policy.https.html
new file mode 100644
index 00000000000..56c9e80a130
--- /dev/null
+++ b/tests/wpt/web-platform-tests/screen-capture/feature-policy.https.html
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
diff --git a/tests/wpt/web-platform-tests/tools/ci/taskcluster-run.py b/tests/wpt/web-platform-tests/tools/ci/taskcluster-run.py
index 2b3270c17aa..78c50a6285e 100755
--- a/tests/wpt/web-platform-tests/tools/ci/taskcluster-run.py
+++ b/tests/wpt/web-platform-tests/tools/ci/taskcluster-run.py
@@ -6,6 +6,7 @@ import logging
import os
import shutil
import subprocess
+import sys
browser_specific_args = {
"firefox": ["--install-browser"]
@@ -38,8 +39,7 @@ def main(product, commit_range, wpt_args):
)
logger.addHandler(handler)
- child = subprocess.Popen(['python', './wpt', 'manifest-download'])
- child.wait()
+ subprocess.call(['python', './wpt', 'manifest-download'])
if commit_range:
logger.info(
@@ -65,7 +65,9 @@ def main(product, commit_range, wpt_args):
logger.info("Executing command: %s" % " ".join(command))
- subprocess.check_call(command)
+ retcode = subprocess.call(command)
+ if retcode != 0:
+ sys.exit(retcode)
wptreport = find_wptreport(wpt_args)
if wptreport:
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testdriver-extra.js b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testdriver-extra.js
index ca61caf51e8..6336d227db8 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testdriver-extra.js
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testdriver-extra.js
@@ -51,6 +51,8 @@
return selector;
};
+ window.test_driver_internal.in_automation = true;
+
window.test_driver_internal.click = function(element) {
const selector = get_selector(element);
const pending_promise = new Promise(function(resolve, reject) {
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/execute_async_script/promise.py b/tests/wpt/web-platform-tests/webdriver/tests/execute_async_script/promise.py
new file mode 100644
index 00000000000..8b6d7d9157b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/execute_async_script/promise.py
@@ -0,0 +1,127 @@
+from tests.support.asserts import assert_error, assert_success
+
+
+def execute_async_script(session, script, args=None):
+ if args is None:
+ args = []
+ body = {"script": script, "args": args}
+
+ return session.transport.send(
+ "POST", "/session/{session_id}/execute/async".format(**vars(session)),
+ body)
+
+
+def test_promise_resolve(session):
+ response = execute_async_script(session, """
+ let resolve = arguments[0];
+ resolve(Promise.resolve('foobar'));
+ """)
+ assert_success(response, "foobar")
+
+
+def test_promise_resolve_delayed(session):
+ response = execute_async_script(session, """
+ let resolve = arguments[0];
+ let promise = new Promise(
+ (resolve) => setTimeout(
+ () => resolve('foobar'),
+ 50
+ )
+ );
+ resolve(promise);
+ """)
+ assert_success(response, "foobar")
+
+
+def test_promise_all_resolve(session):
+ response = execute_async_script(session, """
+ let resolve = arguments[0];
+ let promise = Promise.all([
+ Promise.resolve(1),
+ Promise.resolve(2)
+ ]);
+ resolve(promise);
+ """)
+ assert_success(response, [1, 2])
+
+
+def test_await_promise_resolve(session):
+ response = execute_async_script(session, """
+ let resolve = arguments[0];
+ let res = await Promise.resolve('foobar');
+ resolve(res);
+ """)
+ assert_success(response, "foobar")
+
+
+def test_promise_resolve_timeout(session):
+ session.timeouts.script = .1
+ response = execute_async_script(session, """
+ let resolve = arguments[0];
+ let promise = new Promise(
+ (resolve) => setTimeout(
+ () => resolve(),
+ 1000
+ )
+ );
+ resolve(promise);
+ """)
+ assert_error(response, "script timeout")
+
+
+def test_promise_reject(session):
+ response = execute_async_script(session, """
+ let resolve = arguments[0];
+ resolve(Promise.reject(new Error('my error')));
+ """)
+ assert_error(response, "javascript error")
+
+
+def test_promise_reject_delayed(session):
+ response = execute_async_script(session, """
+ let resolve = arguments[0];
+ let promise = new Promise(
+ (resolve, reject) => setTimeout(
+ () => reject(new Error('my error')),
+ 50
+ )
+ );
+ resolve(promise);
+ """)
+ assert_error(response, "javascript error")
+
+
+def test_promise_all_reject(session):
+ response = execute_async_script(session, """
+ let resolve = arguments[0];
+ let promise = Promise.all([
+ Promise.resolve(1),
+ Promise.reject(new Error('error'))
+ ]);
+ resolve(promise);
+ """)
+ assert_error(response, "javascript error")
+
+
+def test_await_promise_reject(session):
+ response = execute_async_script(session, """
+ let resolve = arguments[0];
+ await Promise.reject(new Error('my error'));
+ resolve('foo');
+ """)
+ assert_error(response, "javascript error")
+
+
+def test_promise_reject_timeout(session):
+ session.timeouts.script = .1
+ response = execute_async_script(session, """
+ let resolve = arguments[0];
+ let promise = new Promise(
+ (resolve, reject) => setTimeout(
+ () => reject(new Error('my error')),
+ 1000
+ )
+ );
+ resolve(promise);
+ """)
+ assert_error(response, "script timeout")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/execute_script/promise.py b/tests/wpt/web-platform-tests/webdriver/tests/execute_script/promise.py
index 1eab7822c5c..8bb637853cc 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/execute_script/promise.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/execute_script/promise.py
@@ -1,6 +1,4 @@
-import pytest
-
-from tests.support.asserts import assert_dialog_handled, assert_error, assert_success
+from tests.support.asserts import assert_error, assert_success
def execute_script(session, script, args=None):
@@ -45,12 +43,25 @@ def test_promise_all_resolve(session):
def test_await_promise_resolve(session):
response = execute_script(session, """
- const res = await Promise.resolve('foobar');
+ let res = await Promise.resolve('foobar');
return res;
""")
assert_success(response, "foobar")
+def test_promise_resolve_timeout(session):
+ session.timeouts.script = .1
+ response = execute_script(session, """
+ return new Promise(
+ (resolve) => setTimeout(
+ () => resolve(),
+ 1000
+ )
+ );
+ """)
+ assert_error(response, "script timeout")
+
+
def test_promise_reject(session):
response = execute_script(session, """
return Promise.reject(new Error('my error'));
@@ -88,19 +99,6 @@ def test_await_promise_reject(session):
assert_error(response, "javascript error")
-def test_promise_resolve_timeout(session):
- session.timeouts.script = .1
- response = execute_script(session, """
- return new Promise(
- (resolve) => setTimeout(
- () => resolve(),
- 1000
- )
- );
- """)
- assert_error(response, "timeout error")
-
-
def test_promise_reject_timeout(session):
session.timeouts.script = .1
response = execute_script(session, """
@@ -111,4 +109,4 @@ def test_promise_reject_timeout(session):
)
);
""")
- assert_error(response, "timeout error")
\ No newline at end of file
+ assert_error(response, "script timeout")
diff --git a/tests/wpt/web-platform-tests/webgl/webgl1-idlharness.any.js b/tests/wpt/web-platform-tests/webgl/webgl1-idlharness.any.js
index 884def896cb..2cf80395230 100644
--- a/tests/wpt/web-platform-tests/webgl/webgl1-idlharness.any.js
+++ b/tests/wpt/web-platform-tests/webgl/webgl1-idlharness.any.js
@@ -1,5 +1,6 @@
// META: script=/resources/WebIDLParser.js
// META: script=/resources/idlharness.js
+// META: timeout=long
// https://www.khronos.org/registry/webgl/specs/latest/1.0/
diff --git a/tests/wpt/web-platform-tests/webgl/webgl2-idlharness.any.js b/tests/wpt/web-platform-tests/webgl/webgl2-idlharness.any.js
index 97edfa18285..c8efcd031fe 100644
--- a/tests/wpt/web-platform-tests/webgl/webgl2-idlharness.any.js
+++ b/tests/wpt/web-platform-tests/webgl/webgl2-idlharness.any.js
@@ -1,5 +1,6 @@
// META: script=/resources/WebIDLParser.js
// META: script=/resources/idlharness.js
+// META: timeout=long
// https://www.khronos.org/registry/webgl/specs/latest/1.0/