@zohodesk/testinglibrary 0.0.46-n20-experimental → 0.0.47-n20-experimental

package/build/common/data-generator/steps/DataGenerator.spec.js

@@ -1,19 +1,19 @@
 import { createBdd , test } from '@zohodesk/testinglibrary';
-import { generateAndCacheTestData } from './DataGeneratorStepsHelper';  
+import { generateAndCacheTestData } from './DataGeneratorStepsHelper';
 
 const { Given } = createBdd();
 
-Given('generate a {string} entity {string} with generator {string}', async ({ page, context, i18N, cacheLayer, cleanupTracker, executionContext}, module, entityName, generatorName, dataTable) => {
-    await generateAndCacheTestData(executionContext, "template", generatorName, dataTable, cacheLayer, entityName, null, cleanupTracker);
+Given('generate a {string} entity {string} with generator {string}', async ({ page, context, i18N, cacheLayer, executionContext}, module, entityName, generatorName, dataTable) => {
+    await generateAndCacheTestData(executionContext, "template", generatorName, dataTable, cacheLayer, entityName);
 });
 
-Given('generate a {string} entity {string} with API {string}', async ({ page, context, i18N, cacheLayer, cleanupTracker, executionContext}, module, entityName, operationId, dataTable) => {
-    await generateAndCacheTestData(executionContext, "API", operationId, dataTable, cacheLayer, entityName, null, cleanupTracker);
+Given('generate a {string} entity {string} with API {string}', async ({ page, context, i18N, cacheLayer, executionContext}, module, entityName, operationId, dataTable) => {
+    await generateAndCacheTestData(executionContext, "API", operationId, dataTable, cacheLayer, entityName);
 });
-Given('generate a {string} entity {string} with generator {string} using {string} profile', async ({ page, context, i18N, cacheLayer, cleanupTracker, executionContext}, module, entityName, generatorName, profile, dataTable) => {
-    await generateAndCacheTestData(executionContext, "template", generatorName, dataTable, cacheLayer, entityName, profile, cleanupTracker);
+Given('generate a {string} entity {string} with generator {string} using {string} profile', async ({ page, context, i18N, cacheLayer, executionContext}, module, entityName, generatorName, profile, dataTable) => {
+    await generateAndCacheTestData(executionContext, "template", generatorName, dataTable, cacheLayer, entityName, profile);
 });
 
-Given('generate a {string} entity {string} with API {string} using {string} profile', async ({ page, context, i18N, cacheLayer, cleanupTracker, executionContext}, module, entityName, operationId, profile, dataTable) => {
-    await generateAndCacheTestData(executionContext, "API", operationId, dataTable, cacheLayer, entityName, profile, cleanupTracker);
+Given('generate a {string} entity {string} with API {string} using {string} profile', async ({ page, context, i18N, cacheLayer, executionContext}, module, entityName, operationId, profile, dataTable) => {
+    await generateAndCacheTestData(executionContext, "API", operationId, dataTable, cacheLayer, entityName, profile);
 });

package/build/common/data-generator/steps/DataGeneratorStepsHelper.js

@@ -1,30 +1,31 @@
 import { test } from '@zohodesk/testinglibrary';
 import DataGenerator from '@zohodesk/testinglibrary/DataGenerator';
- import {getUserForSelectedEditionAndProfile} from '@zohodesk/testinglibrary/helpers'
+import {getUserForSelectedEditionAndProfile, getListOfActors} from '@zohodesk/testinglibrary/helpers'
 
 const dataGenerator = new DataGenerator();
 
-export async function generateAndCacheTestData(executionContext, type, identifier, dataTable, cacheLayer, entityName, profile = null, cleanupTracker = null) {
+export async function generateAndCacheTestData(executionContext, type, identifier, dataTable, cacheLayer, entityName, profile = null) {
     let actorInfo;
     const testInfo = test.info();
     const scenarioName = testInfo.title.split('/').pop() || 'Unknown Scenario';
 
     if (profile) {
+        // Explicit profile requested — resolve that profile's credentials
         const { edition, orgName: portal, beta } = executionContext.actorInfo;
         actorInfo = await getUserForSelectedEditionAndProfile(edition, profile, beta, portal);
     } else {
+        // Default — use current actor, fall back to org-level data-generator if profile has none
         actorInfo = executionContext.actorInfo;
+        if (!actorInfo['data-generator']) {
+            const { edition, orgName: portal, beta } = actorInfo;
+            const actorsData = getListOfActors(beta);
+            const portalData = actorsData.editions[edition]?.find(e => e.orgName === portal);
+            if (portalData?.['data-generator']) {
+                actorInfo = { ...actorInfo, 'data-generator': portalData['data-generator'] };
+            }
+        }
     }
-    
-    const { response, generators } = await dataGenerator.generate(testInfo, actorInfo, type, identifier, scenarioName, dataTable ? dataTable.hashes() : []);
-    await cacheLayer.set(entityName, response.data);
 
-    if (cleanupTracker) {
-        cleanupTracker.track({
-            entityName,
-            generators,
-            cachedData: response.data,
-            actorInfo
-        });
-    }
+    const { response } = await dataGenerator.generate(testInfo, actorInfo, type, identifier, scenarioName, dataTable ? dataTable.hashes() : []);
+    await cacheLayer.set(entityName, response.data);
 }

package/build/core/dataGenerator/DataGenerator.js

@@ -9,9 +9,10 @@ var _path = _interopRequireDefault(require("path"));
 var _fs = _interopRequireDefault(require("fs"));
 var _logger = require("../../utils/logger");
 var _DataGeneratorHelper = require("./DataGeneratorHelper");
-var _helpers = require("@zohodesk/testinglibrary/helpers");
 var _DataGeneratorError = require("./DataGeneratorError");
 var _readConfigFile = require("../playwright/readConfigFile");
+var _configConstants = _interopRequireDefault(require("../playwright/constants/configConstants"));
+var _ConfigurationHelper = require("../playwright/configuration/ConfigurationHelper");
 function _classPrivateMethodInitSpec(e, a) { _checkPrivateRedeclaration(e, a), a.add(e); }
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
 function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
@@ -31,7 +32,7 @@ class DataGenerator {
       if (generatorType === 'API') {
         generators = await _assertClassBrand(_DataGenerator_brand, this, _generateAPIGenerator).call(this, generatorName);
       } else {
-        generators = await _assertClassBrand(_DataGenerator_brand, this, _getGenerator).call(this, testInfo, generatorName);
+        generators = await _assertClassBrand(_DataGenerator_brand, this, _getGenerator).call(this, generatorName);
       }
       const processedGenerators = await (0, _DataGeneratorHelper.processGenerator)(generators, dataTable);
       const apiPayload = await _assertClassBrand(_DataGenerator_brand, this, _constructApiPayload).call(this, scenarioName, processedGenerators, actorInfo);
@@ -92,18 +93,13 @@ function _buildIndex(modulesRoot, pattern) {
   _logger.Logger.log(_logger.Logger.INFO_TYPE, `Generator index built: ${index.size} generators found`);
   return index;
 }
-function _getModulesRoot(featureFilePath) {
-  let dir = _path.default.dirname(featureFilePath);
-  while (dir !== _path.default.parse(dir).root) {
-    if (_path.default.basename(dir) === 'modules') return dir;
-    dir = _path.default.dirname(dir);
-  }
-  return null;
+function _getModulesRoot() {
+  const stage = (0, _ConfigurationHelper.getRunStage)();
+  return _path.default.join(process.cwd(), _configConstants.default.TEST_SLICE_FOLDER, stage, 'modules');
 }
-async function _getGenerator(testInfo, generatorName) {
+async function _getGenerator(generatorName) {
   if (!_classPrivateFieldGet(_generatorIndex, this)) {
-    const featureFilePath = await (0, _DataGeneratorHelper.getGeneratorFilePath)(testInfo.file);
-    const modulesRoot = _assertClassBrand(_DataGenerator_brand, this, _getModulesRoot).call(this, featureFilePath);
+    const modulesRoot = _assertClassBrand(_DataGenerator_brand, this, _getModulesRoot).call(this);
     const {
       generatorFilePattern: pattern = '*.generators.json'
     } = (0, _readConfigFile.generateConfigFromFile)();

package/build/core/playwright/builtInFixtures/cacheLayer.js

@@ -1,27 +1,13 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _CleanupTracker = _interopRequireDefault(require("../../dataGenerator/CleanupTracker"));
-var _DataCleanup = _interopRequireDefault(require("../../dataGenerator/DataCleanup"));
 const cacheMap = new Map();
 var _default = exports.default = {
   // eslint-disable-next-line no-empty-pattern
   cacheLayer: async ({}, use) => {
     await use(cacheMap);
-  },
-  // eslint-disable-next-line no-empty-pattern
-  cleanupTracker: async ({}, use) => {
-    const tracker = new _CleanupTracker.default();
-    await use(tracker);
-    const entries = tracker.getEntries();
-    if (entries.length > 0) {
-      const cleanup = new _DataCleanup.default();
-      await cleanup.cleanup(entries);
-    }
-    tracker.clear();
   }
 };

package/npm-shrinkwrap.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/testinglibrary",
-  "version": "0.0.46-n20-experimental",
+  "version": "0.0.47-n20-experimental",
   "main": "./build/index.js",
   "scripts": {
     "postinstall": "node bin/postinstall.js",

package/build/core/dataGenerator/CleanupTracker.js

@@ -1,29 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-class CleanupTracker {
-  #entries = [];
-  track({
-    entityName,
-    generators,
-    cachedData,
-    actorInfo
-  }) {
-    this.#entries.push({
-      entityName,
-      generators,
-      cachedData,
-      actorInfo
-    });
-  }
-  getEntries() {
-    return [...this.#entries];
-  }
-  clear() {
-    this.#entries = [];
-  }
-}
-var _default = exports.default = CleanupTracker;

package/build/core/dataGenerator/DataCleanup.js

@@ -1,98 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _jsonpath = _interopRequireDefault(require("jsonpath"));
-var _logger = require("../../utils/logger");
-var _DataGeneratorHelper = require("./DataGeneratorHelper");
-function _classPrivateMethodInitSpec(e, a) { _checkPrivateRedeclaration(e, a), a.add(e); }
-function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
-function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n; throw new TypeError("Private element is not present on this object"); }
-var _DataCleanup_brand = /*#__PURE__*/new WeakSet();
-class DataCleanup {
-  constructor() {
-    _classPrivateMethodInitSpec(this, _DataCleanup_brand);
-  }
-  async cleanup(entries) {
-    for (const entry of [...entries].reverse()) {
-      for (const step of [...entry.generators].reverse()) {
-        if (!step.cleanup) continue;
-        try {
-          const entityId = _assertClassBrand(_DataCleanup_brand, this, _extractId).call(this, entry.cachedData, step.cleanup.idPath);
-          if (step.cleanup.type === 'oas') {
-            await _assertClassBrand(_DataCleanup_brand, this, _cleanupViaOAS).call(this, step.cleanup, entityId, entry.actorInfo);
-          } else if (step.cleanup.type === 'api') {
-            await _assertClassBrand(_DataCleanup_brand, this, _cleanupViaAPI).call(this, step.cleanup, entityId, entry.actorInfo);
-          }
-          _logger.Logger.log(_logger.Logger.SUCCESS_TYPE, `Cleanup: ${step.cleanup.method || 'delete'} ${step.name} (ID: ${entityId})`);
-        } catch (err) {
-          _logger.Logger.log(_logger.Logger.INFO_TYPE, `Cleanup warning for ${step.name}: ${err.message}`);
-        }
-      }
-    }
-  }
-}
-function _extractId(cachedData, idPath) {
-  if (!cachedData || !idPath) {
-    throw new Error('Missing cached data or idPath for cleanup');
-  }
-  const result = _jsonpath.default.query(cachedData, idPath);
-  if (result.length === 0) {
-    throw new Error(`Could not extract ID using path "${idPath}" from cached data`);
-  }
-  return result[0];
-}
-async function _cleanupViaOAS(cleanupConfig, entityId, actorInfo) {
-  const dataGeneratorObj = actorInfo['data-generator'];
-  if (!dataGeneratorObj) {
-    throw new Error(`Data Generator configuration is missing for cleanup`);
-  }
-  const deleteGenerator = [{
-    type: 'dynamic',
-    generatorOperationId: cleanupConfig.operationId,
-    dataPath: '$.response.body:$',
-    name: cleanupConfig.operationId,
-    params: {
-      id: String(entityId)
-    }
-  }];
-  const apiPayload = {
-    scenario_name: 'cleanup',
-    data_generation_templates: deleteGenerator,
-    ...dataGeneratorObj
-  };
-  const account = apiPayload.account;
-  if (account) {
-    account.email = actorInfo.email;
-    account.password = actorInfo.password;
-  }
-  const environmentDetails = apiPayload.environmentDetails || {};
-  environmentDetails.iam_url = process.env.DG_IAM_DOMAIN;
-  const domainUrl = new URL(process.env.domain);
-  environmentDetails.host = domainUrl.origin;
-  apiPayload.environmentDetails = environmentDetails;
-  await (0, _DataGeneratorHelper.makeRequest)(process.env.DG_SERVICE_DOMAIN + process.env.DG_SERVICE_API_PATH, apiPayload);
-}
-async function _cleanupViaAPI(cleanupConfig, entityId, actorInfo) {
-  const domainUrl = new URL(process.env.domain);
-  const apiPath = cleanupConfig.apiPath.replace('{id}', entityId);
-  const url = `${domainUrl.origin}${apiPath}`;
-  const fetchOptions = {
-    method: cleanupConfig.method,
-    headers: {
-      'Content-Type': 'application/json'
-    }
-  };
-  if (cleanupConfig.body) {
-    fetchOptions.body = JSON.stringify(cleanupConfig.body);
-  }
-  const response = await fetch(url, fetchOptions);
-  if (!response.ok) {
-    const errorBody = await response.text();
-    throw new Error(`API cleanup failed: ${cleanupConfig.method} ${apiPath} - status: ${response.status}, body: ${errorBody}`);
-  }
-}
-var _default = exports.default = DataCleanup;