From 11560387bb056098c55049db22c63550358c953a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= <biwanczuk@gmail.com>
Date: Mon, 13 Jul 2020 18:23:24 +0200
Subject: =?UTF-8?q?Revert=20"feat:=20move=20unstable=20Deno.permissions=20?=
 =?UTF-8?q?to=20navigator.permissions=E2=80=A6=20(#6729)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Revert "feat: move unstable Deno.permissions to navigator.permissions (#6244)"

This reverts commit 202e7fa6ad366ee56a6d070e94eaecb6dbc745bf.
---
 cli/tests/025_hrtime.ts             |  2 +-
 cli/tests/057_revoke_permissions.ts |  4 +--
 cli/tests/unit/permissions_test.ts  | 53 ++++++++++++++-----------------------
 cli/tests/unit/test_util.ts         |  2 +-
 cli/tests/unit/unit_test_runner.ts  |  2 +-
 5 files changed, 25 insertions(+), 38 deletions(-)

(limited to 'cli/tests')

diff --git a/cli/tests/025_hrtime.ts b/cli/tests/025_hrtime.ts
index fef39ffdb..9f60b7a77 100644
--- a/cli/tests/025_hrtime.ts
+++ b/cli/tests/025_hrtime.ts
@@ -1,5 +1,5 @@
 window.onload = async (): Promise<void> => {
   console.log(performance.now() % 2 !== 0);
-  await navigator.permissions.revoke({ name: "hrtime" });
+  await Deno.permissions.revoke({ name: "hrtime" });
   console.log(performance.now() % 2 === 0);
 };
diff --git a/cli/tests/057_revoke_permissions.ts b/cli/tests/057_revoke_permissions.ts
index 4a39112d2..de8deecb4 100644
--- a/cli/tests/057_revoke_permissions.ts
+++ b/cli/tests/057_revoke_permissions.ts
@@ -18,11 +18,11 @@ export function assert(cond: unknown): asserts cond {
 
 function genFunc(grant: Deno.PermissionName): [string, () => Promise<void>] {
   const gen: () => Promise<void> = async function Granted(): Promise<void> {
-    const status0 = await navigator.permissions.query({ name: grant });
+    const status0 = await Deno.permissions.query({ name: grant });
     assert(status0 != null);
     assert(status0.state === "granted");
 
-    const status1 = await navigator.permissions.revoke({ name: grant });
+    const status1 = await Deno.permissions.revoke({ name: grant });
     assert(status1 != null);
     assert(status1.state === "prompt");
   };
diff --git a/cli/tests/unit/permissions_test.ts b/cli/tests/unit/permissions_test.ts
index 0de6a774b..7528768a1 100644
--- a/cli/tests/unit/permissions_test.ts
+++ b/cli/tests/unit/permissions_test.ts
@@ -1,40 +1,27 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-
-import { unitTest, assert, assertThrowsAsync } from "./test_util.ts";
+import { unitTest, assert } from "./test_util.ts";
 
 unitTest(async function permissionInvalidName(): Promise<void> {
-  await assertThrowsAsync(async () => {
-    // @ts-expect-error name should not accept "foo"
-    await navigator.permissions.query({ name: "foo" });
-  }, TypeError);
+  let thrown = false;
+  try {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    await Deno.permissions.query({ name: "foo" as any });
+  } catch (e) {
+    thrown = true;
+    assert(e instanceof Error);
+  } finally {
+    assert(thrown);
+  }
 });
 
 unitTest(async function permissionNetInvalidUrl(): Promise<void> {
-  await assertThrowsAsync(async () => {
-    await navigator.permissions.query({ name: "net", url: ":" });
-  }, URIError);
-});
-
-unitTest(async function permissionQueryReturnsEventTarget(): Promise<void> {
-  const status = await navigator.permissions.query({ name: "hrtime" });
-  assert(["granted", "denied", "prompt"].includes(status.state));
-  let called = false;
-  status.addEventListener("change", () => {
-    called = true;
-  });
-  status.dispatchEvent(new Event("change"));
-  assert(called);
-  assert(status === (await navigator.permissions.query({ name: "hrtime" })));
-});
-
-unitTest(async function permissionQueryForReadReturnsSameStatus() {
-  const status1 = await navigator.permissions.query({
-    name: "read",
-    path: ".",
-  });
-  const status2 = await navigator.permissions.query({
-    name: "read",
-    path: ".",
-  });
-  assert(status1 === status2);
+  let thrown = false;
+  try {
+    await Deno.permissions.query({ name: "net", url: ":" });
+  } catch (e) {
+    thrown = true;
+    assert(e instanceof URIError);
+  } finally {
+    assert(thrown);
+  }
 });
diff --git a/cli/tests/unit/test_util.ts b/cli/tests/unit/test_util.ts
index dd6c858d2..25da7a638 100644
--- a/cli/tests/unit/test_util.ts
+++ b/cli/tests/unit/test_util.ts
@@ -42,7 +42,7 @@ export function fmtPerms(perms: Permissions): string {
 }
 
 const isGranted = async (name: Deno.PermissionName): Promise<boolean> =>
-  (await navigator.permissions.query({ name })).state === "granted";
+  (await Deno.permissions.query({ name })).state === "granted";
 
 export async function getProcessPermissions(): Promise<Permissions> {
   return {
diff --git a/cli/tests/unit/unit_test_runner.ts b/cli/tests/unit/unit_test_runner.ts
index c7c494278..b2e872200 100755
--- a/cli/tests/unit/unit_test_runner.ts
+++ b/cli/tests/unit/unit_test_runner.ts
@@ -49,7 +49,7 @@ async function dropWorkerPermissions(
   });
 
   for (const perm of permsToDrop) {
-    await navigator.permissions.revoke({ name: perm });
+    await Deno.permissions.revoke({ name: perm });
   }
 }
 
-- 
cgit v1.2.3