1 files changed, 58 insertions, 52 deletions

diff --git a/cli/js/make_temp_test.ts b/cli/js/make_temp_test.ts
index 83a174e83..9804a7043 100644
--- a/cli/js/make_temp_test.ts
+++ b/cli/js/make_temp_test.ts
@@ -1,7 +1,7 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-import { test, testPerm, assert, assertEquals } from "./test_util.ts";
+import { unitTest, assert, assertEquals } from "./test_util.ts";
 
-testPerm({ write: true }, function makeTempDirSyncSuccess(): void {
+unitTest({ perms: { write: true } }, function makeTempDirSyncSuccess(): void {
   const dir1 = Deno.makeTempDirSync({ prefix: "hello", suffix: "world" });
   const dir2 = Deno.makeTempDirSync({ prefix: "hello", suffix: "world" });
   // Check that both dirs are different.
@@ -26,7 +26,7 @@ testPerm({ write: true }, function makeTempDirSyncSuccess(): void {
   assert(err instanceof Deno.errors.NotFound);
 });
 
-test(function makeTempDirSyncPerm(): void {
+unitTest(function makeTempDirSyncPerm(): void {
   // makeTempDirSync should require write permissions (for now).
   let err;
   try {
@@ -38,32 +38,35 @@ test(function makeTempDirSyncPerm(): void {
   assertEquals(err.name, "PermissionDenied");
 });
 
-testPerm({ write: true }, async function makeTempDirSuccess(): Promise<void> {
-  const dir1 = await Deno.makeTempDir({ prefix: "hello", suffix: "world" });
-  const dir2 = await Deno.makeTempDir({ prefix: "hello", suffix: "world" });
-  // Check that both dirs are different.
-  assert(dir1 !== dir2);
-  for (const dir of [dir1, dir2]) {
-    // Check that the prefix and suffix are applied.
-    const lastPart = dir.replace(/^.*[\\\/]/, "");
-    assert(lastPart.startsWith("hello"));
-    assert(lastPart.endsWith("world"));
+unitTest(
+  { perms: { write: true } },
+  async function makeTempDirSuccess(): Promise<void> {
+    const dir1 = await Deno.makeTempDir({ prefix: "hello", suffix: "world" });
+    const dir2 = await Deno.makeTempDir({ prefix: "hello", suffix: "world" });
+    // Check that both dirs are different.
+    assert(dir1 !== dir2);
+    for (const dir of [dir1, dir2]) {
+      // Check that the prefix and suffix are applied.
+      const lastPart = dir.replace(/^.*[\\\/]/, "");
+      assert(lastPart.startsWith("hello"));
+      assert(lastPart.endsWith("world"));
+    }
+    // Check that the `dir` option works.
+    const dir3 = await Deno.makeTempDir({ dir: dir1 });
+    assert(dir3.startsWith(dir1));
+    assert(/^[\\\/]/.test(dir3.slice(dir1.length)));
+    // Check that creating a temp dir inside a nonexisting directory fails.
+    let err;
+    try {
+      await Deno.makeTempDir({ dir: "/baddir" });
+    } catch (err_) {
+      err = err_;
+    }
+    assert(err instanceof Deno.errors.NotFound);
   }
-  // Check that the `dir` option works.
-  const dir3 = await Deno.makeTempDir({ dir: dir1 });
-  assert(dir3.startsWith(dir1));
-  assert(/^[\\\/]/.test(dir3.slice(dir1.length)));
-  // Check that creating a temp dir inside a nonexisting directory fails.
-  let err;
-  try {
-    await Deno.makeTempDir({ dir: "/baddir" });
-  } catch (err_) {
-    err = err_;
-  }
-  assert(err instanceof Deno.errors.NotFound);
-});
+);
 
-testPerm({ write: true }, function makeTempFileSyncSuccess(): void {
+unitTest({ perms: { write: true } }, function makeTempFileSyncSuccess(): void {
   const file1 = Deno.makeTempFileSync({ prefix: "hello", suffix: "world" });
   const file2 = Deno.makeTempFileSync({ prefix: "hello", suffix: "world" });
   // Check that both dirs are different.
@@ -89,7 +92,7 @@ testPerm({ write: true }, function makeTempFileSyncSuccess(): void {
   assert(err instanceof Deno.errors.NotFound);
 });
 
-test(function makeTempFileSyncPerm(): void {
+unitTest(function makeTempFileSyncPerm(): void {
   // makeTempFileSync should require write permissions (for now).
   let err;
   try {
@@ -101,28 +104,31 @@ test(function makeTempFileSyncPerm(): void {
   assertEquals(err.name, "PermissionDenied");
 });
 
-testPerm({ write: true }, async function makeTempFileSuccess(): Promise<void> {
-  const file1 = await Deno.makeTempFile({ prefix: "hello", suffix: "world" });
-  const file2 = await Deno.makeTempFile({ prefix: "hello", suffix: "world" });
-  // Check that both dirs are different.
-  assert(file1 !== file2);
-  for (const dir of [file1, file2]) {
-    // Check that the prefix and suffix are applied.
-    const lastPart = dir.replace(/^.*[\\\/]/, "");
-    assert(lastPart.startsWith("hello"));
-    assert(lastPart.endsWith("world"));
-  }
-  // Check that the `dir` option works.
-  const dir = Deno.makeTempDirSync({ prefix: "tempdir" });
-  const file3 = await Deno.makeTempFile({ dir });
-  assert(file3.startsWith(dir));
-  assert(/^[\\\/]/.test(file3.slice(dir.length)));
-  // Check that creating a temp file inside a nonexisting directory fails.
-  let err;
-  try {
-    await Deno.makeTempFile({ dir: "/baddir" });
-  } catch (err_) {
-    err = err_;
+unitTest(
+  { perms: { write: true } },
+  async function makeTempFileSuccess(): Promise<void> {
+    const file1 = await Deno.makeTempFile({ prefix: "hello", suffix: "world" });
+    const file2 = await Deno.makeTempFile({ prefix: "hello", suffix: "world" });
+    // Check that both dirs are different.
+    assert(file1 !== file2);
+    for (const dir of [file1, file2]) {
+      // Check that the prefix and suffix are applied.
+      const lastPart = dir.replace(/^.*[\\\/]/, "");
+      assert(lastPart.startsWith("hello"));
+      assert(lastPart.endsWith("world"));
+    }
+    // Check that the `dir` option works.
+    const dir = Deno.makeTempDirSync({ prefix: "tempdir" });
+    const file3 = await Deno.makeTempFile({ dir });
+    assert(file3.startsWith(dir));
+    assert(/^[\\\/]/.test(file3.slice(dir.length)));
+    // Check that creating a temp file inside a nonexisting directory fails.
+    let err;
+    try {
+      await Deno.makeTempFile({ dir: "/baddir" });
+    } catch (err_) {
+      err = err_;
+    }
+    assert(err instanceof Deno.errors.NotFound);
   }
-  assert(err instanceof Deno.errors.NotFound);
-});
+);