- Bad details - causes `detailsPromise` to reject.
-
-
- Click on each button in sequence from top to bottom without refreshing the page.
- No payment sheet should be shown, as all provided values cause an error.
-
-
-
- If you see a payment sheet, it means the test has failed.
-
-
-
-
-
+ const rejectedPromise = Promise.reject(new SyntaxError("test"));
+ testBadUpdate(
+ "Rejection of detailsPromise must abort the update with an 'AbortError' DOMException.",
+ rejectedPromise,
+ "AbortError"
+ );
-
+ testBadUpdate(
+ "Total in the update is a string, so converting to IDL must abort the update with a TypeError.",
+ { total: `this will cause a TypeError!` },
+ TypeError
+ );
-
+ testBadUpdate(
+ "Total is recursive, so converting to IDL must abort the update with a TypeError.",
+ { total: recursiveData },
+ TypeError
+ );
-
+ testBadUpdate(
+ "Updating with a negative total results in a TypeError.",
+ invalidDetailsNegativeTotal,
+ TypeError
+ );
-
-
+ testBadUpdate(
+ "Updating with a displayItem with an invalid currency results in RangeError.",
+ { ...validDetails, displayItems: invalidPaymentItems },
+ RangeError
+ );
-
+ testBadUpdate(
+ "Updating with duplicate shippingOptions (same IDs) results in a TypeError.",
+ {
+ ...validDetails,
+ shippingOptions: [validShippingOption, validShippingOption],
+ },
+ TypeError
+ );
-
-
-
-
-
-
-
-
- If you find a buggy test, please file a bug
- and tag one of the suggested reviewers.
-
+ },
+ RangeError
+ );
+ testBadUpdate(
+ "Must throw as Modifier has a recursive dictionary.",
+ { ...validDetails, modifiers: [modifierWithRecursiveData, validModifier] },
+ TypeError
+ );
+
diff --git a/tests/wpt/web-platform-tests/resources/chromium/mock-sms-receiver.js b/tests/wpt/web-platform-tests/resources/chromium/mock-sms-receiver.js
deleted file mode 100644
index 903456d6830..00000000000
--- a/tests/wpt/web-platform-tests/resources/chromium/mock-sms-receiver.js
+++ /dev/null
@@ -1,51 +0,0 @@
-'use strict';
-
-const SmsProvider = (() => {
-
- class MockWebOTPService {
-
- constructor() {
- this.mojoReceiver_ = new blink.mojom.WebOTPServiceReceiver(this);
-
- this.interceptor_ =
- new MojoInterfaceInterceptor(blink.mojom.WebOTPService.$interfaceName);
-
- this.interceptor_.oninterfacerequest = (e) => {
- this.mojoReceiver_.$.bindHandle(e.handle);
- }
- this.interceptor_.start();
-
- this.returnValues_ = {};
- }
-
- async receive() {
- let call = this.returnValues_.receive ?
- this.returnValues_.receive.shift() : null;
- if (!call)
- return;
- return call();
- }
-
- async abort() {};
-
- pushReturnValuesForTesting(callName, value) {
- this.returnValues_[callName] = this.returnValues_[callName] || [];
- this.returnValues_[callName].push(value);
- return this;
- }
- }
-
- const mockWebOTPService = new MockWebOTPService();
-
- class SmsProviderChromium {
- constructor() {
- Object.freeze(this); // Make it immutable.
- }
-
- pushReturnValuesForTesting(callName, callback) {
- mockWebOTPService.pushReturnValuesForTesting(callName, callback);
- }
- }
-
- return SmsProviderChromium;
-})();
diff --git a/tests/wpt/web-platform-tests/resources/test-only-api.m.js b/tests/wpt/web-platform-tests/resources/test-only-api.m.js
new file mode 100644
index 00000000000..984f635abac
--- /dev/null
+++ b/tests/wpt/web-platform-tests/resources/test-only-api.m.js
@@ -0,0 +1,5 @@
+/* Whether the browser is Chromium-based with MojoJS enabled */
+export const isChromiumBased = 'MojoInterfaceInterceptor' in self;
+
+/* Whether the browser is WebKit-based with internal test-only API enabled */
+export const isWebKitBased = !isChromiumBased && 'internals' in self;
diff --git a/tests/wpt/web-platform-tests/resources/test-only-api.m.js.headers b/tests/wpt/web-platform-tests/resources/test-only-api.m.js.headers
new file mode 100644
index 00000000000..5e8f640c665
--- /dev/null
+++ b/tests/wpt/web-platform-tests/resources/test-only-api.m.js.headers
@@ -0,0 +1,2 @@
+Content-Type: text/javascript; charset=utf-8
+Cache-Control: max-age=3600
diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/no-title.html b/tests/wpt/web-platform-tests/resources/test/tests/functional/no-title.html
index 3458af44596..ae1333a0f7f 100644
--- a/tests/wpt/web-platform-tests/resources/test/tests/functional/no-title.html
+++ b/tests/wpt/web-platform-tests/resources/test/tests/functional/no-title.html
@@ -15,6 +15,7 @@
test(function(){assert_true(true, '1')});
test(()=>assert_true(true, '2'));
test(() => assert_true(true, '3'));
+ test(() => assert_true(true, '3')); // test duplicate behaviour
test(() => {
assert_true(true, '4');
});
@@ -55,6 +56,12 @@
"properties": {},
"message": null
},
+ {
+ "status_string": "PASS",
+ "name": "assert_true(true, '3') 1",
+ "properties": {},
+ "message": null
+ },
{
"status_string": "PASS",
"name": "Tests with no title 1",
diff --git a/tests/wpt/web-platform-tests/resources/test/tox.ini b/tests/wpt/web-platform-tests/resources/test/tox.ini
index a7a02e4b93b..c38b9f2749c 100644
--- a/tests/wpt/web-platform-tests/resources/test/tox.ini
+++ b/tests/wpt/web-platform-tests/resources/test/tox.ini
@@ -8,7 +8,7 @@ passenv=DISPLAY # Necessary for the spawned GeckoDriver process to connect to
# the appropriate display.
deps =
html5lib
- pytest>=2.9
+ pytest>=2.9,<6 # pinned to <6 due to https://github.com/web-platform-tests/wpt/issues/26132
pyvirtualdisplay
six
requests
diff --git a/tests/wpt/web-platform-tests/resources/testharness.js b/tests/wpt/web-platform-tests/resources/testharness.js
index 85ffcf726af..4fb8cea0bcc 100644
--- a/tests/wpt/web-platform-tests/resources/testharness.js
+++ b/tests/wpt/web-platform-tests/resources/testharness.js
@@ -520,6 +520,8 @@ policies and contribution forms [3].
Object.prototype.toString.call(worker) == '[object ServiceWorker]';
}
+ var seen_func_name = Object.create(null);
+
function get_test_name(func, name)
{
if (name) {
@@ -537,8 +539,17 @@ policies and contribution forms [3].
var trimmed = (arrow[1] !== undefined ? arrow[1] : arrow[2]).trim();
// drop trailing ; if there's no earlier ones
trimmed = trimmed.replace(/^([^;]*)(;\s*)+$/, "$1");
- // ignore this if it's then empty
- if (trimmed) return trimmed;
+
+ if (trimmed) {
+ // add a suffix if we already have this string
+ if (seen_func_name[trimmed]) {
+ trimmed = trimmed + " " + seen_func_name[trimmed];
+ seen_func_name[trimmed]++;
+ } else {
+ seen_func_name[trimmed] = 1;
+ }
+ return trimmed;
+ }
}
}
diff --git a/tests/wpt/web-platform-tests/scroll-animations/element-based-offset-clamp.html b/tests/wpt/web-platform-tests/scroll-animations/element-based-offset-clamp.html
index b1405074938..6467af199f1 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/element-based-offset-clamp.html
+++ b/tests/wpt/web-platform-tests/scroll-animations/element-based-offset-clamp.html
@@ -7,25 +7,19 @@