@empiricalrun/playwright-utils 0.7.1 → 0.7.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @empiricalrun/playwright-utils
 
+## 0.7.3
+
+### Patch Changes
+
+- b7daaf4: fix: add r2 error logs
+
+## 0.7.2
+
+### Patch Changes
+
+- b137ffc: fix: don't use GITHUB_RUN_ID for playwright test run action id
+
 ## 0.7.1
 
 ### Patch Changes

package/dist/reporter/custom.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"custom.d.ts","sourceRoot":"","sources":["../../src/reporter/custom.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,OAAO,KAAK,EACV,UAAU,EACV,UAAU,EAEV,KAAK,EACL,QAAQ,IAAI,cAAc,EAC1B,SAAS,EACT,UAAU,IAAI,gBAAgB,EAE/B,MAAM,2BAA2B,CAAC;AAGnC,OAAO,EAML,UAAU,EAMX,MAAM,2BAA2B,CAAC;AAgBnC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAwC/C,QAAA,MAAM,iBAAiB,UAAoC,CAAC;AAC5D,KAAK,oBAAoB,GAAG,CAAC,OAAO,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC;AAM/D,KAAK,mBAAmB,GAAG;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,CAAC,EAAE,oBAAoB,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF,cAAM,YAAa,YAAW,UAAU;IACtC,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,QAAQ,CAAsB;IACtC,OAAO,CAAC,aAAa,CAAU;IAC/B,OAAO,CAAC,mBAAmB,CAAU;IACrC,OAAO,CAAC,KAAK,CAAqB;IAClC,OAAO,CAAC,KAAK,CAAqB;IAClC,OAAO,CAAC,KAAK,CAAqB;IAClC,OAAO,CAAC,YAAY,CAEN;IACd,OAAO,CAAC,eAAe,CAAmB;gBAE9B,OAAO,EAAE,mBAAmB;IAIxC,aAAa;IAIb,QAAQ;IAER,QAAQ;IAER,WAAW;IAEX,SAAS;IAET,OAAO,IAAI,IAAI;IAIf,WAAW;IAEX,SAAS,CAAC,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,gBAAgB;IAiCxD,WAAW,CAAC,MAAM,EAAE,UAAU;IAI9B,OAAO,CAAC,KAAK,EAAE,KAAK;IAYpB,eAAe,IAAI;QACjB,YAAY,EAAE,MAAM,CAAC;QACrB,IAAI,EAAE,oBAAoB,CAAC;QAC3B,kBAAkB,EAAE,MAAM,CAAC;QAC3B,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;QACzB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;KAC1B;IAkCD,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO;IASxD,OAAO,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAIzB,KAAK,CAAC,MAAM,EAAE,UAAU;IA0ExB,MAAM;CA8Bb;AAkCD,wBAAsB,cAAc,CAClC,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,IAAI,GAAE,MAAoB,EAC1B,IAAI,CAAC,EAAE,MAAM,EACb,MAAM,CAAC,EAAE,MAAM,iBAqBhB;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAsBhE;AAqiBD,eAAe,YAAY,CAAC"}
+{"version":3,"file":"custom.d.ts","sourceRoot":"","sources":["../../src/reporter/custom.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,OAAO,KAAK,EACV,UAAU,EACV,UAAU,EAEV,KAAK,EACL,QAAQ,IAAI,cAAc,EAC1B,SAAS,EACT,UAAU,IAAI,gBAAgB,EAE/B,MAAM,2BAA2B,CAAC;AAGnC,OAAO,EAML,UAAU,EAMX,MAAM,2BAA2B,CAAC;AAgBnC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAwC/C,QAAA,MAAM,iBAAiB,UAAoC,CAAC;AAC5D,KAAK,oBAAoB,GAAG,CAAC,OAAO,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC;AAM/D,KAAK,mBAAmB,GAAG;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,CAAC,EAAE,oBAAoB,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF,cAAM,YAAa,YAAW,UAAU;IACtC,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,QAAQ,CAAsB;IACtC,OAAO,CAAC,aAAa,CAAU;IAC/B,OAAO,CAAC,mBAAmB,CAAU;IACrC,OAAO,CAAC,KAAK,CAAqB;IAClC,OAAO,CAAC,KAAK,CAAqB;IAClC,OAAO,CAAC,KAAK,CAAqB;IAClC,OAAO,CAAC,YAAY,CAEN;IACd,OAAO,CAAC,eAAe,CAAmB;gBAE9B,OAAO,EAAE,mBAAmB;IAIxC,aAAa;IAIb,QAAQ;IAER,QAAQ;IAER,WAAW;IAEX,SAAS;IAET,OAAO,IAAI,IAAI;IAIf,WAAW;IAEX,SAAS,CAAC,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,gBAAgB;IA2BxD,WAAW,CAAC,MAAM,EAAE,UAAU;IAI9B,OAAO,CAAC,KAAK,EAAE,KAAK;IAYpB,eAAe,IAAI;QACjB,YAAY,EAAE,MAAM,CAAC;QACrB,IAAI,EAAE,oBAAoB,CAAC;QAC3B,kBAAkB,EAAE,MAAM,CAAC;QAC3B,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;QACzB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;KAC1B;IAkCD,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO;IASxD,OAAO,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAIzB,KAAK,CAAC,MAAM,EAAE,UAAU;IA+ExB,MAAM;CA8Bb;AAkCD,wBAAsB,cAAc,CAClC,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,IAAI,GAAE,MAAoB,EAC1B,IAAI,CAAC,EAAE,MAAM,EACb,MAAM,CAAC,EAAE,MAAM,iBAqBhB;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAsBhE;AAqiBD,eAAe,YAAY,CAAC"}

package/dist/reporter/custom.js

@@ -62,25 +62,21 @@ class HtmlReporter {
     onTestBegin() { }
     onTestEnd(test, result) {
         // upload folder to R2
-        console.log(`Finished test ${test.title}: ${result.status}`); // comment this out before merging - we have list reporter to report on ci
-        // console.log("result.attachments", result.attachments);
         // iterate over attachments
         result.attachments.forEach(async (attachment) => {
             if (!attachment.path)
                 return;
             const folder = path_1.default.relative(this._outputFolder + "/data", attachment.path);
             const folderName = folder.split("/")[0];
-            console.log("uploading to R2: ", folderName);
-            // on test gen run, we don't have PROJECT_NAME or GITHUB_RUN_ID so we skip uploading since we anyways handle uploads for that, this is a stopgap
-            if (!process.env.PROJECT_NAME || !"10633546877") {
-                console.log("Skipping upload of trace directory since PROJECT_NAME or GITHUB_RUN_ID is not set");
+            // on test gen run, we don't have PROJECT_NAME or TEST_RUN_GITHUB_ACTION_ID so we skip uploading since we anyways handle uploads for that, this is a stopgap
+            if (!process.env.PROJECT_NAME || !process.env.TEST_RUN_GITHUB_ACTION_ID) {
                 return;
             }
             await (0, upload_1.uploadDirectory)({
                 sourceDir: this._outputFolder + "/data/" + folderName,
                 destinationDir: process.env.PROJECT_NAME +
                     "/" +
-                    "10633546877" +
+                    process.env.TEST_RUN_GITHUB_ACTION_ID +
                     "/data/" +
                     folderName,
                 uploadBucket: "test-report",
@@ -141,8 +137,8 @@ class HtmlReporter {
         const builder = new HtmlBuilder(this.config, this._outputFolder, this._attachmentsBaseURL);
         this._buildResult = await builder.build(this.config.metadata, projectSuites, result, this._topLevelErrors);
         // upload trace directory
-        if (!process.env.PROJECT_NAME || !"10633546877") {
-            console.log("Skipping upload of trace directory since PROJECT_NAME or GITHUB_RUN_ID is not set");
+        if (!process.env.PROJECT_NAME || !process.env.TEST_RUN_GITHUB_ACTION_ID) {
+            // Skipping upload of trace directory since PROJECT_NAME or TEST_RUN_GITHUB_ACTION_ID is not set,
             return;
         }
         const startTime = new Date().getTime();
@@ -154,7 +150,10 @@ class HtmlReporter {
         await Promise.allSettled([
             (0, upload_1.uploadDirectory)({
                 sourceDir: this._outputFolder + "/trace",
-                destinationDir: process.env.PROJECT_NAME + "/" + "10633546877" + "/trace",
+                destinationDir: process.env.PROJECT_NAME +
+                    "/" +
+                    process.env.TEST_RUN_GITHUB_ACTION_ID +
+                    "/trace",
                 uploadBucket: "test-report",
             }),
             // upload summary.json
@@ -164,14 +163,18 @@ class HtmlReporter {
                     path_1.default.join(this._outputFolder, "summary.json"),
                     // path.join(this._outputFolder, "data", ".last-run.json"),
                 ],
-                destinationDir: process.env.PROJECT_NAME + "/" + "10633546877",
+                destinationDir: process.env.PROJECT_NAME +
+                    "/" +
+                    process.env.TEST_RUN_GITHUB_ACTION_ID,
                 uploadBucket: "test-report",
             }),
             // upload index.html
             (0, upload_1.uploadDirectory)({
                 sourceDir: this._outputFolder,
                 fileList: [path_1.default.join(this._outputFolder, "index.html")],
-                destinationDir: process.env.PROJECT_NAME + "/" + "10633546877",
+                destinationDir: process.env.PROJECT_NAME +
+                    "/" +
+                    process.env.TEST_RUN_GITHUB_ACTION_ID,
                 uploadBucket: "test-report",
             }),
         ]);

package/dist/reporter/upload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"upload.d.ts","sourceRoot":"","sources":["../../src/reporter/upload.ts"],"names":[],"mappings":"AAsBA,UAAU,OAAO;IACf,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;CACxB;AA8GD,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"}
+{"version":3,"file":"upload.d.ts","sourceRoot":"","sources":["../../src/reporter/upload.ts"],"names":[],"mappings":"AAsBA,UAAU,OAAO;IACf,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;CACxB;AA+GD,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/reporter/upload.js

@@ -106,7 +106,7 @@ const run = async (config) => {
         });
         try {
             const data = await S3.send(cmd);
-            console.log(`R2 Success - for sourceDir: ${config.sourceDir} destinationDir: ${config.destinationDir} bucket: ${config.bucket} ${config.fileList ? config.fileList : ""}`);
+            // console.log(`R2 Success - ${file}`);
             map.set(file, data);
             const fileUrl = await (0, s3_request_presigner_1.getSignedUrl)(S3, cmd);
             urls[file] = fileUrl;
@@ -116,7 +116,8 @@ const run = async (config) => {
             if (error["$metadata"]) {
                 if (error.$metadata.httpStatusCode !== 412)
                     // If-None-Match
-                    throw error;
+                    console.log(`R2 Error - ${file} ${config.sourceDir} ${config.destinationDir}`);
+                throw error;
             }
         }
         return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@empiricalrun/playwright-utils",
-  "version": "0.7.1",
+  "version": "0.7.3",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"