@zohodesk/testinglibrary 0.3.2-experimental → 0.3.4-experimental

package/build/core/playwright/configuration/Configuration.js

@@ -0,0 +1,22 @@
+"use strict";
+
+var _ConfigurationHelper = require("./ConfigurationHelper");
+class Configuration {
+  properties = {};
+  constructor(props) {
+    this.properties = props;
+  }
+  add(key, value) {
+    this.properties[key] = value;
+  }
+  addAll(newConfig) {
+    this.properties = (0, _ConfigurationHelper.combineConfiguration)(this.properties, newConfig.getAll());
+  }
+  get(key) {
+    return this.properties[key];
+  }
+  getAll() {
+    return this.properties;
+  }
+}
+module.exports = Configuration;

package/build/core/playwright/configuration/ConfigurationHelper.js

@@ -0,0 +1,50 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.combineConfiguration = combineConfiguration;
+exports.getApplicationConfig = getApplicationConfig;
+var _path = _interopRequireDefault(require("path"));
+var _logger = require("../../../utils/logger");
+var _configFileNameProvider = require("../helpers/configFileNameProvider");
+var _mergeObjects = require("../helpers/mergeObjects");
+var _fs = require("fs");
+const Configuration = require("./Configuration");
+function checkForDeprecatedKeys(configKey) {
+  let deprecatedConfigInUatConfigFile = ['mode'];
+  if (deprecatedConfigInUatConfigFile.includes(configKey)) {
+    _logger.Logger.log(_logger.Logger.INFO_TYPE, `key ${configKey} is deprecated. Please use other options`);
+  }
+}
+function combineConfiguration(defaultConfig, userConfiguration) {
+  let configurationObj = {};
+  Object.keys(userConfiguration).forEach(configKey => {
+    checkForDeprecatedKeys(configKey);
+    let configValue = userConfiguration[configKey];
+    if (configValue !== null && configValue !== undefined) {
+      configurationObj[configKey] = configValue;
+    } else if (defaultConfig[configKey]) {
+      configurationObj[configKey] = defaultConfig[configKey];
+    } else {
+      _logger.Logger.log(_logger.Logger.INFO_TYPE, `key - ${configKey} is not yet supported in uat configuration. This will not be used while creating playwright configuration`);
+    }
+  });
+  return (0, _mergeObjects.mergeObjects)(defaultConfig, configurationObj);
+}
+function getApplicationConfig() {
+  let filePath = "";
+  try {
+    filePath = _path.default.resolve(process.cwd(), (0, _configFileNameProvider.getUATFileName)());
+    if (!(0, _fs.existsSync)(filePath)) {
+      throw new Error("catch error");
+    }
+    const config = require(filePath);
+    return config;
+  } catch (err) {
+    _logger.Logger.log(_logger.Logger.FAILURE_TYPE, `Founded Path - ${filePath} Application config file not Exist ...`);
+    _logger.Logger.error(err);
+    return {};
+  }
+}

package/build/core/playwright/configuration/UserArgs.js

@@ -0,0 +1,12 @@
+"use strict";
+
+var _cliArgsToObject = require("../../../utils/cliArgsToObject");
+class UserArgs {
+  static parseToObject(config) {
+    return (0, _cliArgsToObject.cliArgsToObject)(config);
+  }
+  static parseToArgs(object) {
+    return (0, _cliArgsToObject.objectToCliArgs)(object);
+  }
+}
+module.exports = UserArgs;

package/build/core/playwright/helpers/parseUserArgs.js

@@ -3,9 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.parseUserArgs = parseUserArgs;
 var _cliArgsToObject = require("../../../utils/cliArgsToObject");
 function parseUserArgs() {
   return (0, _cliArgsToObject.cliArgsToObject)(process.argv.slice(2));
-}
-var _default = exports.default = parseUserArgs;
+}

package/build/core/playwright/readConfigFile.js

@@ -5,13 +5,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.generateConfigFromFile = generateConfigFromFile;
+exports.getApplicationConfig = getApplicationConfig;
 exports.getAuthFilePath = getAuthFilePath;
+exports.getDefaultConfig = getDefaultConfig;
 exports.isUserConfigFileAvailable = isUserConfigFileAvailable;
 var _fs = require("fs");
 var _path = _interopRequireDefault(require("path"));
 var _logger = require("../../utils/logger");
 var _configFileNameProvider = require("./helpers/configFileNameProvider");
 var _mergeObjects = require("./helpers/mergeObjects");
+var _Configuration = require("./configuration/Configuration");
 let cachedConfig = null;
 function getDefaultConfig() {
   return {
@@ -124,6 +127,14 @@ function generateConfigFromFile() {
   }
   return {};
 }
+function getApplicationConfig() {
+  const filePath = _path.default.resolve(process.cwd(), (0, _configFileNameProvider.getUATFileName)());
+  if ((0, _fs.existsSync)(filePath)) {
+    const config = require(filePath);
+    return config;
+  }
+  return {};
+}
 function isUserConfigFileAvailable() {
   const filePath = _path.default.resolve(process.cwd(), (0, _configFileNameProvider.getUATFileName)());
   if ((0, _fs.existsSync)(filePath)) {

package/build/core/playwright/test-runner.js

@@ -16,7 +16,9 @@ var _rootPath = require("../../utils/rootPath");
 var _tagProcessor = require("./tag-processor");
 var _configUtils = require("./setup/config-utils");
 var _browserTypes = require("./constants/browserTypes");
-var _parseUserArgs = _interopRequireDefault(require("./helpers/parseUserArgs"));
+var _ConfigurationHelper = require("./configuration/ConfigurationHelper");
+var _Configuration = _interopRequireDefault(require("./configuration/Configuration"));
+var _UserArgs = _interopRequireDefault(require("./configuration/UserArgs"));
 function getPlaywrightArgs(userArgsObject, debug, bddMode, tagArgs, headless) {
   const {
     browsers = null
@@ -97,17 +99,30 @@ function runPlaywright(command, args) {
   });
 }
 function main() {
-  const userArgsObject = (0, _parseUserArgs.default)();
-  const uatConfig = (0, _readConfigFile.generateConfigFromFile)();
+  // Getting the default config's from framework
+  const uatConfig = new _Configuration.default((0, _readConfigFile.getDefaultConfig)());
+
+  // overriding the application config's from project
+  uatConfig.addAll(new _Configuration.default((0, _ConfigurationHelper.getApplicationConfig)()));
+  const {
+    isAuthMode,
+    mode,
+    editionOrder
+  } = uatConfig.getAll();
+  (0, _envInitializer.initializeEnvConfig)(mode, isAuthMode);
+
+  // overriding the user config's from CLI
+  const userArgConfig = new _Configuration.default(_UserArgs.default.parseToObject(process.argv.slice(2)));
+  uatConfig.addAll(userArgConfig);
+
+  //This is only used for pass the user arguments to need places in legacy code. We need to rewamp that also.
+  const userArgsObject = userArgConfig.getAll();
+  const tagArgs = (0, _tagProcessor.tagProcessor)(userArgsObject, editionOrder);
   const {
     debug,
     bddMode = false,
-    headless = false,
-    editionOrder,
-    isAuthMode
-  } = uatConfig;
-  (0, _envInitializer.initializeEnvConfig)(userArgsObject.mode, isAuthMode);
-  const tagArgs = (0, _tagProcessor.tagProcessor)(userArgsObject, editionOrder);
+    headless = false
+  } = uatConfig.getAll();
   const playwrightArgs = getPlaywrightArgs(userArgsObject, debug, bddMode, tagArgs, headless);
   const playwrightPath = _path.default.resolve((0, _rootPath.getExecutableBinaryPath)('playwright'));
   const command = playwrightPath;

package/build/test/core/playwright/configuration/__tests__/Configuration.test.js

@@ -0,0 +1,53 @@
+"use strict";
+
+const Configuration = require("../../../../../core/playwright/configuration/Configuration");
+const {
+  combineConfiguration
+} = require("../../../../../core/playwright/configuration/ConfigurationHelper");
+jest.mock('../../../../../core/playwright/configuration/ConfigurationHelper', () => ({
+  combineConfiguration: jest.fn()
+}));
+describe('Configuration Class', () => {
+  let config;
+  let sampleData;
+  beforeEach(() => {
+    // Sample data as a JSON object
+    sampleData = {
+      headless: false,
+      trace: true,
+      video: true,
+      bddMode: true
+    };
+
+    // Initialize the Configuration instance with sample data
+    config = new Configuration(sampleData);
+  });
+  test('should add new key-value pair to the configuration', () => {
+    config.add('newKey', 'newValue');
+    expect(config.get('newKey')).toBe('newValue');
+  });
+  test('should combine configurations correctly using addAll', () => {
+    const newConfig = new Configuration({
+      newKey1: 'newValue1',
+      trace: false // existing key to test override
+    });
+    const combinedConfig = {
+      headless: false,
+      trace: false,
+      // trace overridden
+      video: true,
+      bddMode: true,
+      newKey1: 'newValue1'
+    };
+    combineConfiguration.mockReturnValue(combinedConfig);
+    config.addAll(newConfig);
+    expect(combineConfiguration).toHaveBeenCalledWith(sampleData, newConfig.getAll());
+    expect(config.getAll()).toEqual(combinedConfig);
+  });
+  test('should return correct value for a given key', () => {
+    expect(config.get('headless')).toBe(false);
+    expect(config.get('trace')).toBe(true);
+    expect(config.get('video')).toBe(true);
+    expect(config.get('bddMode')).toBe(true);
+  });
+});

package/npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/testinglibrary",
-  "version": "0.3.2-experimental",
+  "version": "0.2.7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package/package.json

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