@zohodesk/testinglibrary 0.4.65-n18-experimental → 0.4.66-n18-experimental

package/build/core/playwright/helpers/auth/accountLogin.js

@@ -13,6 +13,10 @@ async function accountLogin(page, useremail, password) {
   await page.locator('#nextbtn').click();
   const domainUrlOrigin = (0, _getUrlOrigin.default)(process.env.domain);
   await page.waitForNavigation();
-  await Promise.race([page.waitForURL(`${domainUrlOrigin}/**`), page.waitForURL('**/announcement/**')]);
+  if (page.url().includes('announcement')) {
+    console.log("Detected 'sessions-reminder' or 'announcement' page. Redirecting to domain origin:", domainUrlOrigin);
+    await page.goto(domainUrlOrigin);
+  }
+  await page.waitForURL(`${domainUrlOrigin}/**`);
 }
 var _default = exports.default = accountLogin;

package/build/core/playwright/setup/qc-custom-reporter.js

@@ -6,12 +6,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _fs = _interopRequireDefault(require("fs"));
+var _path = _interopRequireDefault(require("path"));
 var _codeFrame = require("@babel/code-frame");
 class CustomJsonReporter {
   constructor({
     outputFile = 'playwright-custom-report.json'
   } = {}) {
-    this.outputFile = outputFile;
+    this.outputFile = _path.default.resolve(outputFile);
     this.rootSuite = null;
     this.report = {
       config: {},
@@ -44,22 +45,23 @@ class CustomJsonReporter {
         stack,
         snippet
       }))) ?? [],
-      steps: ((_result$steps = result.steps) === null || _result$steps === void 0 ? void 0 : _result$steps.map(extractMergedSteps)) ?? []
+      steps: ((_result$steps = result.steps) === null || _result$steps === void 0 ? void 0 : _result$steps.map(step => extractMergedSteps(this.report.config.rootDir, step))) ?? []
     };
     const existingResults = this.testResultsById.get(key) ?? [];
     this.testResultsById.set(key, [...existingResults, testResult]);
   }
   onEnd() {
     var _this$rootSuite;
-    const testSuites = ((_this$rootSuite = this.rootSuite) === null || _this$rootSuite === void 0 || (_this$rootSuite = _this$rootSuite.suites) === null || _this$rootSuite === void 0 || (_this$rootSuite = _this$rootSuite[0]) === null || _this$rootSuite === void 0 ? void 0 : _this$rootSuite.suites) ?? [];
-    const extracted = testSuites.map(suite => extractMergedSuite(suite, this.testResultsById));
-    this.report.suites.push(...extracted);
+    (_this$rootSuite = this.rootSuite) === null || _this$rootSuite === void 0 || (_this$rootSuite = _this$rootSuite.suites) === null || _this$rootSuite === void 0 || _this$rootSuite.map(suite => {
+      const extracted = suite.suites.map(suite => extractMergedSuite(this.report.config.rootDir, suite, this.testResultsById));
+      this.report.suites.push(...extracted);
+    });
     _fs.default.writeFileSync(this.outputFile, JSON.stringify(this.report, null, 2));
     console.log(`Custom JSON report written to: ${this.outputFile}`);
   }
 }
 exports.default = CustomJsonReporter;
-const extractMergedSuite = (suite, testResultsById) => {
+const extractMergedSuite = (rootDir, suite, testResultsById) => {
   var _suite$suites;
   const specMap = new Map();
   for (const test of suite.tests ?? []) {
@@ -68,27 +70,27 @@ const extractMergedSuite = (suite, testResultsById) => {
       const newTestInfo = extractTestDetails(test, testResultsById);
       existingSpec.tests.push(newTestInfo);
     } else {
-      const newSpec = createSpecEntry(test, testResultsById);
+      const newSpec = createSpecEntry(rootDir, test, testResultsById);
       specMap.set(test.title, newSpec);
     }
   }
   return {
     title: suite.title,
-    location: suite.location,
+    ...parseLocation(rootDir, suite.location),
     ...(suite.location && {
-      snippet: formSnippet(suite.location)
+      snippet: formSnippet(rootDir, suite.location)
     }),
     ...(((_suite$suites = suite.suites) === null || _suite$suites === void 0 ? void 0 : _suite$suites.length) > 0 && {
-      suites: suite.suites.map(child => extractMergedSuite(child, testResultsById))
+      suites: suite.suites.map(child => extractMergedSuite(rootDir, child, testResultsById))
     }),
     ...(specMap.size > 0 && {
       specs: Array.from(specMap.values())
     })
   };
 };
-const createSpecEntry = (test, testResultsById) => ({
+const createSpecEntry = (rootDir, test, testResultsById) => ({
   title: test.title,
-  location: test.location,
+  ...parseLocation(rootDir, test.location),
   ...(test.location && {
     snippet: formSnippet(test.location)
   }),
@@ -107,7 +109,7 @@ const extractTestDetails = (test, testResultsById) => {
     status: test.outcome()
   };
 };
-const extractMergedSteps = step => ({
+const extractMergedSteps = (rootDir, step) => ({
   title: step.title,
   duration: step.duration,
   ...(step.error && {
@@ -117,23 +119,28 @@ const extractMergedSteps = step => ({
       snippet: step.error.snippet
     }
   }),
-  location: step.location,
+  ...parseLocation(rootDir, step.location),
   status: step.status,
   ...(step.location && {
-    snippet: formSnippet(step.location)
+    snippet: formSnippet(rootDir, step.location)
   }),
   ...(step.steps && step.steps.length > 0 && {
-    steps: step.steps.map(subStep => extractMergedSteps(subStep))
+    steps: step.steps.map(subStep => extractMergedSteps(rootDir, subStep))
   })
 });
-const formSnippet = location => {
-  if (!(location !== null && location !== void 0 && location.file)) return '';
+const formSnippet = (rootDir, location) => {
+  if (location && !(location !== null && location !== void 0 && location.file)) return '';
   try {
-    const raw = _fs.default.readFileSync(location.file, 'utf8');
+    const {
+      file,
+      line,
+      column
+    } = parseLocation(rootDir, location, false);
+    const raw = _fs.default.readFileSync(file, 'utf8');
     return (0, _codeFrame.codeFrameColumns)(raw, {
       start: {
-        line: location.line,
-        column: location.column
+        line,
+        column
       }
     }, {
       linesAbove: 2,
@@ -143,4 +150,13 @@ const formSnippet = location => {
   } catch {
     return '';
   }
-};
+};
+const parseLocation = (rootDir, {
+  file,
+  line,
+  column
+} = {}, isRelative = true) => file ? {
+  file: isRelative ? _path.default.relative(rootDir, file) : file,
+  line,
+  column
+} : {};

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@zohodesk/testinglibrary",
-  "version": "0.4.65-n18-experimental",
+  "version": "0.4.66-n18-experimental",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@zohodesk/testinglibrary",
-      "version": "0.4.65-n18-experimental",
+      "version": "0.4.66-n18-experimental",
       "hasInstallScript": true,
       "license": "ISC",
       "dependencies": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/testinglibrary",
-  "version": "0.4.65-n18-experimental",
+  "version": "0.4.66-n18-experimental",
   "description": "",
   "main": "./build/index.js",
   "scripts": {

package/playwright.config.js

@@ -10,7 +10,7 @@ export default defineConfig({
   retries: process.env.CI ? 2 : 0,
   reporter: [
     ['html', { outputFolder: path.join(process.cwd(), 'uat', 'playwright-report'), open: "always" }],
-    ['./src/core/playwright/setup/my-custom-reporter.js'] 
+    ['./src/core/playwright/setup/qc-custom-reporter.js'] 
   ],
   timeout: 60 * 1000,
   expect: {