From 1c6d69bddfce546b8814b50aa4eb20eea744bcac Mon Sep 17 00:00:00 2001
From: chris <chris@bumblehead.com>
Date: Sat, 9 Sep 2023 20:48:28 -0700
Subject: [PATCH] correction to pattern used by script test commands

---
 tests/tests-ava/package.json     | 4 ++--
 tests/tests-jest-ts/package.json | 8 ++++----
 tests/tests-jest/package.json    | 4 ++--
 tests/tests-mocha/package.json   | 4 ++--
 tests/tests-node/package.json    | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/tests-ava/package.json b/tests/tests-ava/package.json
index 041a9c41..bcf7eeae 100644
--- a/tests/tests-ava/package.json
+++ b/tests/tests-ava/package.json
@@ -18,7 +18,7 @@
     "isnodelt20_6": "node -e \"(([mj, mn]) => (+mj < 20 || (+mj === 20 && +mn < 6)))(process.versions.node.split('.')) || process.exit(1)\"",
     "test:default": "NODE_OPTIONS=--loader=esmock ava",
     "test:win32": "set \"NODE_OPTIONS=--loader=esmock\" && ava",
-    "test:current": "npm run isnodelt20_6 || ava",
-    "test": "run-script-os && npm run test:current"
+    "test:current": "ava",
+    "test": "run-script-os && npm run isnodelt20_6 || npm run test:current"
   }
 }
diff --git a/tests/tests-jest-ts/package.json b/tests/tests-jest-ts/package.json
index a8c64ae8..7f06f980 100644
--- a/tests/tests-jest-ts/package.json
+++ b/tests/tests-jest-ts/package.json
@@ -21,12 +21,12 @@
   },
   "scripts": {
     "isnodelt20_6": "node -e \"(([mj, mn]) => (+mj < 20 || (+mj === 20 && +mn < 6)))(process.versions.node.split('.')) || process.exit(1)\"",
-    "test:defaultcurrent": "npm run isnodelt20_6 || NODE_OPTIONS=\"--loader=ts-node/esm\" jest esmock.node-jest.test.ts",
+    "test:defaultcurrent": "NODE_OPTIONS=\"--loader=ts-node/esm\" jest esmock.node-jest.test.ts",
     "test:defaultloader": "NODE_OPTIONS=\"--loader=ts-node/esm --loader=esmock\" jest esmock.node-jest.test.ts",
-    "test:default": "npm run test:defaultloader && npm run test:defaultcurrent",
-    "test:win32current": "npm run isnodelt20_6 || set \"NODE_OPTIONS=--loader=ts-node/esm\" && jest esmock.node-jest.test.ts",
+    "test:default": "npm run test:defaultloader && npm run isnodelt20_6 || npm run test:defaultcurrent",
+    "test:win32current": "set \"NODE_OPTIONS=--loader=ts-node/esm\" && jest esmock.node-jest.test.ts",
     "test:win32loader": "set \"NODE_OPTIONS=--loader=ts-node/esm --loader=esmock\" && jest esmock.node-jest.test.ts",
-    "test:win32": "npm run test:win32loader && npm run test:win32current",
+    "test:win32": "npm run test:win32loader && npm run isnodelt20_6 || npm run test:win32current",
     "test": "run-script-os"
   }
 }
diff --git a/tests/tests-jest/package.json b/tests/tests-jest/package.json
index 4fc00aa2..d5a5077e 100644
--- a/tests/tests-jest/package.json
+++ b/tests/tests-jest/package.json
@@ -22,7 +22,7 @@
     "isnodelt20_6": "node -e \"(([mj, mn]) => (+mj < 20 || (+mj === 20 && +mn < 6)))(process.versions.node.split('.')) || process.exit(1)\"",
     "test:default": "NODE_OPTIONS=--loader=esmock jest",
     "test:win32": "set NODE_OPTIONS=--loader=esmock && jest",
-    "test:current": "npm run isnodelt20_6 || jest",
-    "test": "run-script-os && npm run test:current"
+    "test:current": "jest",
+    "test": "run-script-os && npm run isnodelt20_6 || npm run test:current"
   }
 }
diff --git a/tests/tests-mocha/package.json b/tests/tests-mocha/package.json
index 66025fdd..80349073 100644
--- a/tests/tests-mocha/package.json
+++ b/tests/tests-mocha/package.json
@@ -16,7 +16,7 @@
   "scripts": {
     "isnodelt20_6": "node -e \"(([mj, mn]) => (+mj < 20 || (+mj === 20 && +mn < 6)))(process.versions.node.split('.')) || process.exit(1)\"",
     "test:loader": "mocha --loader=esmock",
-    "test:current": "npm run isnodelt20_6 || mocha",
-    "test": "npm run test:loader && npm run test:current"
+    "test:current": "mocha",
+    "test": "npm run test:loader && npm run isnodelt20_6 || npm run test:current"
   }
 }
diff --git a/tests/tests-node/package.json b/tests/tests-node/package.json
index 4ce1d411..5427e7cd 100644
--- a/tests/tests-node/package.json
+++ b/tests/tests-node/package.json
@@ -15,7 +15,7 @@
   "scripts": {
     "isnodelt20_6": "node -e \"(([mj, mn]) => (+mj < 20 || (+mj === 20 && +mn < 6)))(process.versions.node.split('.')) || process.exit(1)\"",
     "test:loader": "node --loader=esmock --test",
-    "test:current": "npm run isnodelt20_6 || node --test",
-    "test": "npm run test:loader && npm run test:current"
+    "test:current": "node --test",
+    "test": "npm run test:loader && npm run isnodelt20_6 || npm run test:current"
   }
 }