Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 6 commits into from
Sep 20, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
793f42e
chore(deps-dev): bump @types/node from 20.16.5 to 22.5.5
dependabot[bot] Sep 19, 2024
efaefcf
chore(deps-dev): bump mariadb from 3.3.1 to 3.3.2
rH4rtinger Sep 19, 2024
5b64f35
test: added more error output for diff test for more error output dur…
rH4rtinger Sep 19, 2024
bc99df8
test: removed debug screenshots and added enabled check on button
rH4rtinger Sep 20, 2024
8260832
chore: removed unused imports
rH4rtinger Sep 20, 2024
f94cc9d
test: trying to add some more error handling for clicks
rH4rtinger Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Fabustus marked this conversation as resolved.
Show resolved Hide resolved
"mkdirp": "^3.0.1",
"rimraf": "^6.0.1",
"run-func": "^3.0.0",
Expand All @@ -450,4 +450,4 @@
"webpack-cli": "^5.1.4",
"webpack-shell-plugin-next": "^2.3.2"
}
}
}
8 changes: 7 additions & 1 deletion src/test/e2e/webview/WebviewTestUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand Down
13 changes: 5 additions & 8 deletions src/test/suite/DockerTestUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Fabustus marked this conversation as resolved.
Show resolved Hide resolved
): Promise<void> {
static async checkContainerStatus(containerName: string = "mariadb"): Promise<void> {
const fullContainerName = this.containerNamePrefix + containerName;

// check if container is running
Expand All @@ -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
Expand All @@ -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:
Expand Down
Loading