fix 20

Author: vlad-dargel

.circleci/config.yml

@@ -123,18 +123,7 @@ jobs:
       - run:
           name: Verify Compiled Files
           command: ls -R tests/e2e/dist/tests/
-      - run:
-          name: Run e2e tests
-          command: |
-            cd tests/e2e/dist
-            # Include setup.js as the first test file
-            export SETUP_TEST="tests/setup.js"
-            export TEST_FILES=$(circleci tests glob "tests/**/*.e2e.js" | circleci tests split --split-by=timings)
-            # Combine setup test and other tests, filter out any non-js files or directories
-            export COMBINED_TEST_FILES=$(echo -e "$SETUP_TEST\n$TEST_FILES" | grep -E '\.js$')
-            echo "Running tests: $COMBINED_TEST_FILES"
-            cd ../../..
-            TEST_FILES="$COMBINED_TEST_FILES" .circleci/e2e/test.app.sh
+F
       - when:
           condition:
             equal: [ true, << parameters.report >> ]

tests/e2e/src/vscode.runner.ts

@@ -56,20 +56,31 @@ import { VScodeScripts } from './helpers/scripts/vscodeScripts'
       })
     }
 
-    let testFilesEnv: string | string[] = process.env.TEST_FILES!;
+    let testFilesEnv: string | string[] = process.env.TEST_FILES!
     if (process.env.TEST_FILES) {
-      testFilesEnv = process.env.TEST_FILES.split(' ').map((file) => {
-        return path.join(__dirname, '..', 'dist', file);
-      });
-    
-      console.log('Full Paths:', testFilesEnv);
+      testFilesEnv = process.env.TEST_FILES.split(' ').map(file => {
+        return path.join(__dirname, '..', 'dist', file)
+      })
+
+      // Always prepend setup.js
+      const setupTestPath = path.join(
+        __dirname,
+        '..',
+        'dist',
+        'tests',
+        'setup.js',
+      )
+      testFilesEnv.unshift(setupTestPath)
+
+      console.log('Full Paths:', testFilesEnv)
     } else {
-      console.error('TEST_FILES environment variable is not defined.');
+      console.error('TEST_FILES environment variable is not defined.')
     }
 
     // Run tests
     await exTester.runTests(
-      testFilesEnv || path.join(__dirname, '..', 'dist', 'tests', '**', '*.e2e.js'),
+      testFilesEnv ||
+        path.join(__dirname, '..', 'dist', 'tests', '**', '*.e2e.js'),
       {
         settings: 'settings.json',
         logLevel: logging.Level.INFO,