Merge branch 'main' of github.com:agrostar/zzapi

agrostar · Jun 2, 2024 · 54aafbc · 54aafbc
2 parents 76c1e09 + 5979a2b
commit 54aafbc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/mergeData.ts b/src/mergeData.ts
@@ -144,9 +144,11 @@ function mergePrefixBasedTests(tests: RawTests) {
   for (const key of Object.keys(tests)) {
     if (key.startsWith("$.")) {
       tests.json[key] = tests[key];
+      delete tests[key];
     } else if (key.startsWith("$h.")) {
       const headerName = key.replace(/^\$h\./, "");
       tests.headers[headerName] = tests[key];
+      delete tests[key];
     }
   }
 }

diff --git a/src/runTests.ts b/src/runTests.ts
@@ -12,15 +12,14 @@ export function runAllTests(
   const results: TestResult[] = [];
   if (!tests) return results;
 
-  let statusFail = false;
   if (tests.status) {
     const expected = tests.status;
     const received = responseData.status;
     const statusResults = runTest("status", expected, received);
     results.push(...statusResults);
-    statusFail = statusResults.some((r) => !r.pass);
+
+    if (stopOnFailure && statusResults.some((r) => !r.pass)) return results;
   }
-  if (stopOnFailure && statusFail) return results;
 
   for (const spec in tests.headers) {
     const expected = tests.headers[spec];