From 3e98ea4e69732d8a659ca0ca61747fe3887ab673 Mon Sep 17 00:00:00 2001
From: David Sherret <dsherret@users.noreply.github.com>
Date: Fri, 3 May 2024 00:49:42 -0400
Subject: chore(tests/specs): ability to have sub tests in file (#23667)

Allows writing named sub-tests. These are:

1. Filterable on the command line via `cargo test ...`
2. Run in parallel
3. Use a fresh temp and deno dir for each test (unlike steps)
---
 tests/specs/jsr/deps/__test__.jsonc             | 18 ++++++++++--------
 tests/specs/jsr/import_https_url/__test__.jsonc | 22 ++++++++++++----------
 tests/specs/jsr/module_graph/__test__.jsonc     | 18 ++++++++++--------
 tests/specs/jsr/module_graph2/__test__.jsonc    | 18 ++++++++++--------
 tests/specs/jsr/no_module_graph/__test__.jsonc  | 25 ++++++++++++++-----------
 5 files changed, 56 insertions(+), 45 deletions(-)

(limited to 'tests/specs/jsr')

diff --git a/tests/specs/jsr/deps/__test__.jsonc b/tests/specs/jsr/deps/__test__.jsonc
index a8837a8b5..73f573e10 100644
--- a/tests/specs/jsr/deps/__test__.jsonc
+++ b/tests/specs/jsr/deps/__test__.jsonc
@@ -1,10 +1,12 @@
 {
-  "steps": [{
-    "args": "run main.ts",
-    "output": "main.out"
-  }, {
-    "cleanDenoDir": true,
-    "args": "info main.ts",
-    "output": "main_info.out"
-  }]
+  "tests": {
+    "run": {
+      "args": "run main.ts",
+      "output": "main.out"
+    },
+    "info": {
+      "args": "info main.ts",
+      "output": "main_info.out"
+    }
+  }
 }
diff --git a/tests/specs/jsr/import_https_url/__test__.jsonc b/tests/specs/jsr/import_https_url/__test__.jsonc
index 8ba999d8a..afaaa7d90 100644
--- a/tests/specs/jsr/import_https_url/__test__.jsonc
+++ b/tests/specs/jsr/import_https_url/__test__.jsonc
@@ -1,12 +1,14 @@
 {
-  "steps": [{
-    "args": "run -A analyzable.ts",
-    "output": "analyzable.out",
-    "exitCode": 1
-  }, {
-    "cleanDenoDir": true,
-    "args": "run -A nonanalyzable.ts",
-    "output": "nonanalyzable.out",
-    "exitCode": 1
-  }]
+  "tests": {
+    "analyzable": {
+      "args": "run -A analyzable.ts",
+      "output": "analyzable.out",
+      "exitCode": 1
+    },
+    "non_analyzable": {
+      "args": "run -A nonanalyzable.ts",
+      "output": "nonanalyzable.out",
+      "exitCode": 1
+    }
+  }
 }
diff --git a/tests/specs/jsr/module_graph/__test__.jsonc b/tests/specs/jsr/module_graph/__test__.jsonc
index 16b086e8b..dabed8700 100644
--- a/tests/specs/jsr/module_graph/__test__.jsonc
+++ b/tests/specs/jsr/module_graph/__test__.jsonc
@@ -1,10 +1,12 @@
 {
-  "steps": [{
-    "args": "run --log-level=debug main.ts",
-    "output": "main.out"
-  }, {
-    "cleanDenoDir": true,
-    "args": "info main.ts",
-    "output": "main_info.out"
-  }]
+  "tests": {
+    "run": {
+      "args": "run --log-level=debug main.ts",
+      "output": "main.out"
+    },
+    "info": {
+      "args": "info main.ts",
+      "output": "main_info.out"
+    }
+  }
 }
diff --git a/tests/specs/jsr/module_graph2/__test__.jsonc b/tests/specs/jsr/module_graph2/__test__.jsonc
index 16b086e8b..dabed8700 100644
--- a/tests/specs/jsr/module_graph2/__test__.jsonc
+++ b/tests/specs/jsr/module_graph2/__test__.jsonc
@@ -1,10 +1,12 @@
 {
-  "steps": [{
-    "args": "run --log-level=debug main.ts",
-    "output": "main.out"
-  }, {
-    "cleanDenoDir": true,
-    "args": "info main.ts",
-    "output": "main_info.out"
-  }]
+  "tests": {
+    "run": {
+      "args": "run --log-level=debug main.ts",
+      "output": "main.out"
+    },
+    "info": {
+      "args": "info main.ts",
+      "output": "main_info.out"
+    }
+  }
 }
diff --git a/tests/specs/jsr/no_module_graph/__test__.jsonc b/tests/specs/jsr/no_module_graph/__test__.jsonc
index 6c89ccb54..e7428c16a 100644
--- a/tests/specs/jsr/no_module_graph/__test__.jsonc
+++ b/tests/specs/jsr/no_module_graph/__test__.jsonc
@@ -1,13 +1,16 @@
 {
-  "steps": [{
-    "args": "run main.ts",
-    "output": "main.out"
-  }, {
-    "cleanDenoDir": true,
-    "args": "info main.ts",
-    "output": "main_info.out"
-  }, {
-    "args": "run --quiet multiple.ts",
-    "output": "multiple.out"
-  }]
+  "tests": {
+    "single": {
+      "args": "run main.ts",
+      "output": "main.out"
+    },
+    "single_info": {
+      "args": "info main.ts",
+      "output": "main_info.out"
+    },
+    "multiple": {
+      "args": "run --quiet multiple.ts",
+      "output": "multiple.out"
+    }
+  }
 }
-- 
cgit v1.2.3