fix: tests

Author: Anton Standrik

.github/workflows/quality.yml

@@ -220,36 +220,61 @@ jobs:
       - name: Analyze test changes
         id: analyze_tests
         run: |
+          # Create temporary files for storing test lists
+          current_tests_file=$(mktemp)
+          base_tests_file=$(mktemp)
+
+          # Function to extract test names from a file
+          extract_tests() {
+              local file=$1
+              if [ -f "$file" ]; then
+                  grep -E "test\(['\"]" "$file" | sed -E "s/.*test\(['\"]([^'\"]+)['\"].*/\1/"
+              fi
+          }
+
+          # Get list of test files
+          test_files=$(find tests/suites -type f -name "*.test.ts")
+
+          # First pass: current branch tests
+          for file in $test_files; do
+              tests=$(extract_tests "$file")
+              if [ ! -z "$tests" ]; then
+                  while IFS= read -r test_name; do
+                      echo "$test_name|$file" >> "$current_tests_file"
+                  done <<< "$tests"
+              fi
+          done
+
+          # Fetch and checkout main branch temporarily
           git fetch origin main:main
+          current_branch=$(git rev-parse --abbrev-ref HEAD)
+          git checkout main
+
+          # Second pass: main branch tests
+          for file in $test_files; do
+              if [ -f "$file" ]; then
+                  tests=$(extract_tests "$file")
+                  if [ ! -z "$tests" ]; then
+                      while IFS= read -r test_name; do
+                          echo "$test_name|$file" >> "$base_tests_file"
+                      done <<< "$tests"
+                  fi
+              fi
+          done
+
+          # Switch back to original branch
+          git checkout "$current_branch"
+
+          # Compare and build test details
           new_tests=0
           test_details=""
 
-          # Get list of changed test files
-          for file in $(git diff --name-only main...HEAD | grep -E '^tests/suites/.*\.(spec|test)\.(ts|tsx|js|jsx)$'); do
-            echo "Analyzing file: $file"
-            
-            # Get test names from current version
-            if git show HEAD:"$file" > /dev/null 2>&1; then
-              current_tests=$(git show HEAD:"$file" | grep -E "test\([\'\"]" | sed -E "s/.*test\(['\"]([^'\"]+)['\"].*/\1/")
-            else
-              current_tests=""
-            fi
-
-            # Get test names from main version
-            if git show main:"$file" > /dev/null 2>&1; then
-              base_tests=$(git show main:"$file" | grep -E "test\([\'\"]" | sed -E "s/.*test\(['\"]([^'\"]+)['\"].*/\1/")
-            else
-              base_tests=""
-            fi
-
-            # Compare and find new tests
-            while IFS= read -r test_name; do
-              if [ ! -z "$test_name" ] && ! echo "$base_tests" | grep -Fxq "$test_name"; then
-                ((new_tests++))
-                test_details+="- ✨ Added test: \`$test_name\` in \`$file\`\\n"
+          while IFS='|' read -r test_name file; do
+              if ! grep -Fq "$test_name|" "$base_tests_file"; then
+                  ((new_tests++))
+                  test_details+="- ✨ Added test: \`$test_name\` in \`$file\`\\n"
               fi
-            done <<< "$current_tests"
-          done
+          done < "$current_tests_file"
 
           # Escape the test details for GitHub Actions
           test_details="${test_details//'%'/'%25'}"
@@ -261,6 +286,9 @@ jobs:
           echo "$test_details" >> $GITHUB_OUTPUT
           echo "EOF" >> $GITHUB_OUTPUT
 
+          # Cleanup
+          rm "$current_tests_file" "$base_tests_file"
+
       - name: Update PR description
         uses: actions/github-script@v6
         with:

tests/suites/tenant/queryEditor/queryEditor.test.ts

@@ -234,7 +234,7 @@ test.describe('Test Query Editor', async () => {
         await expect(queryEditor.resultTable.getResultHeadText()).resolves.toBe('Truncated(1)');
     });
 
-    test('Query execution status changes correctly', async ({page}) => {
+    test.only('Query execution status changes correctly', async ({page}) => {
         const queryEditor = new QueryEditor(page);
         await queryEditor.setQuery(testQuery);
         await queryEditor.clickRunButton();