@zeesoft/i18n-verify 2.0.0 → 2.0.2

package/dist/driver/adapters/nightwatch.js

@@ -40,20 +40,14 @@ class NightWatchDriver extends _baseDriver.default {
   async getValue(element) {
     return await element.getAttribute('value');
   }
-  async getElementID(element) {
-    return await element.getAttribute('id');
-  }
   async getElementDimension(element) {
     const eleSize = await element.getRect();
     if (![null, '', undefined].includes(eleSize)) {
       return [eleSize.x, eleSize.y, eleSize.height, eleSize.width];
     }
   }
-  async isElementDisplayed(element) {
-    return await this.$driver.isVisible(element);
-  }
-  async isElementPresent(element) {
-    return await this.$driver.isPresent(element);
+  isElementDisplayed(element) {
+    return this.$driver.isVisible(element);
   }
   async getElementStrings(element) {
     const elementStrings = [];
@@ -97,38 +91,5 @@ class NightWatchDriver extends _baseDriver.default {
   async getElementsCount(elements) {
     return elements.length;
   }
-  async switchFrame(frameID) {
-    if (frameID && frameID !== '') {
-      await this.$driver.frame(frameID, () => {
-        console.log(`Switching to iframe '${frameID}'`);
-      });
-    } else {
-      await this.$driver.frame(() => {
-        console.log('Switching to parentFrame');
-      });
-    }
-  }
-  pause(time) {
-    this.$driver.pause(time * 1000);
-  }
-  async onScreenStringHighlight(el, color) {
-    await this.$driver.execute((el, color) => {
-      el.style.border = `3px solid ${color}`;
-      setTimeout(() => {
-        el.style.border = 'none';
-      }, 50);
-    }, [el, color]);
-  }
-  async checkIfIframeIsPresent() {
-    return new Promise(res => {
-      this.$driver.isPresent({
-        selector: '//iframe',
-        locateStrategy: 'xpath',
-        suppressNotFoundErrors: true
-      }, result => {
-        res(result.value);
-      });
-    });
-  }
 }
 exports.default = NightWatchDriver;

package/dist/driver/baseDriver.js

@@ -47,15 +47,9 @@ class BaseDriver {
   getElementDimension() {
     throw new Error('implementation is missing');
   }
-  getElementID() {
-    throw new Error('implementation is missing');
-  }
   isElementDisplayed() {
     throw new Error('implementation is missing');
   }
-  isElementPresent() {
-    throw new Error('implementation is missing');
-  }
   getElementString() {
     throw new Error('implementation is missing');
   }
@@ -68,18 +62,6 @@ class BaseDriver {
   getElementsCount() {
     throw new Error('implementation is missing');
   }
-  switchFrame() {
-    throw new Error('implementation is missing');
-  }
-  pause() {
-    throw new Error('implementation is missing');
-  }
-  onScreenStringHighlight() {
-    throw new Error('implementation is missing');
-  }
-  checkIfIframeIsPresent() {
-    throw new Error('implementation is missing');
-  }
   printOnConsole(str) {
     console.log(str);
   }

package/dist/lib/i18n.js

@@ -8,7 +8,7 @@ var _baseDriver = _interopRequireDefault(require("../driver/baseDriver.js"));
 var _constants = require("../utils/constants.js");
 var _config = _interopRequireDefault(require("./config.js"));
 var _reports = _interopRequireDefault(require("../utils/reports.js"));
-var _dGraphic = _interopRequireDefault(require("../utils/2dGraphic.js"));
+var _graphic = _interopRequireDefault(require("../utils/graphic.js"));
 var _logs = _interopRequireDefault(require("../utils/logs.js"));
 var _fs = _interopRequireDefault(require("fs"));
 var _file = require("../utils/file.js");
@@ -68,18 +68,12 @@ class I18nVerify {
   }
   async #getElement(verificationArea, locator, img_name, desc) {
     const ele = await this.#driver.getElement(locator);
-    if (ele && (await this.#driver.isElementPresent(ele))) {
+    if (ele && (await this.#driver.isElementDisplayed(ele))) {
       let str;
       try {
         str = await this.#driver.getElementString(ele);
         try {
-          await this.#generateReports({
-            verificationArea,
-            ele,
-            img_name,
-            str,
-            desc
-          });
+          await this.#generateReports(verificationArea, ele, img_name, str, desc);
         } catch (reportError) {
           console.error('Error generating report of element:', reportError);
         }
@@ -94,19 +88,13 @@ class I18nVerify {
     const eles = await this.#driver.getElements(xpaths);
     if (eles.length > 0) {
       for (const el of eles) {
-        if (await this.#driver.isElementPresent(el)) {
+        if (await this.#driver.isElementDisplayed(el)) {
           let uiStrings;
           try {
             uiStrings = await this.#driver.getElementStrings(el);
             try {
               for (const str of uiStrings) {
-                await this.#generateReports({
-                  verificationArea,
-                  el,
-                  img_name,
-                  str,
-                  desc
-                });
+                await this.#generateReports(verificationArea, el, img_name, str, desc);
               }
             } catch (reportError) {
               console.error('Error generating report of element:', reportError);
@@ -116,25 +104,11 @@ class I18nVerify {
           }
         }
       }
-    }
-    if (await this.#driver.checkIfIframeIsPresent()) {
-      await this.#driver.switchFrame(null);
-      const iframes = await this.#driver.getElements('//iframe');
-      await this.#verifyIframeElements({
-        iframes,
-        img_name,
-        desc
-      });
+    } else {
+      console.error('No elements found:', xpaths);
     }
   }
-  async #generateReports({
-    verificationArea,
-    el,
-    img_name,
-    str,
-    desc,
-    iframePresent = false
-  }) {
+  async #generateReports(verificationArea, el, image_name, str, desc) {
     //TODO: in some cases, the str is having 0
     //needs more inspection
     if (typeof str !== 'string' || !str || Number(str) === 0) {
@@ -142,60 +116,45 @@ class I18nVerify {
     }
     _reports.default.incrementCount(_constants.I18N_STATUS.REVIEWED);
     const i18nStatus = _index.default.getIssueType(str),
-      src_img = (0, _file.joinPaths)(_reports.default.reviewedReports(str, img_name), img_name);
+      src_img = (0, _file.joinPaths)(_reports.default.reviewedReports(str, image_name), image_name);
     if (i18nStatus && src_img && typeof _reports.default[i18nStatus] === 'function') {
       const color = this.#defineColor(i18nStatus, str),
-        dest_img = (0, _file.joinPaths)(_reports.default[i18nStatus](str, img_name), img_name);
-      this.#driver.onScreenStringHighlight(el, color);
-      await this.#highlightReports({
-        verificationArea,
-        el,
-        color,
-        src_img,
-        dest_img,
-        str,
-        iframePresent,
-        desc
+        dest_img = (0, _file.joinPaths)(_reports.default[i18nStatus](str, image_name), image_name);
+      const eles = [];
+      eles.push(el);
+      browser.perform(async function () {
+        for (const el of eles) {
+          if (true) {
+            // Highlight the element using custom JavaScript
+            browser.execute(function (el, color) {
+              el.style.border = `3px solid ${color}`;
+              setTimeout(function () {
+                el.style.border = 'none'; // Remove border
+              }, 50);
+            }, [el, color]);
+          }
+        }
       });
+      await this.#highlightReports(verificationArea, el, color, src_img, dest_img, str);
     }
   }
-  async #highlightReports({
-    verificationArea,
-    el,
-    color,
-    src_img,
-    dest_img,
-    str,
-    iframePresent,
-    desc
-  }) {
+  async #highlightReports(verificationArea, el, color, src_img, rep_img, str) {
     try {
-      if (_fs.default.existsSync(src_img) && !_fs.default.existsSync(dest_img)) {
-        _fs.default.copyFileSync(src_img, dest_img);
-      } else if (!_fs.default.existsSync(dest_img) && !_fs.default.existsSync(src_img)) {
+      if (_fs.default.existsSync(src_img) && !_fs.default.existsSync(rep_img)) {
+        _fs.default.copyFileSync(src_img, rep_img);
+      } else if (!_fs.default.existsSync(rep_img) && !_fs.default.existsSync(src_img)) {
         await this.#captureCurrentScreen(src_img);
-        _fs.default.copyFileSync(src_img, dest_img);
+        _fs.default.copyFileSync(src_img, rep_img);
       }
     } catch (error) {
       _logs.default.error(`zee-error#2 - ${src_img} is not exists and unable to capture screenshot`);
     }
-    let areaRec;
-    let eleRec = await this.#getRect(el);
+    const area = await this.#driver.getElement(verificationArea);
     const areaColor = _constants.COLOR.GRB_BLUE;
-    if (iframePresent) {
-      areaRec = verificationArea;
-      const keysToUpdate = ['x', 'y'];
-      for (const key of keysToUpdate) {
-        if (key in eleRec && key in areaRec) {
-          eleRec[key] = areaRec[key] + eleRec[key];
-        }
-      }
-    } else {
-      const area = await this.#driver.getElement(verificationArea);
-      areaRec = await this.#getRect(area);
-    }
-    await _dGraphic.default.drawRectangle(areaRec, areaColor, dest_img);
-    await _dGraphic.default.drawRectangle(eleRec, color, dest_img);
+    const areaRec = await this.#getRect(area);
+    const eleRec = await this.#getRect(el);
+    await _graphic.default.drawRectangle(areaRec, areaColor, rep_img);
+    await _graphic.default.drawRectangle(eleRec, color, rep_img);
   }
   async #captureCurrentScreen(imagePath) {
     await this.#driver.captureScreenshot(imagePath);
@@ -214,42 +173,5 @@ class I18nVerify {
     _logs.default.debug(`[${str}] ${_constants.STATUS_COLOR[i18nStatus][1]} ${_constants.STATUS_INFO[i18nStatus]}${'\x1b[0m'}`);
     return _constants.STATUS_COLOR[i18nStatus][0];
   }
-  async #verifyIframeElements({
-    iframes,
-    img_name,
-    desc
-  }) {
-    for (const iframe of iframes) {
-      const frameID = await this.#driver.getElementID(iframe);
-      const verificationArea = await this.#getRect(iframe);
-      await this.#driver.switchFrame(frameID);
-      this.#driver.pause(10);
-      const iframeBody = await this.#driver.getElement('//body');
-      await this.#driver.isElementPresent(iframeBody);
-      const iframeElements = await this.#driver.getElements('//*[normalize-space(text())]');
-      if (iframeElements.length > 0) {
-        for (const el of iframeElements) {
-          if (await this.#driver.isElementPresent(el)) {
-            let uiStrings = await this.#driver.getElementStrings(el);
-            try {
-              for (const str of uiStrings) {
-                await this.#generateReports({
-                  verificationArea,
-                  el,
-                  img_name,
-                  str,
-                  desc,
-                  iframePresent: true
-                });
-              }
-            } catch (reportError) {
-              console.error('Error generating report of iframe elements:', reportError);
-            }
-          }
-        }
-      }
-      await this.#driver.switchFrame(null);
-    }
-  }
 }
 exports.default = I18nVerify;

package/dist/utils/{2Dgraphic.js → graphic.js}

@@ -7,7 +7,7 @@ exports.default = void 0;
 var _jimp = _interopRequireDefault(require("jimp"));
 var _path = _interopRequireDefault(require("path"));
 var _fs = _interopRequireDefault(require("fs"));
-var _logs = _interopRequireDefault(require("../utils/logs.js"));
+var _logs = _interopRequireDefault(require("./logs.js"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class Graphic {
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeesoft/i18n-verify",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "Library to perform I18n verification over Nightwatch or WebdriverIO frameworks",
   "main": "dist/index.js",
   "exports": {