fix: skipped tests

Author: Anton Standrik

.github/workflows/ci.yml

@@ -231,6 +231,7 @@ jobs:
           added_tests=()
           deleted_tests=()
           skipped_tests=()
+          base_skipped_tests=()
 
           # Function to extract test names from a file
           extract_test_names() {
@@ -241,7 +242,35 @@ jobs:
             fi
           }
 
-          # First, get list of changed test files and analyze deletions
+          # Function to extract skipped test names from a file
+          extract_skipped_tests() {
+            local file=$1
+            local ref=$2
+            if git show "$ref:$file" > /dev/null 2>&1; then
+              git show "$ref:$file" | grep -E "test\.skip\([\'\"].*[\'\"]" | sed -E "s/.*test\.skip\(['\"]([^'\"]+)['\"].*/\1/"
+            fi
+          }
+
+          # Get skipped tests from both base and current branches
+          for file in $(git ls-files | grep -E '^tests/suites/.*\.(spec|test)\.(ts|tsx|js|jsx)$'); do
+            # Get skipped tests from base branch
+            while IFS= read -r test; do
+              if [[ -n "$test" ]]; then
+                base_skipped_tests+=("$test")
+              fi
+            done < <(extract_skipped_tests "$file" main)
+
+            # Get skipped tests from current branch
+            while IFS= read -r test; do
+              if [[ -n "$test" ]]; then
+                if ! printf '%s\n' "${base_skipped_tests[@]}" | grep -Fxq "$test"; then
+                  skipped_tests+=("$test")
+                fi
+              fi
+            done < <(extract_skipped_tests "$file" HEAD)
+          done
+
+          # 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
             # Get test names from both versions
             current_tests=$(extract_test_names "$file" HEAD)
@@ -251,7 +280,10 @@ jobs:
             while IFS= read -r test; do
               if [[ -n "$test" ]]; then
                 if ! echo "$base_tests" | grep -Fxq "$test"; then
-                  added_tests+=("$test")
+                  # Only add if it's not a skipped test
+                  if ! printf '%s\n' "${skipped_tests[@]}" | grep -Fxq "$test"; then
+                    added_tests+=("$test")
+                  fi
                 fi
               fi
             done <<< "$current_tests"
@@ -260,21 +292,15 @@ jobs:
             while IFS= read -r test; do
               if [[ -n "$test" ]]; then
                 if ! echo "$current_tests" | grep -Fxq "$test"; then
-                  deleted_tests+=("$test")
+                  # Only count as deleted if it wasn't skipped in base
+                  if ! printf '%s\n' "${base_skipped_tests[@]}" | grep -Fxq "$test"; then
+                    deleted_tests+=("$test")
+                  fi
                 fi
               fi
             done <<< "$base_tests"
           done
 
-          # Separately, get skipped tests from test results
-          if [ -f "playwright-artifacts/test-results.json" ]; then
-            while IFS= read -r test; do
-              if [[ -n "$test" ]]; then
-                skipped_tests+=("$test")
-              fi
-            done < <(jq -r '.suites[].specs[] | select(.ok == false and .skipped == true) | .title' playwright-artifacts/test-results.json)
-          fi
-
           # Create JSON output
           echo "added_tests=$(IFS=,; echo "${added_tests[*]}")" >> $GITHUB_OUTPUT
           echo "deleted_tests=$(IFS=,; echo "${deleted_tests[*]}")" >> $GITHUB_OUTPUT
@@ -324,8 +350,8 @@ jobs:
             };
 
             const bundleStatus = percent === 'N/A' ? '⚠️' :
-                                 parseFloat(percent) > 0 ? '🔺' :
-                                 parseFloat(percent) < 0 ? '🔽' : '✅';
+                               parseFloat(percent) > 0 ? '🔺' :
+                               parseFloat(percent) < 0 ? '🔽' : '✅';
 
             const addedTests = '${{ steps.analyze_tests.outputs.added_tests }}'.split(',').filter(Boolean);
             const deletedTests = '${{ steps.analyze_tests.outputs.deleted_tests }}'.split(',').filter(Boolean);