fix：增加解析运行日志附件， (#19)

* chore(deps): 更新 Playwright 版本至 0.2.5
修改执行命令并解析用例生成的 JSON 文件逻辑
优化创建临时目录并移动到指定目录下

* chore: 优化创建临时目录并移动 JSON 文件

* chore(utils): 优化parseJsonFile函数，将解析后的JSON文件移动到指定目录

* chore(code): 移除executor.ts中未使用的process模块导入

* refactor(utils): 优化generateCommands函数，添加json文件名参数并修改生成命令逻辑

* test(utils): 添加json文件名参数并修改generateCommands函数的测试用例

* 直接生成到附件目录内

* format

Author: ambzhang

playwright/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testsolar-oss-playwright",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "TestSolar support for playwright tool",
   "main": "main.js",
   "scripts": {

playwright/src/playwrightx/executor.ts

@@ -1,6 +1,5 @@
-
-import * as process from "process";
 import * as fs from "fs";
+import * as path from "path";
 
 import Reporter from "testsolar-oss-sdk/src/testsolar_sdk/reporter";
 import log from 'testsolar-oss-sdk/src/testsolar_sdk/logger';
@@ -24,20 +23,25 @@ export async function runTestCase(runParamFile: string): Promise<void> {
     // 按照文件对用例进行分组
     const caseLists = groupTestCasesByPath(testSelectors);
 
+    // 创建附件目录
+    const attachmentsPath = path.join(projPath, "attachments");
+    if (!fs.existsSync(attachmentsPath)) {
+      fs.mkdirSync(attachmentsPath, { recursive: true });
+    }
+
     // 对每个文件生成命令行
-    for (const [path, testcases] of Object.entries(caseLists)) {
-        const { command, testIdentifiers } = generateCommands(path, testcases);
-        // 执行命令，解析用例生成的 JSON 文件，上报结果
-    
-        const jsonName = path.replace(/\//g, "_") + ".json";
-        process.env.PLAYWRIGHT_JSON_OUTPUT_NAME = jsonName;
-    
+    for (const [casePath, testcases] of Object.entries(caseLists)) {
+        // 执行命令并解析用例生成的 JSON 文件
+        const jsonName = casePath.replace(/\//g, "_") + ".json";
+        const caseJsonFile = path.join(attachmentsPath, jsonName);
+        const { command, testIdentifiers } = generateCommands(casePath, testcases, caseJsonFile);
         const testResults = await executeCommands(
             projPath,
             command,
             testIdentifiers,
+            jsonName,  // 将jsonName传递给executeCommands函数
         );
-        // log.info("Parse json results:\n", testResults);
+        
         const results = createTestResults(testResults);
         const reporter = new Reporter(taskId, data.FileReportPath);
         for (const result of results) {

playwright/src/playwrightx/parser.ts

@@ -2,7 +2,6 @@ import * as process from "process";
 import * as fs from "fs";
 import * as path from "path";
 import {
-  createTempDirectory,
   executeCommand,
   parseTestcase,
   filterTestcases,
@@ -31,12 +30,15 @@ export async function collectTestCases(
     process.chdir(projPath);
     log.info(`Current directory: ${process.cwd()}`);
 
+    const newDirPath = path.join(projPath, "attachments");
+    if (!fs.existsSync(newDirPath)) {
+      fs.mkdirSync(newDirPath, { recursive: true });
+    }
+    const filePath = path.join(newDirPath, "load.json");
 
-    const tempDirectory = createTempDirectory();
-    const filePath = path.join(tempDirectory, "testSolarOutput.json");
 
     // 执行命令获取output.json文件内容
-    const command = `npx playwright test --list --reporter=json | tee ${filePath}`;
+    const command = `npx playwright test --list --reporter=json > ${filePath}`;
     log.info("Run Command: ", command);
     const { stdout, stderr } = await executeCommand(command);
     log.info("stdout:", stdout);

playwright/src/playwrightx/utils.ts

@@ -269,8 +269,9 @@ export const parseTestcase = (
 
 /// 生成运行测试用例的命令
 export function generateCommands(
-  path: string,
+  casePath: string,
   testCases: string[],
+  jsonName: string,
 ): { command: string; testIdentifiers: string[] } {
   const testIdentifiers: string[] = [];
 
@@ -279,7 +280,7 @@ export function generateCommands(
 
   // 检查 testCases 是否为空
   if (testCases.length === 0) {
-    const defaultCommand = `npx playwright test --reporter=json ${extraArgs}`;
+    const defaultCommand = `npx playwright test --reporter=json ${extraArgs} > ${jsonName}`;
     log.info(`Generated default command for test cases: ${defaultCommand}`);
     return { command: defaultCommand, testIdentifiers: [] };
   }
@@ -288,10 +289,10 @@ export function generateCommands(
   if (grepPattern) {
     grepPattern = `--grep="${grepPattern}"`;
   }
-  const command = `npx playwright test ${path} ${grepPattern} --reporter=json ${extraArgs}`;
+  const command = `npx playwright test ${casePath} ${grepPattern} --reporter=json ${extraArgs} > ${jsonName}`;
 
   for (const testcase of testCases) {
-    testIdentifiers.push(`${path}?${testcase}`);
+    testIdentifiers.push(`${casePath}?${testcase}`);
   }
 
   log.info(`Generated command for test cases: ${command}`);
@@ -416,9 +417,6 @@ export function parseJsonFile(
     `function parseJsonFile: ${process.env.PLAYWRIGHT_JSON_OUTPUT_NAME}`,
   );
   const data = JSON.parse(fs.readFileSync(jsonFile, "utf-8"));
-  log.info("--------json data:---------");
-  log.info(JSON.stringify(data, null, 2));
-  log.info("---------------------------");
   const result = parseJsonContent(projPath, data);
 
   log.info(`Parse result from json: ${JSON.stringify(result, null, 2)}`);
@@ -453,6 +451,7 @@ export async function executeCommands(
   projPath: string,
   command: string,
   cases: string[],
+  jsonFile: string,  // 接收jsonFile作为参数
 ): Promise<Record<string, SpecResult[]>> {
   const results: Record<string, SpecResult[]> = {};
 
@@ -461,7 +460,6 @@ export async function executeCommands(
     `Run cmdline: ${command} \n Run stdout: ${stdout}\nRun stderr: ${stderr}`,
   );
   // 解析 JSON 文件并处理结果
-  const jsonFile = process.env.PLAYWRIGHT_JSON_OUTPUT_NAME || "result.json";
   const testResults = parseJsonFile(projPath, jsonFile, cases);
   Object.assign(results, testResults);
   return testResults;

playwright/tests/utils.test.ts

@@ -186,14 +186,14 @@ describe("generateCommands", () => {
   test("should generate test execution commands", () => {
     const path = "path/to/tests";
     const testCases = ["test1", "test2"];
-    const { command } = generateCommands(path, testCases);
+    const { command } = generateCommands(path, testCases, "1.json");
     expect(command).toContain("npx playwright test");
   });
 
   test("should generate zero test execution commands", () => {
     const path = "path/to/tests";
     const testCases: string[] = [];
-    const { command } = generateCommands(path, testCases);
+    const { command } = generateCommands(path, testCases, "1.json");
     expect(command).toContain("npx playwright test");
   });
 });