simplify logic

https://coveord.atlassian.net/browse/KIT-3702
coveo · Nov 14, 2024 · 76fd46a · 76fd46a
1 parent 2d8b5eb
commit 76fd46a
Showing 1 changed file with 21 additions and 9 deletions.
diff --git a/scripts/ci/determine-tests.mjs b/scripts/ci/determine-tests.mjs
@@ -33,6 +33,13 @@ class PackageJsonChangeError extends Error {
   }
 }
 
+class RunAllTestsInMergeQueueError extends Error {
+  constructor() {
+    super(`In a merge queue. Running all tests.`);
+    this.name = 'RunAllTestsInMergeQueueError';
+  }
+}
+
 /**
  * Recursively finds all end-to-end test files with the `.e2e.ts` extension in a given directory.
  *
@@ -181,16 +188,19 @@ const projectRoot = process.env.projectRoot;
 const atomicSourceComponents = join('packages', 'atomic', 'src', 'components');
 
 try {
+  if (runAllTests) {
+    throw new RunAllTestsInMergeQueue();
+  }
+
   const testFiles = findAllTestFiles(atomicSourceComponents);
   const testDependencies = createTestFileMappings(testFiles, projectRoot);
-  const testsToRun = runAllTests
-    ? testFiles.join(' ')
-    : determineTestFilesToRun(changedFiles, testDependencies);
-  if (testsToRun === '' && !runAllTests) {
+  const testsToRun = determineTestFilesToRun(changedFiles, testDependencies);
+
+  if (testsToRun === '') {
     throw new NoRelevantChangesError();
   }
-  const maximumShards = parseInt(process.env.maximumShards, 10);
 
+  const maximumShards = parseInt(process.env.maximumShards, 10);
   const [shardIndex, shardTotal] = allocateShards(
     testsToRun.split(' ').length,
     maximumShards
@@ -205,11 +215,10 @@ try {
     setOutput(outputNameTestsToRun, '');
     setOutput(outputNameShardIndex, [0]);
     setOutput(outputNameShardTotal, [0]);
-  }
-
-  if (
+  } else if (
     error instanceof DependentPackageChangeError ||
-    error instanceof PackageJsonChangeError
+    error instanceof PackageJsonChangeError ||
+    error instanceof RunAllTestsInMergeQueueError
   ) {
     console.warn(error?.message || error);
     setOutput(outputNameTestsToRun, '');
@@ -220,5 +229,8 @@ try {
     setOutput(outputNameShardIndex, shardIndex);
     const shardTotal = [process.env.maximumShards];
     setOutput(outputNameShardTotal, shardTotal);
+  } else {
+    console.error('Unexpected error:', error);
+    process.exit(1);
   }
 }