Seperate test suite rerun fix

vishnuv688 · vishnuv688 · commit e11dddfe964f · 2025-12-15T20:27:20.000+05:30
diff --git a/packages/app/src/components/sidebar/explorer.ts b/packages/app/src/components/sidebar/explorer.ts
@@ -30,6 +30,9 @@ interface TestEntry {
   type: 'suite' | 'test'
   specFile?: string
   fullTitle?: string
+  featureFile?: string
+  featureLine?: number
+  suiteType?: string
 }
 
 interface RunCapabilities {
@@ -123,13 +126,15 @@ export class DevtoolsSidebarExplorer extends CollapseableEntry {
     // Clear execution data before triggering rerun
     this.dispatchEvent(new CustomEvent('clear-execution-data', { bubbles: true, composed: true }))
 
-    await this.#postToBackend('/api/tests/run', {
+    const payload = {
       ...detail,
       runAll: detail.uid === '*',
       framework: this.#getFramework(),
       specFile: detail.specFile || this.#deriveSpecFile(detail),
       configFile: this.#getConfigPath()
-    })
+    }
+    console.log('[Explorer] Sending test run request:', payload)
+    await this.#postToBackend('/api/tests/run', payload)
   }
 
   async #handleTestStop(event: Event) {
@@ -289,6 +294,9 @@ export class DevtoolsSidebarExplorer extends CollapseableEntry {
         spec-file="${entry.specFile || ''}"
         full-title="${entry.fullTitle || ''}"
         label-text="${entry.label}"
+        feature-file="${entry.featureFile || ''}"
+        feature-line="${entry.featureLine ?? ''}"
+        suite-type="${entry.suiteType || ''}"
         .runDisabled=${this.#isRunDisabled(entry)}
         .runDisabledReason=${this.#getRunDisabledReason(entry)}
       >
@@ -345,6 +353,9 @@ export class DevtoolsSidebarExplorer extends CollapseableEntry {
         callSource: (entry as any).callSource,
         specFile: (entry as any).file,
         fullTitle: entry.title,
+        featureFile: (entry as any).featureFile,
+        featureLine: (entry as any).featureLine,
+        suiteType: (entry as any).type,
         children: Object.values(entries)
           .map(this.#getTestEntry.bind(this))
           .filter(this.#filterEntry.bind(this))
@@ -362,6 +373,8 @@ export class DevtoolsSidebarExplorer extends CollapseableEntry {
       callSource: (entry as any).callSource,
       specFile: (entry as any).file,
       fullTitle: (entry as any).fullTitle || entry.title,
+      featureFile: (entry as any).featureFile,
+      featureLine: (entry as any).featureLine,
       children: []
     }
   }
diff --git a/packages/app/src/components/sidebar/test-suite.ts b/packages/app/src/components/sidebar/test-suite.ts
@@ -26,6 +26,9 @@ export interface TestRunDetail {
   label?: string
   callSource?: string
   configFile?: string
+  featureFile?: string
+  featureLine?: number
+  suiteType?: string
 }
 
 @customElement(TEST_SUITE)
@@ -86,6 +89,15 @@ export class ExplorerTestEntry extends CollapseableEntry {
   @property({ type: String, attribute: 'run-disabled-reason' })
   runDisabledReason?: string
 
+  @property({ type: String, attribute: 'feature-file' })
+  featureFile?: string
+
+  @property({ type: Number, attribute: 'feature-line' })
+  featureLine?: number
+
+  @property({ type: String, attribute: 'suite-type' })
+  suiteType?: string
+
   static styles = [
     ...Element.styles,
     css`
@@ -136,7 +148,10 @@ export class ExplorerTestEntry extends CollapseableEntry {
       specFile: this.specFile,
       fullTitle: this.fullTitle,
       label: this.labelText,
-      callSource: this.callSource
+      callSource: this.callSource,
+      featureFile: this.featureFile,
+      featureLine: this.featureLine,
+      suiteType: this.suiteType
     }
     this.dispatchEvent(
       new CustomEvent<TestRunDetail>('app-test-run', {
diff --git a/packages/app/src/controller/DataManager.ts b/packages/app/src/controller/DataManager.ts
@@ -264,31 +264,39 @@ export class DataManagerController implements ReactiveController {
 
     const suiteMap = new Map<string, SuiteStatsFragment>()
 
+    console.log('[DataManager] Suites update - existing suites:', this.suitesContextProvider.value?.length || 0)
+
     // Populate with existing suites (keeps test list visible)
     ;(this.suitesContextProvider.value || []).forEach((chunk) => {
       Object.entries(chunk as Record<string, SuiteStatsFragment>).forEach(
         ([uid, suite]) => {
           if (suite?.uid) {
             suiteMap.set(uid, suite)
+            console.log('[DataManager] Added existing suite to map:', uid, suite.title)
           }
         }
       )
     })
 
+    console.log('[DataManager] Incoming payloads:', payloads.length)
+
     // Process incoming payloads
     payloads.forEach((chunk) => {
       if (!chunk) return
 
       Object.entries(chunk).forEach(([uid, suite]) => {
         if (!suite?.uid) return
 
+        console.log('[DataManager] Processing incoming suite:', uid, suite.title)
         const existing = suiteMap.get(uid)
 
         // Always merge to preserve all tests in the suite
         suiteMap.set(uid, existing ? this.#mergeSuite(existing, suite) : suite)
       })
     })
 
+    console.log('[DataManager] Final suite map size:', suiteMap.size)
+
     this.suitesContextProvider.setValue(
       Array.from(suiteMap.entries()).map(([uid, suite]) => ({ [uid]: suite }))
     )
diff --git a/packages/backend/src/runner.ts b/packages/backend/src/runner.ts
@@ -14,6 +14,13 @@ const WDIO_CONFIG_FILENAMES = [
   'wdio.conf.mjs'
 ]
 
+/**
+ * Escape special regex characters in a string
+ */
+function escapeRegex(str: string): string {
+  return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+}
+
 export interface RunnerRequestBody {
   uid: string
   entryType: 'suite' | 'test'
@@ -27,6 +34,9 @@ export interface RunnerRequestBody {
   lineNumber?: number
   devtoolsHost?: string
   devtoolsPort?: number
+  featureFile?: string
+  featureLine?: number
+  suiteType?: string
 }
 
 const FRAMEWORK_FILTERS: Record<
@@ -35,23 +45,69 @@ const FRAMEWORK_FILTERS: Record<
 > = {
   cucumber: ({ specArg, payload }) => {
     const filters: string[] = []
+    console.log('[Runner] Cucumber filter - payload:', {
+      entryType: payload.entryType,
+      suiteType: payload.suiteType,
+      featureFile: payload.featureFile,
+      featureLine: payload.featureLine,
+      fullTitle: payload.fullTitle,
+      specArg
+    })
+
+    // For feature-level suites, run the entire feature file
+    if (payload.suiteType === 'feature' && specArg) {
+      // Remove any line number from specArg for feature-level execution
+      const featureFile = specArg.split(':')[0]
+      filters.push('--spec', featureFile)
+      console.log('[Runner] Feature-level execution - running entire file:', featureFile)
+      return filters
+    }
+
+    // Priority 1: Use feature file with line number for exact scenario targeting (works for examples)
+    // Note: Cucumber scenarios are type 'suite', not 'test'
+    if (payload.featureFile && payload.featureLine) {
+      filters.push('--spec', `${payload.featureFile}:${payload.featureLine}`)
+      console.log('[Runner] Using feature file:line filter:', filters)
+      return filters
+    }
+
+    // Priority 2: For specific test reruns with example row number, use exact regex match
+    if (payload.entryType === 'test' && payload.fullTitle) {
+      // Cucumber fullTitle format: "1: Scenario name" or "2: Scenario name"
+      // Extract the row number and scenario name
+      const rowMatch = payload.fullTitle.match(/^(\d+):\s*(.+)$/)
+      if (rowMatch) {
+        const [, rowNumber, scenarioName] = rowMatch
+        // Use spec file filter
+        if (specArg) {
+          filters.push('--spec', specArg)
+        }
+        // Use regex to match the exact "rowNumber: scenarioName" pattern
+        // This ensures we only run that specific example row
+        filters.push('--cucumberOpts.name', `^${rowNumber}:\\s*${escapeRegex(scenarioName.trim())}$`)
+        return filters
+      }
+      // No row number - use plain name filter
+      if (specArg) {
+        filters.push('--spec', specArg)
+      }
+      filters.push('--cucumberOpts.name', payload.fullTitle.trim())
+      return filters
+    }
+
+    // Suite-level rerun
     if (specArg) {
       filters.push('--spec', specArg)
     }
-    const scenarioName = payload.fullTitle
-      ? payload.fullTitle.replace(/^\s*\d+:\s*/, '').trim()
-      : undefined
-    if (payload.entryType === 'test' && scenarioName) {
-      filters.push('--cucumberOpts.name', scenarioName)
-    }
     return filters
   },
   mocha: ({ specArg, payload }) => {
     const filters: string[] = []
     if (specArg) {
       filters.push('--spec', specArg)
     }
-    if (payload.entryType === 'test' && payload.fullTitle) {
+    // For both tests and suites, use grep to filter
+    if (payload.fullTitle) {
       filters.push('--mochaOpts.grep', payload.fullTitle)
     }
     return filters
@@ -61,7 +117,8 @@ const FRAMEWORK_FILTERS: Record<
     if (specArg) {
       filters.push('--spec', specArg)
     }
-    if (payload.entryType === 'test' && payload.fullTitle) {
+    // For both tests and suites, use grep to filter
+    if (payload.fullTitle) {
       filters.push('--jasmineOpts.grep', payload.fullTitle)
     }
     return filters
diff --git a/packages/service/src/reporter.ts b/packages/service/src/reporter.ts
