@zohodesk/testinglibrary 0.3.0 → 0.3.1

package/.gitlab-ci.yml

@@ -1,8 +1,8 @@
-image: repository.desk.csez.zohocorpin.com/base-image/testing-framework-gitlab-runne-base:v2
+image: repository.desk.csez.zohocorpin.com/base-image/testing-framework-gitlab-runne-base:v3
 
-#workflow:
-#  rules:
-#    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+workflow:
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
 
 stages:
   - build
@@ -12,7 +12,7 @@ stages:
 # Install dependencies stage
 build:
   stage: build
-  image: repository.desk.csez.zohocorpin.com/base-image/testing-framework-gitlab-runne-base:v2
+  image: repository.desk.csez.zohocorpin.com/base-image/testing-framework-gitlab-runne-base:v3
   script:
     - npm install
   artifacts:
@@ -23,7 +23,7 @@ build:
 # Unit tests stage
 unit:
   stage: unit
-  image: repository.desk.csez.zohocorpin.com/base-image/testing-framework-gitlab-runne-base:v2
+  image: repository.desk.csez.zohocorpin.com/base-image/testing-framework-gitlab-runne-base:v3
   script:
     - npm run test
   artifacts:
@@ -34,7 +34,7 @@ unit:
 # UAT tests stage
 uat-auth:
   stage: uat
-  image: repository.desk.csez.zohocorpin.com/base-image/testing-framework-gitlab-runne-base:v2
+  image: repository.desk.csez.zohocorpin.com/base-image/testing-framework-gitlab-runne-base:v3
   script:
     - npm install 
     - npm run build
@@ -53,7 +53,7 @@ uat-auth:
 
 uat-noauth:
   stage: uat
-  image: repository.desk.csez.zohocorpin.com/base-image/testing-framework-gitlab-runne-base:v2
+  image: repository.desk.csez.zohocorpin.com/base-image/testing-framework-gitlab-runne-base:v3
   script:
     - npm install 
     - npm run build
@@ -72,7 +72,7 @@ uat-noauth:
     
 uat-profile:
   stage: uat
-  image: repository.desk.csez.zohocorpin.com/base-image/testing-framework-gitlab-runne-base:v2
+  image: repository.desk.csez.zohocorpin.com/base-image/testing-framework-gitlab-runne-base:v3
   script:
     - npm install 
     - npm run build
@@ -91,7 +91,7 @@ uat-profile:
 
 uat-nobdd:
   stage: uat
-  image: repository.desk.csez.zohocorpin.com/base-image/testing-framework-gitlab-runne-base:v2
+  image: repository.desk.csez.zohocorpin.com/base-image/testing-framework-gitlab-runne-base:v3
   script:
     - npm install 
     - npm run build

package/README.md

@@ -53,4 +53,14 @@
   
 #### Deprecations
   - **Deprecated**: Passing `video` and `trace` as boolean (`true`/`false`) in project configuration.
-  - **New Approach**: Use Playwright values for `video` and `trace` options, such as `'on'`, `'retain-on-failure'`, or `'off'`.
+  - **New Approach**: Use Playwright values for `video` and `trace` options, such as `'on'`, `'retain-on-failure'`, or `'off'`.
+
+### v0.3.1 - 13-11-2024
+
+#### Issue Fix
+- Adding bddmode to get the fixtures.
+
+### v0.2.9.1 - 14-11-2024
+
+#### Enhancement
+   - Beta feature Actors and edition configurations are unified 

package/build/core/playwright/fixtures.js

@@ -10,7 +10,7 @@ const {
   bddMode
 } = (0, _readConfigFile.generateConfigFromFile)();
 let base = bddMode ? _playwrightBdd.test : _test.test;
-const buildInFixtures = (0, _builtInFixtures.default)();
+const buildInFixtures = (0, _builtInFixtures.default)(bddMode);
 const buildInFixturesTest = base.extend({
   ...buildInFixtures
 });

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

@@ -52,14 +52,22 @@ function getDefaultActor() {
   } = getDefaultActorConf();
   return getUserForSelectedEditionAndProfile(edition, profile);
 }
-function getListOfActors() {
+function getListOfActors(betaFeature) {
   const {
     uatDirectory
   } = (0, _readConfigFile.generateConfigFromFile)();
   const mode = getRunMode();
   let configFile = _path.default.join(uatDirectory, `conf/${mode}/actors/index.js`);
+  let betaReference = mode;
   if (!(0, _fs.existsSync)(configFile)) {
     configFile = _path.default.join(uatDirectory, `conf/default/actors/index.js`);
+    betaReference = "default";
+  }
+  if (betaFeature) {
+    configFile = _path.default.join(uatDirectory, `conf/${betaReference}/actors/beta/${betaFeature}/index.js`);
+    if (!(0, _fs.existsSync)(configFile)) {
+      throw new Error(`There is no beta feature configured with the name "${betaFeature}"`);
+    }
   }
   try {
     return require(configFile);
@@ -68,42 +76,21 @@ function getListOfActors() {
   }
 }
 function getUserForSelectedEditionAndProfile(preferedEdition, preferredProfile, betaFeature, testDataPortal = null) {
-  const actorsData = getListOfActors();
+  const actorsData = getListOfActors(betaFeature);
   if (!actorsData || !actorsData.editions) {
     throw new Error("The actors data is missing.");
   }
   const {
-    editions: userdata,
-    beta: betaPortals
+    editions: userdata
   } = actorsData;
   const defaultConf = getDefaultActorConf();
   const edition = preferedEdition || defaultConf.edition;
   const profile = preferredProfile || defaultConf.profile;
   let selectedProfile = {};
-  if (betaFeature && betaFeature !== null) {
-    if (!betaPortals.hasOwnProperty(betaFeature)) {
-      throw new Error(`There is no "${betaFeature}" beta feature configured.`);
-    }
-    const betaEdition = betaPortals[betaFeature].find(portal => portal.edition === edition);
-    if (!betaEdition) {
-      throw new Error(`There is no "${edition}" edition configured in "${betaFeature}" beta feature.`);
-    }
-    const {
-      profiles: betaProfiles,
-      ...betaEditionData
-    } = betaEdition;
-    selectedProfile = betaProfiles.find(user => user.profile === profile);
-    if (!selectedProfile) {
-      throw new Error(`There is no "${profile}" configured in edition of "${edition}" in "${betaFeature}" beta features.`);
-    }
-    return {
-      ...betaEditionData,
-      ...selectedProfile
-    };
-  }
 
   // TODO: We are returning the first data from array. We need to check the possiblity of having multiple users for same profile and possibly round robin
   // For this we need to get the data from ci environment.
+
   let testingPortal = null;
   if (!userdata.hasOwnProperty(edition)) {
     throw new Error(`There is no "${edition}" edition configured.`);

package/build/test/core/playwright/helpers/__tests__/getUsers_ListOfActors.test.js

@@ -0,0 +1,80 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _fs = require("fs");
+var _path = _interopRequireDefault(require("path"));
+jest.mock('fs');
+jest.mock('path');
+jest.mock('../../../../../core/playwright/readConfigFile', () => ({
+  generateConfigFromFile: jest.fn(() => ({
+    uatDirectory: '/test/directory'
+  })),
+  getRunMode: jest.fn(() => 'dev')
+}));
+const {
+  getListOfActors
+} = require('../../../../../core/playwright/helpers/auth/getUsers');
+describe('getListOfActors', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    _path.default.join.mockImplementation((...args) => args.join('/'));
+  });
+  test('throws an error when config file cannot be loaded', () => {
+    _fs.existsSync.mockReturnValueOnce(true); // Main config file exists
+
+    jest.mock('/test/directory/conf/dev/actors/index.js', () => {
+      throw new Error('Loading error');
+    }, {
+      virtual: true
+    });
+    expect(() => getListOfActors()).toThrow('Error loading actor configuration from /test/directory/conf/dev/actors/index.js');
+  });
+  test('throws an error when beta feature config does not exist', () => {
+    _fs.existsSync.mockReturnValueOnce(true) // Main config file exists
+    .mockReturnValueOnce(false); // Beta feature config does not exist in either path
+
+    const betaFeature = 'nonExistentFeature';
+    expect(() => getListOfActors(betaFeature)).toThrow(`There is no beta feature configured with the name "${betaFeature}"`);
+  });
+  test('loads main configuration when betaFeature is not provided and main config file exists', () => {
+    _fs.existsSync.mockReturnValueOnce(true);
+    jest.doMock('/test/directory/conf/dev/actors/index.js', () => ({
+      actors: []
+    }), {
+      virtual: true
+    });
+    const result = getListOfActors();
+    expect(result).toEqual({
+      actors: []
+    });
+  });
+  test('falls back to default configuration if main config file does not exist', () => {
+    _fs.existsSync.mockReturnValueOnce(false).mockReturnValueOnce(true);
+    jest.doMock('/test/directory/conf/default/actors/index.js', () => ({
+      actors: []
+    }), {
+      virtual: true
+    });
+    const result = getListOfActors();
+    expect(result).toEqual({
+      actors: []
+    });
+  });
+  test('loads beta feature configuration when betaFeature is provided', () => {
+    _fs.existsSync.mockReturnValueOnce(true) // Main config file exists
+    .mockReturnValueOnce(true); // Beta feature config exists
+
+    const betaFeature = 'parentchild';
+    const betaFeaturePath = `/test/directory/conf/dev/actors/beta/${betaFeature}/index.js`;
+    jest.doMock(betaFeaturePath, () => ({
+      betaActors: []
+    }), {
+      virtual: true
+    });
+    const result = getListOfActors(betaFeature);
+    expect(result).toEqual({
+      betaActors: []
+    });
+    expect(_path.default.join).toHaveBeenCalledWith('/test/directory', `conf/dev/actors/beta/${betaFeature}/index.js`);
+  });
+});

package/npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/testinglibrary",
-  "version": "0.2.8",
+  "version": "0.3.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {

package/package.json

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