fix: return to base

Anton Standrik · Anton Standrik · commit a9b8609415e6 · 2024-11-20T21:43:00.000+03:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -224,90 +224,33 @@ jobs:
           destination_dir: .
           force_orphan: true
 
-      - name: Analyze test changes
-        id: analyze_tests
+      - name: Count new tests
+        id: count_tests
         run: |
           git fetch origin main:main
-          added_tests=()
-          deleted_tests=()
-          skipped_tests=()
-          base_skipped_tests=()
-
-          # Function to extract test names from a file
-          extract_test_names() {
-            local file=$1
-            local ref=$2
-            if git show "$ref:$file" > /dev/null 2>&1; then
-              git show "$ref:$file" | grep -E "test\([\'\"].*[\'\"]" | sed -E "s/.*test\(['\"]([^'\"]+)['\"].*/\1/"
-            fi
-          }
-
-          # 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
+          new_tests=0
 
           # 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)
-            base_tests=$(extract_test_names "$file" main)
-
-            # Find added tests (in current but not in base)
-            while IFS= read -r test; do
-              if [[ -n "$test" ]]; then
-                if ! echo "$base_tests" | grep -Fxq "$test"; then
-                  # 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"
-
-            # Find deleted tests (in base but not in current)
-            while IFS= read -r test; do
-              if [[ -n "$test" ]]; then
-                if ! echo "$current_tests" | grep -Fxq "$test"; then
-                  # 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"
+            # Count tests in current version
+            if git show HEAD:"$file" > /dev/null 2>&1; then
+              current_tests=$(git show HEAD:"$file" | grep -E "test\([\'\"]" | wc -l)
+            else
+              current_tests=0
+            fi
+
+            # Count tests in main version
+            if git show main:"$file" > /dev/null 2>&1; then
+              base_tests=$(git show main:"$file" | grep -E "test\([\'\"]" | wc -l)
+            else
+              base_tests=0
+            fi
+
+            # Add difference to total
+            ((new_tests += current_tests - base_tests))
           done
 
-          # Create JSON output
-          echo "added_tests=$(IFS=,; echo "${added_tests[*]}")" >> $GITHUB_OUTPUT
-          echo "deleted_tests=$(IFS=,; echo "${deleted_tests[*]}")" >> $GITHUB_OUTPUT
-          echo "skipped_tests=$(IFS=,; echo "${skipped_tests[*]}")" >> $GITHUB_OUTPUT
-          echo "added_count=${#added_tests[@]}" >> $GITHUB_OUTPUT
-          echo "deleted_count=${#deleted_tests[@]}" >> $GITHUB_OUTPUT
-          echo "skipped_count=${#skipped_tests[@]}" >> $GITHUB_OUTPUT
+          echo "new_tests=$new_tests" >> $GITHUB_OUTPUT
 
       - name: Update PR description
         uses: actions/github-script@v6
@@ -350,39 +293,20 @@ jobs:
             };
 
             const bundleStatus = percent === 'N/A' ? '⚠️' :
-                               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);
-            const skippedTests = '${{ steps.analyze_tests.outputs.skipped_tests }}'.split(',').filter(Boolean);
-
-            const addedCount = parseInt('${{ steps.analyze_tests.outputs.added_count }}');
-            const deletedCount = parseInt('${{ steps.analyze_tests.outputs.deleted_count }}');
-            const skippedCount = parseInt('${{ steps.analyze_tests.outputs.skipped_count }}');
+                                 parseFloat(percent) > 0 ? '🔺' :
+                                 parseFloat(percent) < 0 ? '🔽' : '✅';
 
-            const changesText = [
-              addedCount > 0 ? `✨${addedCount}` : '',
-              deletedCount > 0 ? `🗑️${deletedCount}` : '',
-              skippedCount > 0 ? `⏭️${skippedCount}` : ''
-            ].filter(Boolean).join(' ') || '➖';
+            const newTests = parseInt('${{ steps.count_tests.outputs.new_tests }}');
+            const testsStatus = newTests > 0 ? '✨' : '➖';
 
             const ciSection = `## CI Results
 
             ### Test Status: <span style="color: ${statusColor};">${status}</span>
             📊 [Full Report](${reportUrl})
 
-            | Total | Passed | Failed | Flaky | Changes |
-            |:-----:|:------:|:------:|:-----:|:-------:|
-            | ${testResults.total} | ${testResults.passed} | ${testResults.failed} | ${testResults.flaky} | ${changesText} |
-
-            <details>
-            <summary>📋 Test Changes Details</summary>
-
-            ${addedCount > 0 ? `\n✨ **Added Tests (${addedCount}):**\n${addedTests.map(t => `- ${t}`).join('\n')}` : ''}
-            ${deletedCount > 0 ? `\n🗑️ **Deleted Tests (${deletedCount}):**\n${deletedTests.map(t => `- ${t}`).join('\n')}` : ''}
-            ${skippedCount > 0 ? `\n⏭️ **Skipped Tests (${skippedCount}):**\n${skippedTests.map(t => `- ${t}`).join('\n')}` : ''}
-            </details>
+            | Total | Passed | Failed | Flaky | Skipped | New Tests |
+            |:-----:|:------:|:------:|:-----:|:-------:|:---------:|
+            | ${testResults.total} | ${testResults.passed} | ${testResults.failed} | ${testResults.flaky} | ${testResults.skipped} | ${testsStatus} ${newTests} |
 
             ### Bundle Size: ${bundleStatus}
             Current: ${formatSize(currentSize)} | Main: ${formatSize(mainSize)}
@@ -401,7 +325,7 @@ jobs:
             - Bundle size is measured for the entire 'dist' directory.
             - 📊 indicates links to detailed reports.
             - 🔺 indicates increase, 🔽 decrease, and ✅ no change in bundle size.
-            - Test changes: ✨ added, 🗑️ deleted, ⏭️ skipped
+            - ${testsStatus} indicates ${newTests} new test cases added in this PR.
             </details>`;
 
             const { data: pullRequest } = await github.rest.pulls.get({
diff --git a/tests/suites/tenant/queryEditor/queryEditor.test.ts b/tests/suites/tenant/queryEditor/queryEditor.test.ts
@@ -5,7 +5,13 @@ import {tenantName} from '../../../utils/constants';
 import {NavigationTabs, TenantPage, VISIBILITY_TIMEOUT} from '../TenantPage';
 import {createTableQuery, longRunningQuery, longTableSelect} from '../constants';
 
-import {ButtonNames, ExplainResultType, QueryEditor} from './models/QueryEditor';
+import {
+    ButtonNames,
+    ExplainResultType,
+    QueryEditor,
+    QueryTabs,
+    ResultTabNames,
+} from './models/QueryEditor';
 
 test.describe('Test Query Editor', async () => {
     const testQuery = 'SELECT 1, 2, 3, 4, 5;';
@@ -160,6 +166,34 @@ test.describe('Test Query Editor', async () => {
         await expect(queryEditor.isStopButtonHidden()).resolves.toBe(true);
     });
 
+    test('Changing tab inside results pane doesnt change results view', async ({page}) => {
+        const queryEditor = new QueryEditor(page);
+        await queryEditor.setQuery(testQuery);
+        await queryEditor.clickGearButton();
+        await queryEditor.settingsDialog.changeStatsLevel(STATISTICS_MODES.profile);
+        await queryEditor.settingsDialog.clickButton(ButtonNames.Save);
+        await queryEditor.clickRunButton();
+        await expect(queryEditor.resultTable.isVisible()).resolves.toBe(true);
+        await queryEditor.paneWrapper.selectTab(ResultTabNames.Schema);
+        await expect(queryEditor.resultTable.isHidden()).resolves.toBe(true);
+        await queryEditor.paneWrapper.selectTab(ResultTabNames.Result);
+        await expect(queryEditor.resultTable.isVisible()).resolves.toBe(true);
+    });
+
+    test('Changing tab inside editor doesnt change results view', async ({page}) => {
+        const queryEditor = new QueryEditor(page);
+        await queryEditor.setQuery(testQuery);
+        await queryEditor.clickGearButton();
+        await queryEditor.settingsDialog.changeStatsLevel(STATISTICS_MODES.profile);
+        await queryEditor.settingsDialog.clickButton(ButtonNames.Save);
+        await queryEditor.clickRunButton();
+        await expect(queryEditor.resultTable.isVisible()).resolves.toBe(true);
+        await queryEditor.queryTabs.selectTab(QueryTabs.History);
+        await expect(queryEditor.resultTable.isHidden()).resolves.toBe(true);
+        await queryEditor.queryTabs.selectTab(QueryTabs.Editor);
+        await expect(queryEditor.resultTable.isVisible()).resolves.toBe(true);
+    });
+
     test('Changing tab to diagnostics doesnt change results view', async ({page}) => {
         const queryEditor = new QueryEditor(page);
         const tenantPage = new TenantPage(page);
diff --git a/tests/suites/tenant/queryEditor/queryStatus.test.ts b/tests/suites/tenant/queryEditor/queryStatus.test.ts
@@ -43,7 +43,7 @@ test.describe('Test Query Execution Status', async () => {
         await expect(statusElement).toBe('Running');
     });
 
-    test.skip('Completed query status for completed query', async ({page}) => {
+    test('Completed query status for completed query', async ({page}) => {
         const queryEditor = new QueryEditor(page);
 
         await queryEditor.setQuery(testQuery);
@@ -54,7 +54,7 @@ test.describe('Test Query Execution Status', async () => {
         await expect(statusElement).toBe('Completed');
     });
 
-    test.skip('Failed query status for failed query', async ({page}) => {
+    test('Failed query status for failed query', async ({page}) => {
         const queryEditor = new QueryEditor(page);
 
         const invalidQuery = 'Select d';
