refactor(reporting): image display name (#217)

* refactor(reporting): image display name

Author: SvetoslavTsenov

lib/appium-driver.ts

@@ -600,7 +600,7 @@ export class AppiumDriver {
             copy(pathActualImage, pathActualImageToReportsFolder, false);
 
             console.log("Remove the 'actual' suffix to continue using the image as expected one ", pathExpectedImage);
-            this._args.testReporterLog(basename(pathActualImage));
+            this._args.testReporterLog(basename(pathActualImage).replace(/\.\w{3,3}$/ig, ""));
             this._args.testReporterLog(join(this._logPath, basename(pathActualImage)));
 
             return false;
@@ -625,15 +625,17 @@ export class AppiumDriver {
                 await this.prepareImageToCompare(pathActualImage, rect);
                 result = await this._imageHelper.compareImages(pathActualImage, pathExpectedImage, pathDiffImage, tolerance, toleranceType);
                 if (checkImageLogType(this._args.testReporter, LogImageType.everyImage)) {
-                    this._args.testReporterLog("Actual image: ");
+                    this._args.testReporterLog(`Actual image: ${basename(pathActualImage).replace(/\.\w{3,3}$/ig, "")}`);
                     this._args.testReporterLog(join(this._logPath, basename(pathActualImage)));
                 }
                 counter++;
             }
 
             if (!checkImageLogType(this._args.testReporter, LogImageType.everyImage)) {
-                this._args.testReporterLog("Actual image: ");
+                this._args.testReporterLog(`Actual image: ${basename(pathDiffImage).replace(/\.\w{3,3}$/ig, "")}`);
                 this._args.testReporterLog(join(this._logPath, basename(pathDiffImage)));
+                this._args.testReporterLog(`Actual image: ${basename(pathActualImage).replace(/\.\w{3,3}$/ig, "")}`);
+                this._args.testReporterLog(join(this._logPath, basename(pathActualImage)));
             }
         } else {
             if (existsSync(pathDiffImage)) {

lib/image-helper.ts

@@ -4,6 +4,7 @@ import { ImageOptions } from "./image-options";
 import { INsCapabilities } from "./interfaces/ns-capabilities";
 import { IRectangle } from "./interfaces/rectangle";
 import { LogImageType } from "./enums/log-image-type";
+import { basename } from "path";
 
 export class ImageHelper {
 
@@ -75,7 +76,7 @@ export class ImageHelper {
                         message = `Screen compare failed! Found ${result.differences} differences.\n`;
                         console.log(message);
                         if (Object.getOwnPropertyNames(that._args.testReporter).length > 0 && that._args.testReporter.logImageTypes && that._args.testReporter.logImageTypes.indexOf(LogImageType.everyImage) > -1) {
-                            that._args.testReporterLog(message);
+                            that._args.testReporterLog(`${basename(diffImage)}\n\r${message}`);
                             that._args.testReporterLog(diffImage);
                         }
                         return resolve(false);

lib/ui-element.ts

@@ -27,7 +27,7 @@ export class UIElement {
     public async tapCenter() {
         let action = new this._wd.TouchAction(this._driver);
         const rect = await this.getActualRectangle();
-        this._args.testReporterLog(`Tap on center element ${ {"x": rect.x + rect.width / 2, "y": rect.y + rect.height / 2 }}`);
+        this._args.testReporterLog(`Tap on center element ${{ "x": rect.x + rect.width / 2, "y": rect.y + rect.height / 2 }}`);
         action
             .tap({ x: rect.x + rect.width / 2, y: rect.y + rect.height / 2 });
         await action.perform();
@@ -170,27 +170,26 @@ export class UIElement {
      * Shows if element is displayed. Returns true or false. If the element doesn't exist it will return false
      */
     public async isDisplayed() {
-        const el = this._element;
-        let isDisplayed = true;
-        if (!el || el === null) {
-            return false;
-        }
-        const isDisplayedWebDriver = await el.isDisplayed();
-        if (!isDisplayedWebDriver) {
-            return false;
-        }
-        const displaySize = await this._driver.getWindowSize();
         try {
+            const el = await this._element;
+            let isDisplayed = true;
+            if (!el || el === null) {
+                return false;
+            }
+            const isDisplayedWebDriver = await el.isDisplayed();
+            if (!isDisplayedWebDriver) {
+                return false;
+            }
+            const displaySize = await this._driver.getWindowSize();
             const elemCoordinates = await el.getLocation();
 
             isDisplayed = isDisplayedWebDriver && elemCoordinates.x >= 0 && elemCoordinates.x < displaySize.width
                 && elemCoordinates.y >= 0 && elemCoordinates.y < displaySize.height;
+
+            return isDisplayed;
         } catch (error) {
-            console.log("ERROR: " + error);
-            isDisplayed = false;
+            return false;
         }
-
-        return isDisplayed;
     }
 
     /**