Merge pull request #63 from wswebcreation/fix/fix-multiple-issues

Fix/fix multiple issues
wswebcreation · Apr 18, 2020 · 0085552 · 0085552
2 parents 2aa3932 + f526323
commit 0085552
Show file tree

Hide file tree

Showing 7 changed files with 1,676 additions and 848 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,6 @@ dist: trusty
 language: node_js
 
 node_js:
-  - "8"
   - "10"
   - "12"
 

diff --git a/lib/clientSideScripts/drawTabbableOnCanvas.ts b/lib/clientSideScripts/drawTabbableOnCanvas.ts
@@ -147,7 +147,7 @@ export default function drawTabbableOnCanvas(drawOptions: TabbableOptions) {
    */
   function isNodeMatchingSelectorFocusable(node: HTMLElement): boolean {
     return !(
-      (node.hasAttribute('disabled') && node.getAttribute('disabled'))
+      (node.hasAttribute('disabled') || node.getAttribute('disabled'))
       || isHiddenInput(node)
       || isHidden(node)
     );

diff --git a/lib/helpers/afterScreenshot.ts b/lib/helpers/afterScreenshot.ts
@@ -7,6 +7,7 @@ import {join} from 'path';
 import {Executor} from '../methods/methods.interface';
 import {AfterScreenshotOptions, ScreenshotOutput} from './afterScreenshot.interfaces';
 import hideRemoveElements from '../clientSideScripts/hideRemoveElements';
+import {yellow} from "chalk";
 
 /**
  * Methods that need to be executed after a screenshot has been taken
@@ -43,7 +44,19 @@ export default async function afterScreenshot(executor: Executor, options: After
   // Show elements again
   /* istanbul ignore else */
   if (hideElements.length > 0 || removeElements.length > 0) {
-    await executor(hideRemoveElements, {hide: hideElements, remove: removeElements}, false);
+    try {
+      await executor(hideRemoveElements, {hide: hideElements, remove: removeElements}, false);
+    } catch (e) {
+      console.log(yellow(`
+#####################################################################################
+ WARNING:
+ (One of) the elements that needed to be hidden or removed could not be found on the
+ page and caused this error
+ Error: ${e}
+ We made sure the test didn't break.
+#####################################################################################
+`));
+    }
   }
 
   // Remove the custom set css

diff --git a/lib/helpers/beforeScreenshot.ts b/lib/helpers/beforeScreenshot.ts
@@ -6,6 +6,7 @@ import getEnrichedInstanceData from '../methods/instanceData';
 import {BeforeScreenshotOptions, BeforeScreenshotResult} from './beforeScreenshot.interface';
 import {Executor} from '../methods/methods.interface';
 import hideRemoveElements from '../clientSideScripts/hideRemoveElements';
+import {yellow} from "chalk";
 
 /**
  * Methods that need to be executed before a screenshot will be taken
@@ -41,7 +42,19 @@ export default async function beforeScreenshot(
 
   // Hide and or Remove elements
   if (hideElements.length > 0 || removeElements.length > 0) {
-    await executor(hideRemoveElements, {hide: hideElements, remove: removeElements}, true);
+    try {
+      await executor(hideRemoveElements, {hide: hideElements, remove: removeElements}, true);
+    } catch (e) {
+      console.log(yellow(`
+#####################################################################################
+ WARNING:
+ (One of) the elements that needed to be hidden or removed could not be found on the
+ page and caused this error
+ Error: ${e}
+ We made sure the test didn't break.
+#####################################################################################
+`));
+    }
   }
 
   // Set some custom css

diff --git a/lib/methods/screenshots.ts b/lib/methods/screenshots.ts
@@ -1,3 +1,5 @@
+// @ts-ignore
+import {yellow} from 'chalk';
 import scrollToPosition from '../clientSideScripts/scrollToPosition';
 import getDocumentScrollHeight from '../clientSideScripts/getDocumentScrollHeight';
 import getAndroidStatusAddressToolBarHeight from '../clientSideScripts/getAndroidStatusAddressToolBarHeight';
@@ -116,7 +118,19 @@ export async function getFullPageScreenshotsDataNativeMobile(
 
     // Elements that need to be hidden after the first scroll for a fullpage scroll
     if (i === 1 && hideAfterFirstScroll.length > 0) {
-      await executor(hideRemoveElements, {hide: hideAfterFirstScroll, remove: []}, true);
+      try {
+        await executor(hideRemoveElements, {hide: hideAfterFirstScroll, remove: []}, true);
+      } catch (e) {
+        console.log(yellow(`
+#####################################################################################
+ WARNING:
+ (One of) the elements that needed to be hidden or removed could not be found on the
+ page and caused this error
+ Error: ${e}
+ We made sure the test didn't break.
+#####################################################################################
+`));
+      }
     }
 
     // Take the screenshot and get the width
@@ -155,7 +169,19 @@ export async function getFullPageScreenshotsDataNativeMobile(
 
   // Put back the hidden elements to visible
   if (hideAfterFirstScroll.length > 0) {
-    await executor(hideRemoveElements, {hide: hideAfterFirstScroll, remove: []}, false);
+    try {
+      await executor(hideRemoveElements, {hide: hideAfterFirstScroll, remove: []}, false);
+    } catch (e) {
+      console.log(yellow(`
+#####################################################################################
+ WARNING:
+ (One of) the elements that needed to be hidden or removed could not be found on the
+ page and caused this error
+ Error: ${e}
+ We made sure the test didn't break.
+#####################################################################################
+`));
+    }
   }
 
   return {
@@ -196,7 +222,19 @@ export async function getFullPageScreenshotsDataAndroidChromeDriver(
 
     // Elements that need to be hidden after the first scroll for a fullpage scroll
     if (i === 1 && hideAfterFirstScroll.length > 0) {
-      await executor(hideRemoveElements, {hide: hideAfterFirstScroll, remove: []}, true);
+      try {
+        await executor(hideRemoveElements, {hide: hideAfterFirstScroll, remove: []}, true);
+      } catch (e) {
+        console.log(yellow(`
+#####################################################################################
+ WARNING:
+ (One of) the elements that needed to be hidden or removed could not be found on the
+ page and caused this error
+ Error: ${e}
+ We made sure the test didn't break.
+#####################################################################################
+`));
+      }
     }
 
     // Take the screenshot
@@ -233,7 +271,19 @@ export async function getFullPageScreenshotsDataAndroidChromeDriver(
 
   // Put back the hidden elements to visible
   if (hideAfterFirstScroll.length > 0) {
-    await executor(hideRemoveElements, {hide: hideAfterFirstScroll, remove: []}, false);
+    try {
+      await executor(hideRemoveElements, {hide: hideAfterFirstScroll, remove: []}, false);
+    } catch (e) {
+      console.log(yellow(`
+#####################################################################################
+ WARNING:
+ (One of) the elements that needed to be hidden or removed could not be found on the
+ page and caused this error
+ Error: ${e}
+ We made sure the test didn't break.
+#####################################################################################
+`));
+    }
   }
 
   return {
@@ -272,7 +322,19 @@ export async function getFullPageScreenshotsDataDesktop(
 
     // Elements that need to be hidden after the first scroll for a fullpage scroll
     if (i === 1 && hideAfterFirstScroll.length > 0) {
-      await executor(hideRemoveElements, {hide: hideAfterFirstScroll, remove: []}, true);
+      try {
+        await executor(hideRemoveElements, {hide: hideAfterFirstScroll, remove: []}, true);
+      } catch (e) {
+        console.log(yellow(`
+#####################################################################################
+ WARNING:
+ (One of) the elements that needed to be hidden or removed could not be found on the
+ page and caused this error
+ Error: ${e}
+ We made sure the test didn't break.
+#####################################################################################
+`));
+      }
     }
 
     // Take the screenshot
@@ -320,7 +382,19 @@ export async function getFullPageScreenshotsDataDesktop(
 
   // Put back the hidden elements to visible
   if (hideAfterFirstScroll.length > 0) {
-    await executor(hideRemoveElements, {hide: hideAfterFirstScroll, remove: []}, false);
+    try {
+      await executor(hideRemoveElements, {hide: hideAfterFirstScroll, remove: []}, false);
+    } catch (e) {
+      console.log(yellow(`
+#####################################################################################
+ WARNING:
+ (One of) the elements that needed to be hidden or removed could not be found on the
+ page and caused this error
+ Error: ${e}
+ We made sure the test didn't break.
+#####################################################################################
+`));
+    }
   }
 
   return {