From 586d3a267f14f730c7703b6cf23ea83b8d17790d Mon Sep 17 00:00:00 2001
From: Owen Jacobson <owen@grimoire.ca>
Date: Tue, 27 May 2025 01:22:20 -0400
Subject: Consolidate testing steps into `tools/test`.

I've opted to run with `--coverage` to ensure that we continue exercising coverage support. Hat tip to @wlonk for holding me accountable on this - I had thought coverage was broken, but I was holding it wrong.
---
 package.json      |  4 +---
 tools/test        | 13 +++++++++++++
 tools/test-all    | 10 ----------
 tools/test-server |  9 ---------
 tools/test-ui     |  9 ---------
 5 files changed, 14 insertions(+), 31 deletions(-)
 create mode 100755 tools/test
 delete mode 100755 tools/test-all
 delete mode 100755 tools/test-server
 delete mode 100755 tools/test-ui

diff --git a/package.json b/package.json
index a43e01e..c6d01ec 100644
--- a/package.json
+++ b/package.json
@@ -11,9 +11,7 @@
 		"build": "vite build",
 		"preview": "vite preview",
 		"lint": "prettier --check ui && eslint ui",
-		"format": "prettier --write ui",
-		"test": "vitest",
-		"coverage": "vitest run --coverage"
+		"format": "prettier --write ui"
 	},
 	"devDependencies": {
 		"@sveltejs/adapter-static": "^3.0.8",
diff --git a/tools/test b/tools/test
new file mode 100755
index 0000000..06e2159
--- /dev/null
+++ b/tools/test
@@ -0,0 +1,13 @@
+#!/bin/bash -e
+
+## tools/test
+##
+## Run the full test suite.
+##
+## Best run as `tools/test` even if you have the `tools` directory in your
+## $PATH, due to naming collisions with the `test` shell builtin or `/bin/test`.
+
+cd "$(dirname "$0")/.."
+
+npx vitest --run --coverage
+cargo test
diff --git a/tools/test-all b/tools/test-all
deleted file mode 100755
index 0ad3ca3..0000000
--- a/tools/test-all
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash -e
-
-## tools/test-all
-##
-## Run the full test suite.
-
-cd "$(dirname "$0")/.."
-
-tools/test-ui
-tools/test-server
diff --git a/tools/test-server b/tools/test-server
deleted file mode 100755
index 44bdf76..0000000
--- a/tools/test-server
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash -e
-
-## tools/test-server
-##
-## Run the server test suite.
-
-cd "$(dirname "$0")/.."
-
-cargo test
diff --git a/tools/test-ui b/tools/test-ui
deleted file mode 100755
index eff5a07..0000000
--- a/tools/test-ui
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash -e
-
-## tools/test-ui
-##
-## Run the UI test suite.
-
-cd "$(dirname "$0")/.."
-
-npm run test -- --run
-- 
cgit v1.2.3