Merge pull request #5 from aditosoftware/dependabot/npm_and_yarn/type…

…s/node-22.5.5

chore(deps-dev): bump @types/node from 20.16.5 to 22.5.5

package.json

@@ -427,7 +427,7 @@
     "@types/chai-string": "^1.4.5",
     "@types/download": "^8.0.5",
     "@types/mocha": "^10.0.8",
-    "@types/node": "20.x",
+    "@types/node": "22.x",
     "@types/sinon": "^17.0.3",
     "@types/vscode": "^1.84.0",
     "@vscode/test-cli": "^0.0.10",
@@ -437,7 +437,7 @@
     "chai-string": "^1.5.0",
     "concurrently": "^9.0.1",
     "copyfiles": "^2.4.1",
-    "mariadb": "^3.3.1",
+    "mariadb": "^3.3.2",
     "mkdirp": "^3.0.1",
     "rimraf": "^6.0.1",
     "run-func": "^3.0.0",
@@ -450,4 +450,4 @@
     "webpack-cli": "^5.1.4",
     "webpack-shell-plugin-next": "^2.3.2"
   }
-}
+}

src/test/e2e/webview/WebviewTestUtils.ts

@@ -184,8 +184,14 @@ export class WebviewTestUtils {
       await databaseName.sendKeys(config.databaseName, Key.TAB);
 
       const button = await webView.findWebElement(By.id(config.buttonToClick));
+      assert.deepStrictEqual(await button.getAttribute("id"), config.buttonToClick, "button id");
 
-      await button.click();
+      try {
+        await button.click();
+      } catch {
+        await webView.switchToFrame(1000);
+        await webView.getDriver().executeScript("arguments[0].click();", button);
+      }
     });
 
     if (config.buttonToClick === "saveButton") {

src/test/suite/DockerTestUtils.ts

@@ -117,13 +117,9 @@ export class DockerTestUtils {
    * Checks the status of the specified container and the availability of the database within it.
    *
    * @param containerName - The name of the container to check.
-   * @param dbExecutable - The executable for the database client.
    * @returns A Promise that resolves when the container status and database availability are checked.
    */
-  static async checkContainerStatus(
-    containerName: string = "mariadb",
-    dbExecutable: string = "mysql-client"
-  ): Promise<void> {
+  static async checkContainerStatus(containerName: string = "mariadb"): Promise<void> {
     const fullContainerName = this.containerNamePrefix + containerName;
 
     // check if container is running
@@ -134,7 +130,7 @@ export class DockerTestUtils {
         case "mariadb":
           // install mysql to the container
           await this.repeatCommand(
-            `${this.docker} exec ${fullContainerName} sh -c "apt-get update && apt-get install -y ${dbExecutable}"`
+            `${this.docker} exec ${fullContainerName} sh -c "apt-get update && apt-get install -y mysql-client"`
           );
 
           // check if database is available
@@ -147,10 +143,11 @@ export class DockerTestUtils {
         case "postgres":
           await this.repeatCommand(`${this.docker} exec ${fullContainerName} psql ${this.dbName} -c "SELECT 1;"`);
 
-          //
-          await this.executeCommand(
+          // create the needed schema
+          await this.repeatCommand(
             `${this.docker} exec ${fullContainerName} psql ${this.dbName} -c "CREATE SCHEMA ${this.dbName};"`
           );
+
           break;
 
         default: