separate the click from the waitForFunction check

Author: GuustMetz

test/public/defaults.js

@@ -275,25 +275,16 @@ exports.waitForNavigation = waitForNavigation;
  * @returns {Promise} Whether the element was clickable or not.
  */
 module.exports.pressElement = async (page, selector, jsClick = false) => {
-    await page.waitForFunction(
-        (sel, isJsClick) => {
-            const element = document.querySelector(sel);
-
-            if (!element) {
-                return false;
-            }
+    await page.waitForFunction( (sel) => !!document.querySelector(sel), {}, selector);
 
-            if (isJsClick) {
+    if (jsClick) {
+        await page.evaluate((sel) => {
+            const element = document.querySelector(sel);
+            if (element) {
                 element.click();
             }
-
-            return true;
-        },
-        {},
-        selector, jsClick
-    );
-
-    if (!jsClick) {
+        }, selector);
+    } else {
         await page.click(selector);
     }
 };

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

@@ -75,6 +75,13 @@ module.exports = () => {
     after(async () => {
         [page, browser] = await defaultAfter(page, browser);
     });
+    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 } });
@@ -204,7 +211,6 @@ module.exports = () => {
         await waitForTableLength(page, 4);
     });
 
-    const EXPORT_RUNS_TRIGGER_SELECTOR = '#export-data-trigger';
 
     it('should successfully export all runs per lhc Period', async () => {
         await page.evaluate(() => {
@@ -213,7 +219,7 @@ module.exports = () => {
         });
 
         const targetFileName = 'data.json';
-
+        await waitForExportButton();
         // First export
         await pressElement(page, EXPORT_RUNS_TRIGGER_SELECTOR, true);
         await page.waitForSelector('select.form-control', { timeout: 200 });
@@ -286,9 +292,9 @@ module.exports = () => {
         await navigateToRunsPerLhcPeriod(page, 1, 4);
 
         const targetFileName = 'data.csv';
-        
+        await waitForExportButton();
         // Export
-        await pressElement(page, '#export-data-trigger');
+        await pressElement(page, EXPORT_RUNS_TRIGGER_SELECTOR);
         await page.waitForSelector('#export-data-modal');
         await page.waitForSelector('#send:disabled');
         await page.waitForSelector('.form-control');

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

@@ -74,6 +74,14 @@ module.exports = () => {
         [page, browser] = await defaultAfter(page, browser);
     });
 
+    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 } });
 
@@ -235,11 +243,10 @@ module.exports = () => {
 
     it('should successfully export runs', async () => {
         await navigateToRunsPerSimulationPass(page, 1, 2, 3);
-        const EXPORT_RUNS_TRIGGER_SELECTOR = '#export-data-trigger';
-
         const targetFileName = 'data.json';
 
         // Export
+        await waitForExportButton();
         await pressElement(page, EXPORT_RUNS_TRIGGER_SELECTOR);
         await page.waitForSelector('#export-data-modal');
         await page.waitForSelector('#send:disabled');
@@ -270,7 +277,7 @@ module.exports = () => {
         const targetFileName = 'data.csv';
 
         // Export
-        await pressElement(page, '#export-data-trigger');
+        await pressElement(page, EXPORT_RUNS_TRIGGER_SELECTOR);
         await page.waitForSelector('#export-data-modal');
         await page.waitForSelector('#send:disabled');
         await page.waitForSelector('.form-control');