CPS-356: Refactor code

compucorp · Mar 2, 2021 · f260db3 · f260db3
1 parent 62e674e
commit f260db3
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 46 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/tests/backstop_data/engine_scripts/puppet/mouse-events-helper.js b/tests/backstop_data/engine_scripts/puppet/mouse-events-helper.js
@@ -2,7 +2,7 @@
 
 const Utility = require('./utility.js');
 
-module.exports = async (page, scenario, viewport, dontWait) => {
+module.exports = async (options) => {
   const actions = [
     { name: 'hoverSelector', execute: hoverSelectorAction },
     { name: 'hoverSelectors', execute: hoverSelectorAction },
@@ -11,20 +11,21 @@ module.exports = async (page, scenario, viewport, dontWait) => {
   ];
 
   for (const action of actions) {
-    const scenarioHasAction = !!scenario[action.name];
+    const scenarioHasAction = !!options.scenario[action.name];
 
-    scenarioHasAction && await action.execute(page, scenario, viewport, dontWait);
+    scenarioHasAction && await action.execute(options);
   }
 };
 
 /**
  * Action handler for hover event
  *
- * @param {object} page pupettter engine object
- * @param {object} scenario object of each scenario
- * @param {object} viewport viewport configurations
+ * @param {object} options options
+ * @param {object} options.page pupettter engine object
+ * @param {object} options.scenario object of each scenario
+ * @param {object} options.viewport viewport configurations
  */
-async function hoverSelectorAction (page, scenario, viewport) {
+async function hoverSelectorAction ({ page, scenario, viewport }) {
   const hoverSelectors = scenario.hoverSelectors || [scenario.hoverSelector];
   const utility = new Utility(page, scenario, viewport);
 
@@ -40,12 +41,13 @@ async function hoverSelectorAction (page, scenario, viewport) {
 /**
  * Action handler for click event
  *
- * @param {object} page pupettter engine object
- * @param {object} scenario object of each scenario
- * @param {object} viewport viewport configurations
- * @param {boolean} dontWait whether to apply additional wait
+ * @param {object} options options
+ * @param {object} options.page pupettter engine object
+ * @param {object} options.scenario object of each scenario
+ * @param {object} options.viewport viewport configurations
+ * @param {boolean} options.wait whether to apply additional wait
  */
-async function clickSelectorAction (page, scenario, viewport, dontWait) {
+async function clickSelectorAction ({ page, scenario, viewport, wait = 1000 }) {
   const clickSelectors = scenario.clickSelectors || [scenario.clickSelector];
   const utility = new Utility(page, scenario, viewport);
 
@@ -60,8 +62,6 @@ async function clickSelectorAction (page, scenario, viewport, dontWait) {
       await utility.waitForUIModalLoad();
     }
 
-    if (!dontWait) {
-      await page.waitFor(1000);
-    }
+    await page.waitFor(wait);
   }
 }
diff --git a/tests/backstop_data/engine_scripts/puppet/on-ready.js b/tests/backstop_data/engine_scripts/puppet/on-ready.js
@@ -8,7 +8,11 @@ module.exports = async (page, scenario, vp) => {
 
   await utility.waitForAngular();
 
-  await mouseEventsHelper(page, scenario, null, true);
+  await mouseEventsHelper({
+    page,
+    scenario,
+    wait: 0
+  });
 
   if (scenario.isUIBPopover) {
     // Clone the popover to a new element so that it doesn't get lost

diff --git a/tests/backstop_data/engine_scripts/puppet/utility.js b/tests/backstop_data/engine_scripts/puppet/utility.js
@@ -106,8 +106,8 @@ module.exports = class CrmPage {
 
     // remove drupal/civicrm error logging, which creates difference
     await this.removeElements('#console');
-
-    await this.closeSystemErrorNotification();
+    // remove system error notification
+    await this.removeElements('#crm-notification-container a[title="close"]');
   }
 
   /**
@@ -210,22 +210,6 @@ module.exports = class CrmPage {
     }
   }
 
-  /**
-   * Waits for the System Error Notification to close.
-   */
-  async closeSystemErrorNotification () {
-    try {
-      const isSystemErrorNotificationVisible = await this.isElementVisible('#crm-notification-container a[title="close"]');
-
-      if (isSystemErrorNotificationVisible) {
-        await this.engine.click('#crm-notification-container a[title="close"]');
-        await this.engine.waitFor(1000);
-      }
-    } catch (e) {
-      console.log('System Error Notification not found');
-    }
-  }
-
   /**
    * @param {string} selector - the css selector for the element to wait
    */