From e6665ecbea6a2350536ff7224489a0c3a30005ef Mon Sep 17 00:00:00 2001
From: Jaifroid <egk10@cam.ac.uk>
Date: Sat, 19 Aug 2023 07:41:28 +0100
Subject: [PATCH] Fix legacy test for IE mode (#1059)

---
 tests/legacy-ray_charles.e2e.spec.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/tests/legacy-ray_charles.e2e.spec.js b/tests/legacy-ray_charles.e2e.spec.js
index 1169a8a91..f936096d8 100644
--- a/tests/legacy-ray_charles.e2e.spec.js
+++ b/tests/legacy-ray_charles.e2e.spec.js
@@ -131,16 +131,20 @@ function runTests (driver, modes) {
                         const elementIsVisible = await driver.executeScript('var el=arguments[0]; el.scrollIntoView(true); setTimeout(function () {el.click();}, 50); return el.offsetParent;', modeSelector);
                         return elementIsVisible;
                     }, 5000);
-                    // Pause for 1.3 seconds to allow app to reload
-                    await driver.sleep(1300);
+                    // Pause for timeout
+                    await driver.sleep(500);
                     // Check for and click any approve button in dialogue box
                     try {
                         const activeAlertModal = await driver.findElement(By.css('.modal[style*="display: block"]'));
                         if (activeAlertModal) {
                             // Check if ServiceWorker mode API is supported
-                            serviceWorkerAPI = await driver.findElement(By.id('modalLabel')).getText().then(function (alertText) {
-                                return !/ServiceWorker\sAPI\snot\savailable/i.test(alertText);
-                            });
+                            if (mode === 'serviceworker') {
+                                serviceWorkerAPI = await driver.findElement(By.id('modalLabel')).getText().then(function (alertText) {
+                                    const supported = !/unsupported|not\savailable/i.test(alertText);
+                                    console.log(supported ? '' : '\x1b[33m%s\x1b[0m', '      ' + alertText);
+                                    return supported;
+                                })
+                            }
                         }
                         const approveButton = await driver.findElement(By.id('approveConfirm'));
                         await approveButton.click();
@@ -182,7 +186,7 @@ function runTests (driver, modes) {
                         }
                     } else {
                         // Skip remaining SW mode tests if the browser does not support the SW API
-                        console.log('\x1b[33m%s\x1b[0m', '      Skipping SW mode tests because browser does not support API');
+                        console.log('\x1b[33m%s\x1b[0m', '      Skipping SW mode tests...');
                         await driver.quit();
                     }
                 });