third_party/WebKit/LayoutTests/bluetooth/requestDevice-canonicalize-filter.html - Issue 1926813004: Replace assert_promise_rejects with upstream promise_rejects.

Unified Diff: third_party/WebKit/LayoutTests/bluetooth/requestDevice-canonicalize-filter.html

Issue 1926813004: Replace assert_promise_rejects with upstream promise_rejects. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: remove all testharness-helpers.js references Created 4 years, 7 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

Download patch

« no previous file with comments | « third_party/WebKit/LayoutTests/bluetooth/requestDevice-blacklist.html ('k') | third_party/WebKit/LayoutTests/bluetooth/requestDevice-matches-a-filter.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/LayoutTests/bluetooth/requestDevice-canonicalize-filter.html

diff --git a/third_party/WebKit/LayoutTests/bluetooth/requestDevice-canonicalize-filter.html b/third_party/WebKit/LayoutTests/bluetooth/requestDevice-canonicalize-filter.html

index c98265a0453700fad16e6deb39595047933a6ea7..5a785ab13564df00396e5c98f7c330782a713f08 100644

--- a/third_party/WebKit/LayoutTests/bluetooth/requestDevice-canonicalize-filter.html

+++ b/third_party/WebKit/LayoutTests/bluetooth/requestDevice-canonicalize-filter.html

@@ -1,6 +1,5 @@

<!DOCTYPE html>

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

@@ -9,19 +8,19 @@

test(t => { assert_true(window.testRunner instanceof Object); t.done(); },

'window.testRunner is required for the following tests.');

-promise_test(() => {

+promise_test(t => {

return setBluetoothFakeAdapter('EmptyAdapter')

- .then(() => assert_promise_rejects(requestDeviceWithKeyDown(),

- new TypeError()));

+ .then(() => promise_rejects(t, new TypeError(),

+ requestDeviceWithKeyDown()));

}, 'Requires an argument.');

[{}, {

optionalServices: ['wrong_service']

}].forEach(args => {

- promise_test(() => {

+ promise_test(t => {

return setBluetoothFakeAdapter('EmptyAdapter')

- .then(() => assert_promise_rejects(requestDeviceWithKeyDown(args),

- new TypeError()));

+ .then(() => promise_rejects(t, new TypeError(),

+ requestDeviceWithKeyDown(args)));

}, 'RequestDeviceOptions requires a |filters| member.');

});

@@ -33,12 +32,12 @@ promise_test(() => {

'\'filters\' member must be non-empty to find any devices.')));

}, 'An empty |filters| member should result in a TypeError');

-promise_test(() => {

+promise_test(t => {

return setBluetoothFakeAdapter('EmptyAdapter')

- .then(() => assert_promise_rejects(

+ .then(() => promise_rejects(t, new TypeError(),

requestDeviceWithKeyDown({

filters: [{}]

- }), new TypeError()));

+ })));

}, 'A filter must restrict the devices in some way.');

promise_test(() => {

@@ -156,20 +155,20 @@ function generateRequestDeviceArgsWithServices(services) {

}

generateRequestDeviceArgsWithServices([]).forEach(args => {

- promise_test(() => {

+ promise_test(t => {

return setBluetoothFakeAdapter('EmptyAdapter')

- .then(() => assert_promise_rejects(

- requestDeviceWithKeyDown(args),

- new TypeError()));

+ .then(() => promise_rejects(t,

+ new TypeError(),

+ requestDeviceWithKeyDown(args)));

}, 'Services member must contain at least one service.');

});

generateRequestDeviceArgsWithServices(['wrong_service']).forEach(args => {

- promise_test(() => {

+ promise_test(t => {

return setBluetoothFakeAdapter('EmptyAdapter')

- .then(() => assert_promise_rejects(

- requestDeviceWithKeyDown(args),

- new SyntaxError()));

+ .then(() => promise_rejects(t,

+ new SyntaxError(),

+ requestDeviceWithKeyDown(args)));

}, 'Invalid service must reject the promise.');

});

@@ -194,11 +193,11 @@ generateRequestDeviceArgsWithServices(['wrong_service']).forEach(args => {

filters: [{ namePrefix: '', name: 'Name', services: ['heart_rate']}],

optionalServices: ['heart_rate']

}].forEach(args => {

- promise_test(() => {

+ promise_test(t => {

return setBluetoothFakeAdapter('EmptyAdapter')

- .then(() => assert_promise_rejects(

- requestDeviceWithKeyDown(args),

- new TypeError()));

+ .then(() => promise_rejects(t,

+ new TypeError(),

+ requestDeviceWithKeyDown(args)));

}, 'A filter must restrict the devices in some way.');

});

@@ -224,11 +223,11 @@ generateRequestDeviceArgsWithServices(['wrong_service']).forEach(args => {

optionalServices: ['wrong_service'],

filters: [{ namePrefix: 'Pre'}]

}].forEach(args => {

- promise_test(() => {

+ promise_test(t => {

return setBluetoothFakeAdapter('EmptyAdapter')

- .then(() => assert_promise_rejects(

- requestDeviceWithKeyDown(args),

- new SyntaxError()));

+ .then(() => promise_rejects(t,

+ new SyntaxError(),

+ requestDeviceWithKeyDown(args)));

}, 'Invalid optional service must reject the promise.');

});

</script>