Fix Execute with caret button test on E2E FE

This patch fixes a flaky test - Connection toolbar buttons - Execute statement at the caret position

Change-Id: I33c9cd1e7d45392de3569b6b02c01374bfec65a1

Author: Guilherme Saraiva

gui/frontend/src/tests/e2e/lib/dbConnection.ts

@@ -83,6 +83,24 @@ export class DBConnection {
         throw new Error(`Could not find button '${button}'`);
     };
 
+    /**
+     * Clicks on a toolbar button and waits for the button to be active again.
+     * Throws an exception if the button is not found.
+     * @param driver The webdriver
+     * @param button Toolbar button tooltip
+     * @returns Promise resolving with the Toolbar button
+     */
+    public static clickToolbarButton = async (driver: WebDriver, button: string): Promise<void> => {
+        const toolbarButton = await DBConnection.getToolbarButton(driver, button);
+        await toolbarButton?.click();
+        await driver.wait(async () => {
+            return (await toolbarButton?.getAttribute("class"))?.includes("disabled");
+        }, explicitWait, `The button ${button} should be disabled after clicking it`);
+        await driver.wait(async () => {
+            return (await toolbarButton?.getAttribute("class"))?.includes("disabled") === false;
+        }, explicitWait, `The button ${button} should be enabled`);
+    };
+
     /**
      * Returns the result status of a query or instruction on the DB Editor
      *

gui/frontend/src/tests/e2e/tests/dbeditor/notebook.spec.ts

@@ -283,30 +283,14 @@ describe("Notebook", () => {
             await textArea.sendKeys(Key.RETURN);
             await DBConnection.writeSQL(driver, query3);
             await DBNotebooks.setMouseCursorAt(driver, query2);
-
-            let execCaretBtn = await DBConnection.getToolbarButton(driver, execCaret);
-            await execCaretBtn?.click();
-            await driver.wait(async () => {
-                await execCaretBtn?.click();
-
-                return DBConnection.getResultColumnName(driver, "address_id") !== undefined;
-            }, 3000, "No new results block was displayed");
-
+            await DBConnection.clickToolbarButton(driver, execCaret);
+            expect(await DBConnection.getResultColumnName(driver, "address_id")).toBeDefined();
             await DBNotebooks.setMouseCursorAt(driver, query1);
-            execCaretBtn = await DBConnection.getToolbarButton(driver, execCaret);
-            await driver.wait(new Condition("", async () => {
-                await execCaretBtn?.click();
-
-                return await DBConnection.getResultColumnName(driver, "actor_id") !== undefined;
-            }), explicitWait, "actor_id column was not found");
-
+            await DBConnection.clickToolbarButton(driver, execCaret);
+            expect(await DBConnection.getResultColumnName(driver, "actor_id")).toBeDefined();
             await DBNotebooks.setMouseCursorAt(driver, query3);
-            execCaretBtn = await DBConnection.getToolbarButton(driver, execCaret);
-            await driver.wait(new Condition("", async () => {
-                await execCaretBtn?.click();
-
-                return await DBConnection.getResultColumnName(driver, "category_id") !== undefined;
-            }), explicitWait, "category_id column was not found");
+            await DBConnection.clickToolbarButton(driver, execCaret);
+            expect(await DBConnection.getResultColumnName(driver, "category_id")).toBeDefined();
         } catch (e) {
             testFailed = true;
             throw e;