From a059b3e3205f5f3455bdcb34d7a0d8903e985544 Mon Sep 17 00:00:00 2001
From: Ms2ger <Ms2ger@gmail.com>
Date: Mon, 7 Nov 2016 16:06:59 +0100
Subject: [PATCH] Fix some misused promise_tests.

---
 .../canonicalizeFilter/no-arguments.html             |  9 ++-------
 .../canonicalizeFilter/no-filters-member.html        | 12 +++++-------
 .../service-workers/service-worker-registration.html |  2 +-
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/no-arguments.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/no-arguments.html
index 3e59141ad09..1cdb44b8075 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/no-arguments.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/no-arguments.html
@@ -4,13 +4,8 @@
 <script src="/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
-promise_test(() => {
+promise_test(t => {
     window.testRunner.setBluetoothMockDataSet(adapter_type.empty);
-    try {
-        window.navigator.bluetooth.requestDevice()
-        .then(() => assert_unreached('requestDevice() should have thrown an error'));
-    } catch(error) {
-        assert_equals('TypeError', error.name);
-    }
+    return promise_rejects(t, new TypeError(), window.navigator.bluetooth.requestDevice());
 }, 'requestDevice() requires an argument.');
 </script>
diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/no-filters-member.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/no-filters-member.html
index 0763557d308..8a971e577cc 100644
--- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/no-filters-member.html
+++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/no-filters-member.html
@@ -4,13 +4,11 @@
 <script src="/bluetooth/bluetooth-helpers.js"></script>
 <script>
 'use strict';
-promise_test(() => {
+promise_test(t => {
     window.testRunner.setBluetoothMockDataSet(adapter_type.empty);
-    try {
-        window.navigator.bluetooth.requestDevice([{}, {optionalServices: ['wrong_service']}])
-        .then(() => assert_unreached('requestDevice() should have thrown an error'));
-    } catch(error) {
-        assert_equals('TypeError', error.name);
-    }
+    return promise_rejects(
+        t,
+        new TypeError(),
+        window.navigator.bluetooth.requestDevice([{}, {optionalServices: ['wrong_service']}]));
 }, 'RequestDeviceOptions requires a |filters| member.');
 </script>
diff --git a/tests/wpt/mozilla/tests/mozilla/service-workers/service-worker-registration.html b/tests/wpt/mozilla/tests/mozilla/service-workers/service-worker-registration.html
index 291256c38b1..416c61806e1 100644
--- a/tests/wpt/mozilla/tests/mozilla/service-workers/service-worker-registration.html
+++ b/tests/wpt/mozilla/tests/mozilla/service-workers/service-worker-registration.html
@@ -36,7 +36,7 @@ promise_test(function() {
 }, "Test: Service Worker Registration property scope when provided a scope");
 
 promise_test(function (p) {
-  promise_rejects(p, new TypeError(), register_sw('./in%5Csome%5fdir/sw.js'));
+  return promise_rejects(p, new TypeError(), register_sw('./in%5Csome%5fdir/sw.js'));
 }, "Test: Throws Error when Invalid Url Path");
 
 promise_test(function (p) {