ykq-playwright-ci 0.1.2 → 0.1.3

package/README.md

@@ -271,6 +271,7 @@ npm run typecheck
 | `PW-TEST-002` | 未登录访问 `/home` 是否跳回登录页 |
 | `PW-TEST-003` | `/serviceAgreement` 是否允许未登录访问 |
 | `PW-TEST-004` | 登录表单基础校验 |
+| `PW-TEST-005` | 使用测试账号登录成功 |
 
 ## 安全注意
 

package/cases/doctor-pc/test-env/doctor-master-basic.spec.ts

@@ -1,11 +1,25 @@
+/* global process */
+
 import { test, expect } from '../../../src/fixtures/base.fixture';
 import { annotateCase } from '../../../src/utils/evidence';
 import { appEnv, doctorURL, hasDoctorBaseURL } from '../../../src/utils/env';
 
+const doctorUsername = process.env.DOCTOR_USERNAME?.trim() || '';
+const doctorLoginCode = (
+  process.env.DOCTOR_LOGIN_CODE ||
+  process.env.DOCTOR_OTP ||
+  process.env.DOCTOR_PASSWORD ||
+  ''
+).trim();
+
 async function gotoDoctor(path: string, page: import('@playwright/test').Page): Promise<void> {
   await page.goto(doctorURL(path), { waitUntil: 'domcontentloaded' });
 }
 
+function hasDoctorLoginCredentials(): boolean {
+  return Boolean(doctorUsername && doctorLoginCode);
+}
+
 test.describe('doctor-master test environment basics', () => {
   test.beforeEach(async () => {
     test.skip(!hasDoctorBaseURL(), 'DOCTOR_BASE_URL is required for doctor-master test environment tests.');
@@ -86,4 +100,40 @@ test.describe('doctor-master test environment basics', () => {
     await page.locator('.submit-btn', { hasText: '登录' }).click();
     await expect(page.getByText('请阅读并勾选《荷叶健康用户服务协议》')).toBeVisible();
   });
+
+  test('PW-TEST-005 @smoke doctor can login with configured test account', async ({
+    page
+  }, testInfo) => {
+    test.skip(
+      !hasDoctorLoginCredentials(),
+      'DOCTOR_USERNAME and DOCTOR_LOGIN_CODE/DOCTOR_OTP/DOCTOR_PASSWORD are required.'
+    );
+    annotateCase(testInfo, {
+      caseId: 'PW-TEST-005',
+      evidenceId: 'TEST-doctor-login-success',
+      priority: 'Smoke'
+    });
+
+    await gotoDoctor(appEnv.doctorLoginPath, page);
+
+    const loginResponsePromise = page.waitForResponse(
+      (response) =>
+        response.url().includes('/physician/account/loginPhysician') &&
+        response.request().method() === 'POST'
+    );
+
+    await page.getByPlaceholder('手机号').fill(doctorUsername);
+    await page.getByPlaceholder('图形验证码').fill('playwright');
+    await page.getByPlaceholder('验证码', { exact: true }).fill(doctorLoginCode);
+    await page.locator('.el-checkbox', { hasText: '我已阅读并同意' }).click();
+    await expect(page.locator('.submit-btn', { hasText: '登录' })).not.toHaveClass(/gruyBtn/);
+    await page.locator('.submit-btn', { hasText: '登录' }).click();
+
+    const loginResponse = await loginResponsePromise;
+    const loginBody = await loginResponse.json();
+    expect(loginResponse.ok()).toBeTruthy();
+    expect(loginBody?.data?.accountId, loginBody?.msg || '登录接口未返回 accountId').toBeTruthy();
+
+    await expect(page).toHaveURL(/\/physician-admin\/home(?:\?|#|$)/, { timeout: 15_000 });
+  });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ykq-playwright-ci",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Company-level Playwright E2E test project for doctor PC workflows.",
   "bin": {
     "playwright-ci": "bin/playwright-ci.mjs"

package/scripts/run-project.mjs

@@ -2,24 +2,41 @@
 
 import { spawn, spawnSync } from 'node:child_process';
 import fs from 'node:fs';
-import { createRequire } from 'node:module';
 import os from 'node:os';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 
 const rootDir = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');
-const require = createRequire(import.meta.url);
 const configPath = process.env.PROJECTS_CONFIG_PATH
   ? path.resolve(process.env.PROJECTS_CONFIG_PATH)
   : path.join(rootDir, 'projects.config.json');
 const workspaceDir = process.env.PROJECTS_CONFIG_PATH ? path.dirname(configPath) : rootDir;
 const playwrightConfigPath = path.join(rootDir, 'playwright.config.mjs');
-const playwrightCliPath = path.join(path.dirname(require.resolve('@playwright/test/package.json')), 'cli.js');
+const packageNodeModulesDir = resolveNodeModulesDir(rootDir);
+const playwrightCliPath = path.join(packageNodeModulesDir, '@playwright', 'test', 'cli.js');
 const knownModeArgs = new Set(['--headed', '--debug', '--ui']);
 const resultsDir = process.env.PLAYWRIGHT_CI_RESULTS_DIR || path.join(workspaceDir, 'test-results');
 const reportDir = process.env.PLAYWRIGHT_CI_REPORT_DIR || path.join(workspaceDir, 'playwright-report');
 let gitAskpassPath = '';
 
+function resolveNodeModulesDir(startDir) {
+  let currentDir = startDir;
+
+  while (true) {
+    const nodeModulesDir = path.join(currentDir, 'node_modules');
+    const playwrightCli = path.join(nodeModulesDir, '@playwright', 'test', 'cli.js');
+    if (fs.existsSync(playwrightCli)) {
+      return nodeModulesDir;
+    }
+
+    const parentDir = path.dirname(currentDir);
+    if (parentDir === currentDir) {
+      throw new Error(`Cannot find @playwright/test from ${startDir}`);
+    }
+    currentDir = parentDir;
+  }
+}
+
 function readConfig() {
   return JSON.parse(fs.readFileSync(configPath, 'utf8'));
 }
@@ -203,6 +220,19 @@ function buildPlaywrightArgs(caseDir, project, passthroughArgs) {
   return args;
 }
 
+function createPlaywrightEnv(projectEnv) {
+  const nodePath = [packageNodeModulesDir, process.env.NODE_PATH].filter(Boolean).join(path.delimiter);
+
+  return {
+    ...projectEnv,
+    ...process.env,
+    NODE_PATH: nodePath,
+    PLAYWRIGHT_CI_RESULTS_DIR: resultsDir,
+    PLAYWRIGHT_CI_REPORT_DIR: reportDir,
+    PLAYWRIGHT_CI_TEST_DIR: workspaceDir
+  };
+}
+
 function formatDuration(durationMs = 0) {
   if (durationMs < 1000) {
     return `${Math.round(durationMs)}ms`;
@@ -333,13 +363,7 @@ function main() {
     [playwrightCliPath, ...buildPlaywrightArgs(caseDir, project, passthroughArgs)],
     {
       cwd: workspaceDir,
-      env: {
-        ...(project.env || {}),
-        ...process.env,
-        PLAYWRIGHT_CI_RESULTS_DIR: resultsDir,
-        PLAYWRIGHT_CI_REPORT_DIR: reportDir,
-        PLAYWRIGHT_CI_TEST_DIR: workspaceDir
-      },
+      env: createPlaywrightEnv(project.env || {}),
       stdio: 'inherit'
     }
   );