fix(regression-test): finish cross-platform stabilization

Signed-off-by: kangfenmao <kangfenmao@qq.com>

Author: kangfenmao

scripts/cherry-regression-test/system-automation.ts

@@ -101,43 +101,18 @@ export function openExternalText(platform: Platform, paths: RunPaths, candidateP
   } else {
     const script = [
       `Start-Process notepad.exe -ArgumentList '${escapePowerShell(filePath)}'`,
-      'Add-Type -AssemblyName UIAutomationClient',
-      'Add-Type -AssemblyName UIAutomationTypes',
-      `$expected = (Get-Content -Raw -LiteralPath '${escapePowerShell(filePath)}').Trim()`,
-      '$root = [System.Windows.Automation.AutomationElement]::RootElement',
-      '$documentCondition = [System.Windows.Automation.PropertyCondition]::new([System.Windows.Automation.AutomationElement]::ControlTypeProperty, [System.Windows.Automation.ControlType]::Document)',
-      '$editCondition = [System.Windows.Automation.PropertyCondition]::new([System.Windows.Automation.AutomationElement]::ControlTypeProperty, [System.Windows.Automation.ControlType]::Edit)',
+      `$filename = '${escapePowerShell(basename(filePath))}'`,
       '$deadline = [DateTime]::UtcNow.AddSeconds(10)',
-      '$document = $null',
-      '$range = $null',
+      '$notepad = $null',
       'do {',
-      '  $documents = @($root.FindAll([System.Windows.Automation.TreeScope]::Descendants, $documentCondition))',
-      '  $edits = @($root.FindAll([System.Windows.Automation.TreeScope]::Descendants, $editCondition))',
-      '  foreach ($candidate in (@($documents) + @($edits))) {',
-      '    $candidateRange = $null',
-      '    $candidateText = $null',
-      '    try {',
-      '      $candidateRange = $candidate.GetCurrentPattern([System.Windows.Automation.TextPattern]::Pattern).DocumentRange',
-      '      $candidateText = $candidateRange.GetText(-1)',
-      '    } catch {',
-      '      try {',
-      '        $candidateValue = $candidate.GetCurrentPattern([System.Windows.Automation.ValuePattern]::Pattern)',
-      '        $candidateText = $candidateValue.Current.Value',
-      '      } catch {}',
-      '    }',
-      '    if ($candidateText -and $candidateText.Trim().Contains($expected)) {',
-      '      $document = $candidate',
-      '      $range = $candidateRange',
-      '      break',
-      '    }',
-      '  }',
-      '  if (-not $document) { Start-Sleep -Milliseconds 200 }',
-      '} while (-not $document -and [DateTime]::UtcNow -lt $deadline)',
-      'if (-not $document) { throw "Notepad document was not found" }',
+      '  $notepad = Get-Process -Name notepad -ErrorAction SilentlyContinue | Where-Object { $_.MainWindowTitle.Contains($filename) } | Sort-Object StartTime -Descending | Select-Object -First 1',
+      '  if (-not $notepad) { Start-Sleep -Milliseconds 200 }',
+      '} while (-not $notepad -and [DateTime]::UtcNow -lt $deadline)',
+      'if (-not $notepad) { throw "Notepad window was not found" }',
       '$shell = New-Object -ComObject WScript.Shell',
-      'if (-not $shell.AppActivate($document.Current.ProcessId)) { throw "Notepad window could not be activated" }',
-      '$document.SetFocus()',
-      'if ($range) { $range.Select() } else { $shell.SendKeys("^a") }',
+      'if (-not $shell.AppActivate($notepad.Id)) { throw "Notepad window could not be activated" }',
+      'Start-Sleep -Milliseconds 300',
+      '$shell.SendKeys("^a")',
       'Start-Sleep -Milliseconds 500'
     ].join('\n')
     execFileSync('powershell.exe', ['-NoProfile', '-NonInteractive', '-Command', script], {
@@ -205,7 +180,8 @@ export function chooseNativeFile(platform: Platform, paths: RunPaths, candidateP
             '$acceptCondition = [System.Windows.Automation.PropertyCondition]::new([System.Windows.Automation.AutomationElement]::AutomationIdProperty, "1")',
             '$acceptButton = $dialog.FindFirst([System.Windows.Automation.TreeScope]::Descendants, $acceptCondition)',
             'if (-not $acceptButton) { throw "Native folder accept button was not found" }',
-            '$acceptButton.GetCurrentPattern([System.Windows.Automation.InvokePattern]::Pattern).Invoke()',
+            '$acceptButton.SetFocus()',
+            '[System.Windows.Forms.SendKeys]::SendWait("{ENTER}")',
             'Start-Sleep -Milliseconds 500'
           ]
         : [

tests/e2e/cherry-regression/05-desktop-assistants.test.ts

@@ -52,7 +52,7 @@ async function invokeQuickAssistant(
   await input.fill(markerPrompt)
   await input.press('Enter')
   await expect(quick.getByText('QUICK_ASSISTANT_PASS', { exact: true }).last()).toBeVisible({ timeout: 2 * 60_000 })
-  await quick.keyboard.press('Escape')
+  await quick.getByRole('button', { name: 'ESC to return', exact: true }).click()
   await expect(quick.getByText('Answer this question', { exact: true })).toBeVisible()
 }
 
@@ -104,8 +104,21 @@ test('[C-03] 使用划词助手处理跨应用选中文本 @selection-assistant'
   const readLabel = selection.getByRole('button', { name: 'Read validation label', exact: true })
   await expect(readLabel).toBeVisible()
   openExternalText(app.record.platform, app.paths, join(app.paths.fixtures, 'selection.txt'))
-  sendSystemHotkey(app.record.platform, [app.record.platform === 'macos' ? 'Meta' : 'Control', 'Alt', 'Shift', 'k'])
-  await expect.poll(() => selection.evaluate(() => document.visibilityState)).toBe('visible')
+  await expect
+    .poll(
+      async () => {
+        sendSystemHotkey(app.record.platform, [
+          app.record.platform === 'macos' ? 'Meta' : 'Control',
+          'Alt',
+          'Shift',
+          'k'
+        ])
+        await selection.waitForTimeout(1_000)
+        return selection.evaluate(() => document.visibilityState)
+      },
+      { timeout: 15_000 }
+    )
+    .toBe('visible')
   await readLabel.click()
   const action = await app.window('/windows/selection/action/')
   await expect(action.locator('body')).toContainText('SELECTION_ASSISTANT_PASS', { timeout: 2 * 60_000 })

tests/e2e/cherry-regression/09-cherryin-and-images.test.ts

@@ -40,8 +40,13 @@ async function generateAndSaveImage(
   }
   await page.locator('[contenteditable="true"]').fill(IMAGE_PROMPT)
   await page.getByRole('button', { name: 'Send', exact: true }).click()
+  const generation = page.getByRole('status', {
+    name: /Drawing in progress\. Please do not leave this page\.|Revealing generated image/
+  })
   const image = page.getByTestId('artboard-image-transform').last()
-  await expect(image).toBeVisible({ timeout: 3 * 60_000 })
+  await expect(generation).toBeVisible()
+  await expect(generation).toBeHidden({ timeout: 3 * 60_000 })
+  await expect(image).toBeVisible()
 
   await image.click({ button: 'right' })
   await page.getByText('Save As', { exact: true }).click()

tests/e2e/cherry-regression/models.ts

@@ -12,7 +12,9 @@ export async function selectVisibleModel(page: Page, model: string): Promise<voi
   const modelName = model.split('/').at(-1) ?? model
   const search = selector.getByTestId('model-selector-search')
   await search.fill(modelName)
-  const option = selector.locator(`[role="option"][data-testid$="::${model}"]`).first()
+  const option = selector
+    .locator(`[role="option"][data-testid$="::${model}"], [role="option"][data-testid$="::${modelName}"]`)
+    .first()
   await expect(option).toBeVisible()
   await option.click()
 }