fix test filtering

Author: sparecycles

packages/core/src/entry/testing/cli/index.ts

@@ -19,6 +19,7 @@ import { initializePardon } from "../../../runtime/runtime.js";
 import {
   chooseReportOutput,
   executeSelectedTests,
+  filterTestPlanning,
   loadTests,
   PardonTestConfiguration,
   writeResultSummary,
@@ -111,18 +112,13 @@ async function main() {
     environment = updates;
   }
 
-  const { cases, patterns, antipatterns } = await testplanner(
+  const planning = await testplanner(
     environment,
     parseSmokeConfig(smoke),
     ...positionals,
   );
 
-  const testplan = cases.filter(
-    ({ testcase }) =>
-      !patterns ||
-      (patterns.some((p) => p.test(testcase)) &&
-        !antipatterns.some((p) => p.test(testcase))),
-  );
+  const testplan = filterTestPlanning(planning);
 
   if (testplan.length === 0) {
     console.warn(`
@@ -131,7 +127,7 @@ FAIL
 
 no testcases configured and/or
 all testcases filtered out.${
-      patterns?.some((p) => p.source.includes("package\\.json"))
+      planning.patterns?.some((p) => p.source.includes("package\\.json"))
         ? `
 
 (Hint: You may need to put your ** filter in quotes.)
@@ -142,7 +138,7 @@ all testcases filtered out.${
     return 1;
   }
 
-  if (plan || !patterns) {
+  if (plan || !planning.patterns) {
     if (plan) {
       console.info(`--- TEST PLAN ---`);
     } else {

packages/core/src/entry/testing/cli/runner.ts

@@ -57,6 +57,12 @@ export type TestSetup = {
   testenv: Record<string, unknown>;
 };
 
+export type TestPlanning = {
+  cases: TestSetup[];
+  patterns?: RegExp[];
+  antipatterns?: RegExp[];
+}
+
 const inflight = new AsyncLocalStorage<{
   scheduled: Promise<unknown>[];
   awaited: ReturnType<typeof tracking>;
@@ -720,12 +726,21 @@ export async function loadTests(
         cases,
         patterns,
         antipatterns,
-      };
+      } satisfies TestPlanning;
     },
     configuration,
   };
 }
 
+export function filterTestPlanning({ cases, patterns, antipatterns }: TestPlanning): TestSetup[] {
+  return cases.filter(
+    ({ testcase }) =>
+      !patterns?.length ||
+      (patterns.some((p) => p.test(testcase)) &&
+        !antipatterns?.some((p) => p.test(testcase))),
+  );
+}
+
 async function configureTrials(
   { trials }: PardonTestConfiguration,
   testenv: Record<string, unknown>,

packages/core/src/modules/running.ts

@@ -9,7 +9,7 @@ the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTA
 OF ANY KIND, either express or implied. See the License for the specific language
 governing permissions and limitations under the License.
 */
-export { loadTests, executeTest } from "../entry/testing/cli/runner.js";
+export { loadTests, executeTest, filterTestPlanning } from "../entry/testing/cli/runner.js";
 export { initTrackingEnvironment } from "../runtime/environment.js";
 export { sequenceRegistry } from "../entry/testing/sequence.js";
 

packages/favor/electron/pardon-worker.ts

@@ -42,6 +42,7 @@ import {
   type SmokeConfig,
   awaitedSequences,
   semaphore,
+  filterTestPlanning,
 } from "pardon/running";
 
 let nextTestRunId = Date.now();
@@ -323,7 +324,7 @@ async function initializePardonAndLoadSamples(
 
   const testing = loadTestEngine(app);
 
-  await initTrackingEnvironment({});
+  await initTrackingEnvironment();
 
   return { app, samples, testing };
 }
@@ -593,8 +594,9 @@ const handlers = {
     { smoke, filter }: { smoke?: SmokeConfig; filter?: string[] },
   ) {
     const { testing } = await ready;
-    const testplan = await (await testing)?.testplanner(environment, smoke, ...(filter || []));
-    return testplan.cases.map(({ testenv, testcase }) => ({ testenv, testcase }));
+    const planning = await (await testing)!.testplanner(environment, smoke, ...(filter || []));
+
+    return filterTestPlanning(planning);
   },
   async executeTestcases(
     testenv: Record<string, unknown>,
@@ -612,7 +614,7 @@ const handlers = {
       ...testcases,
     );
 
-    const tests = (await testplan)?.cases;
+    const tests = filterTestPlanning(testplan);
 
     parentPort!.postMessage(
       ship({
@@ -633,7 +635,7 @@ const handlers = {
     return currentTestRun.run(testRun, () =>
       all_disconnected(
         tests.map(
-          async ({ environment: initEnv, test, testcase }) =>
+          async ({ testenv: initEnv, test, testcase }) =>
             await concurrently(() =>
               disconnected(async () => {
                 let errors: unknown[] = [];
@@ -662,7 +664,7 @@ const handlers = {
                 } catch (error) {
                   notifyFastFailed(error);
                   errors.push(error);
-                  emitEnv = { ...environment };
+                  emitEnv = { ...testenv };
 
                   return { testcase, errors, environment: emitEnv };
                 } finally {

packages/favor/vite.main.config.ts

@@ -38,10 +38,6 @@ export default extendMainConfig({
         exports: "named",
         sourcemap: true,
       },
-    },
-    commonjsOptions: {
-      transformMixedEsModules: true,
-      ignoreDynamicRequires: true,
-    },
+    }
   },
 });