@empiricalrun/test-gen 0.23.3 → 0.23.5

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @empiricalrun/test-gen
 
+## 0.23.5
+
+### Patch Changes
+
+- 6d954fd: feat: use custom playwright reporter
+- Updated dependencies [6d954fd]
+  - @empiricalrun/reporter@0.17.7
+
+## 0.23.4
+
+### Patch Changes
+
+- d1068e6: fix: multiple session details call and missing generation id in requests
+- Updated dependencies [d1068e6]
+  - @empiricalrun/reporter@0.17.6
+
 ## 0.23.3
 
 ### Patch Changes

package/dist/agent/browsing/run.js

@@ -19,6 +19,7 @@ async function generateTestsUsingBrowsingAgent(testFilePath) {
     const fileService = new server_1.FileService({ port });
     await fileService.startFileService();
     fileService.setFilePath(testFilePath);
+    // read playwright config from ./playwright.config.ts of source repo
     const playwrightConfig = await (0, utils_2.readPlaywrightConfig)();
     const project = await (0, utils_2.detectProjectName)(testFilePath, playwrightConfig);
     logger.log(`Detected playwright project name: ${project}`);
@@ -39,7 +40,6 @@ async function generateTestsUsingBrowsingAgent(testFilePath) {
     catch (e) {
         logger.error(e);
         await new reporter_1.TestGenUpdatesReporter().sendMessage(e);
-        process.exit(1);
     }
     await (0, web_1.removeTestOnly)(testFilePath);
 }

package/dist/uploader/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/uploader/index.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,aAAa,gBAAgB,CAAC;AAC3C,eAAO,MAAM,aAAa,kCAAkC,CAAC;AAG7D,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,UAMpE;AAED;;;;;;;;;GASG;AACH,wBAAsB,6BAA6B,CAAC,EAClD,eAAe,EACf,QAAQ,GACT,EAAE;IACD,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;CAClB,GAAG,OAAO,CAAC;IACV,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC,CAoDD;AAED,wBAAgB,mBAAmB,CAAC,eAAe,EAAE,MAAM,UAM1D;AAED,wBAAgB,2BAA2B,uBAQ1C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/uploader/index.ts"],"names":[],"mappings":"AAYA,eAAO,MAAM,aAAa,gBAAgB,CAAC;AAC3C,eAAO,MAAM,aAAa,kCAAkC,CAAC;AAG7D,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,UAUpE;AAED;;;;;;;;;GASG;AACH,wBAAsB,6BAA6B,CAAC,EAClD,eAAe,EACf,QAAQ,GACT,EAAE;IACD,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;CAClB,GAAG,OAAO,CAAC;IACV,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC,CAmED;AAED,wBAAgB,mBAAmB,CAAC,eAAe,EAAE,MAAM,UAM1D;AAED,wBAAgB,2BAA2B,uBAQ1C"}

package/dist/uploader/index.js

@@ -8,12 +8,20 @@ const reporter_1 = require("@empiricalrun/reporter");
 const path_1 = __importDefault(require("path"));
 const r2_1 = require("./r2");
 // json summary of test results
-const TEST_RESULTS_DIR = "test-results";
+// originally we used to upload test results directory for this
+// but now we have our test results (per testcase artifacts) inside playwright-report/data
+// but we also have summary.json in playwright-report/
+// we can avoid html report upload here if we don't want
+const PLAYWRIGHT_REPORT_DATA = "playwright-report/data";
 exports.UPLOAD_BUCKET = "test-report";
 exports.UPLOAD_DOMAIN = "https://reports.empirical.run"; // domain based on bucket mentioned above
 const uploadId = crypto.randomUUID();
 function getFullUploadPath(filePath, uploadDir) {
-    const relativeFilePath = filePath.replace(path_1.default.join(process.cwd(), TEST_RESULTS_DIR), "");
+    // remove the source dir from the file path - only keep the relative path
+    // old path for data: ~/source-repo/test-results/testName/
+    // new path for data: ~/source-repo/playwright-report/data/testName
+    const relativeFilePath = filePath.replace(path_1.default.join(process.cwd(), PLAYWRIGHT_REPORT_DATA), "");
+    // new relativeFilePath will look like
     return `${exports.UPLOAD_DOMAIN}/${uploadDir}${relativeFilePath}`;
 }
 exports.getFullUploadPath = getFullUploadPath;
@@ -29,14 +37,27 @@ exports.getFullUploadPath = getFullUploadPath;
  */
 async function uploadTestResultsUsingPrjRepo({ projectRepoName, testName, }) {
     // project repo name is the github repo name
+    // test-generation/<project-name>/<random-uuid>
     const uploadDir = getUploadPathForRun(projectRepoName);
+    // upload test assets
     const files = await (0, r2_1.uploadDirectory)({
-        sourceDir: path_1.default.join(process.cwd(), TEST_RESULTS_DIR),
+        // ~/source-repo/playwright-report -> has index.html, data, trace(they are assets for index.html, not sure why they are called trace), and summary.json
+        sourceDir: path_1.default.join(process.cwd(), PLAYWRIGHT_REPORT_DATA), // upload data dir
+        destinationDir: uploadDir,
+        uploadBucket: exports.UPLOAD_BUCKET,
+    });
+    // upload summary.json
+    await (0, r2_1.uploadDirectory)({
+        // ~/source-repo/playwright-report -> has index.html, data, trace(they are assets for index.html, not sure why they are called trace), and summary.json
+        sourceDir: path_1.default.join(process.cwd(), "playwright-report"), // upload data dir
+        fileList: [path_1.default.join(process.cwd(), "playwright-report", "summary.json")],
         destinationDir: uploadDir,
         uploadBucket: exports.UPLOAD_BUCKET,
     });
     const fileNames = Object.keys(files); // fileNames are absolute paths of the input files
-    const defaultLocation = path_1.default.join(process.cwd(), "test-results", "summary.json");
+    // old default location: ..../source-repo/test-results/summary.json
+    // new default location: ..../source-repo/playwright-report/summary.json
+    const defaultLocation = path_1.default.join(process.cwd(), "playwright-report", "summary.json");
     const results = (0, reporter_1.parseJsonReport)(defaultLocation);
     const flatTestsList = (0, reporter_1.getFlattenedTestList)(results.suites);
     const testAttachmentPaths = [];
@@ -61,7 +82,9 @@ async function uploadTestResultsUsingPrjRepo({ projectRepoName, testName, }) {
     const traceFiles = fileNames.filter((fileName) => fileName.endsWith(".zip") && testAttachmentPaths.includes(fileName));
     return {
         videoUrls: videoFiles.map((fileName) => getFullUploadPath(fileName, uploadDir)),
-        summaryUrl: getFullUploadPath("/test-results/summary.json", uploadDir),
+        // uploaded separately
+        summaryUrl: `${exports.UPLOAD_DOMAIN}/${uploadDir}/summary.json`,
+        // summaryUrl: getFullUploadPath("/test-results/summary.json", uploadDir),
         traceFiles: traceFiles.map((fileName) => getFullUploadPath(fileName, uploadDir)),
     };
 }

package/dist/uploader/r2.d.ts

@@ -1,8 +1,9 @@
 interface FileMap {
     [file: string]: string;
 }
-export declare function uploadDirectory({ sourceDir, destinationDir, uploadBucket, }: {
+export declare function uploadDirectory({ sourceDir, fileList, destinationDir, uploadBucket, }: {
     sourceDir: string;
+    fileList?: string[];
     destinationDir: string;
     uploadBucket: string;
 }): Promise<FileMap>;

package/dist/uploader/r2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"r2.d.ts","sourceRoot":"","sources":["../../src/uploader/r2.ts"],"names":[],"mappings":"AAqBA,UAAU,OAAO;IACf,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;CACxB;AAsGD,wBAAsB,eAAe,CAAC,EACpC,SAAS,EACT,cAAc,EACd,YAAY,GACb,EAAE;IACD,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;CACtB,GAAG,OAAO,CAAC,OAAO,CAAC,CAWnB"}
+{"version":3,"file":"r2.d.ts","sourceRoot":"","sources":["../../src/uploader/r2.ts"],"names":[],"mappings":"AAsBA,UAAU,OAAO;IACf,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;CACxB;AA2GD,wBAAsB,eAAe,CAAC,EACpC,SAAS,EACT,QAAQ,EACR,cAAc,EACd,YAAY,GACb,EAAE;IACD,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;CACtB,GAAG,OAAO,CAAC,OAAO,CAAC,CAYnB"}

package/dist/uploader/r2.js

@@ -60,7 +60,14 @@ const run = async (config) => {
             secretAccessKey: config.secretAccessKey,
         },
     });
-    const files = getFileList(config.sourceDir);
+    let files;
+    if (config.fileList) {
+        console.log("uploading single file: ", config.fileList[0]);
+        files = config.fileList;
+    }
+    else {
+        files = getFileList(config.sourceDir);
+    }
     await Promise.all(files.map(async (file) => {
         console.log(file);
         const fileStream = fs.readFileSync(file);
@@ -115,7 +122,7 @@ const run = async (config) => {
     }));
     return urls;
 };
-async function uploadDirectory({ sourceDir, destinationDir, uploadBucket, }) {
+async function uploadDirectory({ sourceDir, fileList, destinationDir, uploadBucket, }) {
     let config = {
         accountId: process.env.R2_ACCOUNT_ID,
         accessKeyId: process.env.R2_ACCESS_KEY_ID,
@@ -123,6 +130,7 @@ async function uploadDirectory({ sourceDir, destinationDir, uploadBucket, }) {
         bucket: uploadBucket,
         sourceDir,
         destinationDir,
+        fileList,
     };
     const uploadedFiles = await run(config);
     return uploadedFiles;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@empiricalrun/test-gen",
-  "version": "0.23.3",
+  "version": "0.23.5",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
@@ -42,7 +42,7 @@
     "tsx": "^4.16.2",
     "typescript": "^5.3.3",
     "@empiricalrun/llm": "^0.7.3",
-    "@empiricalrun/reporter": "^0.17.5"
+    "@empiricalrun/reporter": "^0.17.7"
   },
   "devDependencies": {
     "@types/detect-port": "^1.3.5",