remove the element check from the evaluate call

Author: GuustMetz

test/public/defaults.js

@@ -278,12 +278,7 @@ module.exports.pressElement = async (page, selector, jsClick = false) => {
     await page.waitForFunction( (sel) => !!document.querySelector(sel), {}, selector);
 
     if (jsClick) {
-        await page.evaluate((sel) => {
-            const element = document.querySelector(sel);
-            if (element) {
-                element.click();
-            }
-        }, selector);
+        await page.$eval(selector, (element) => element.click());
     } else {
         await page.click(selector);
     }
@@ -982,3 +977,14 @@ module.exports.resetFilters = async (page) => {
         { timeout: 5000 },
     );
 };
+
+/**
+ * Fuction that waits for a button to become active
+ * @param {puppeteer.page} page page handler
+ * @param {string} selector Css selector for the button.
+ */
+module.exports.waitForButtonToBecomeActive = async (page, selector) => await page.waitForFunction((sel) => {
+        const button = document.querySelector(sel);
+        return button && !button.disabled;
+    }, {}, selector);
+

test/public/runs/overview.test.js

@@ -40,6 +40,7 @@ const {
     getColumnCellsInnerTexts,
     resetFilters,
     openFilteringPanel,
+    waitForButtonToBecomeActive,
 } = require('../defaults.js');
 const { RUN_QUALITIES, RunQualities } = require('../../../lib/domain/enums/RunQualities.js');
 const { resetDatabaseContent } = require('../../utilities/resetDatabaseContent.js');
@@ -867,12 +868,6 @@ module.exports = () => {
 
     describe("Export", () => {
         const EXPORT_RUNS_TRIGGER_SELECTOR = '#export-data-trigger';
-        const waitForExportButton = async () =>
-            await page.waitForFunction((selector) => {
-                const button = document.querySelector(selector);
-                return button && !button.disabled;
-            }, {}, EXPORT_RUNS_TRIGGER_SELECTOR);
-
 
         before(() => goToPage(page, 'run-overview'));
 
@@ -891,7 +886,7 @@ module.exports = () => {
             let exportModal = await page.$('#export-data-modal');
             expect(exportModal).to.be.null;
 
-            await waitForExportButton();
+            await waitForButtonToBecomeActive(EXPORT_RUNS_TRIGGER_SELECTOR);
             await page.$eval(EXPORT_RUNS_TRIGGER_SELECTOR, (button) => button.click());
             await page.waitForSelector('#export-data-modal', { timeout: 5000 });
             exportModal = await page.$('#export-data-modal');
@@ -900,7 +895,7 @@ module.exports = () => {
         });
 
         it('should successfully display information when export will be truncated', async () => {
-            await waitForExportButton();
+            await waitForButtonToBecomeActive(EXPORT_RUNS_TRIGGER_SELECTOR);
             await pressElement(page, EXPORT_RUNS_TRIGGER_SELECTOR, true);
 
             const truncatedExportWarning = await page.waitForSelector('#export-data-modal #truncated-export-warning');
@@ -920,7 +915,7 @@ module.exports = () => {
         });
 
         it('should successfully export filtered runs', async () => {
-            await waitForExportButton();
+            await waitForButtonToBecomeActive(EXPORT_RUNS_TRIGGER_SELECTOR);
             const targetFileName = 'data.json';
 
             // First export

test/public/runs/runsPerLhcPeriod.overview.test.js

@@ -32,6 +32,7 @@ const {
     expectColumnValues,
     openFilteringPanel,
     resetFilters,
+    waitForButtonToBecomeActive
 } = require('../defaults.js');
 const { RUN_QUALITIES, RunQualities } = require('../../../lib/domain/enums/RunQualities.js');
 const { resetDatabaseContent } = require('../../utilities/resetDatabaseContent.js');
@@ -77,12 +78,6 @@ module.exports = () => {
     });
     const EXPORT_RUNS_TRIGGER_SELECTOR = '#export-data-trigger';
 
-    const waitForExportButton = async () =>
-        await page.waitForFunction((selector) => {
-            const button = document.querySelector(selector);
-            return button && !button.disabled;
-        }, {}, EXPORT_RUNS_TRIGGER_SELECTOR);
-
     it('loads the page successfully', async () => {
         const response = await goToPage(page, 'runs-per-lhc-period', { queryParameters: { lhcPeriodId: 1 } });
 
@@ -219,7 +214,7 @@ module.exports = () => {
         });
 
         const targetFileName = 'data.json';
-        await waitForExportButton();
+        await waitForButtonToBecomeActive(EXPORT_RUNS_TRIGGER_SELECTOR);
         // First export
         await pressElement(page, EXPORT_RUNS_TRIGGER_SELECTOR, true);
         await page.waitForSelector('select.form-control', { timeout: 200 });
@@ -292,7 +287,7 @@ module.exports = () => {
         await navigateToRunsPerLhcPeriod(page, 1, 4);
 
         const targetFileName = 'data.csv';
-        await waitForExportButton();
+        await waitForButtonToBecomeActive(EXPORT_RUNS_TRIGGER_SELECTOR);
         // Export
         await pressElement(page, EXPORT_RUNS_TRIGGER_SELECTOR);
         await page.waitForSelector('#export-data-modal');

test/public/runs/runsPerSimulationPass.overview.test.js

@@ -31,6 +31,7 @@ const {
     testTableSortingByColumn,
     waitForTableLength,
     expectColumnValues,
+    waitForButtonToBecomeActive,
 } = require('../defaults.js');
 
 const { expect } = chai;
@@ -76,12 +77,6 @@ module.exports = () => {
 
     const EXPORT_RUNS_TRIGGER_SELECTOR = '#export-data-trigger';
 
-    const waitForExportButton = async () =>
-        await page.waitForFunction((selector) => {
-            const button = document.querySelector(selector);
-            return button && !button.disabled;
-        }, {}, EXPORT_RUNS_TRIGGER_SELECTOR);
-
     it('loads the page successfully', async () => {
         const response = await goToPage(page, 'runs-per-simulation-pass', { queryParameters: { simulationPassId: 2 } });
 
@@ -246,7 +241,7 @@ module.exports = () => {
         const targetFileName = 'data.json';
 
         // Export
-        await waitForExportButton();
+        await waitForButtonToBecomeActive(EXPORT_RUNS_TRIGGER_SELECTOR);
         await pressElement(page, EXPORT_RUNS_TRIGGER_SELECTOR);
         await page.waitForSelector('#export-data-modal');
         await page.waitForSelector('#send:disabled');
@@ -277,6 +272,7 @@ module.exports = () => {
         const targetFileName = 'data.csv';
 
         // Export
+        await waitForButtonToBecomeActive(EXPORT_RUNS_TRIGGER_SELECTOR);
         await pressElement(page, EXPORT_RUNS_TRIGGER_SELECTOR);
         await page.waitForSelector('#export-data-modal');
         await page.waitForSelector('#send:disabled');