mirrors
/
uptime-kuma
mirror of https://github.com/louislam/uptime-kuma.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat(monitor condition): Remove the empty default condition creation (#5354)

This commit is contained in:
Ionys 2024-12-20 07:55:13 +01:00 committed by GitHub
parent efdffca06c
commit 2ecd7af89b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/EditMonitorConditions.vue
View File

@ -73,12 +73,6 @@ export default {
} }
}, },
created() {
if (this.model.length === 0) {
this.addCondition();
}
},
methods: { methods: {
getNewGroup() { getNewGroup() {
return { return {

14
test/e2e/specs/monitor-form.spec.js
View File

@ -28,16 +28,16 @@ test.describe("Monitor Form", () => {
await selectMonitorType(page); await selectMonitorType(page);
await page.getByTestId("add-condition-button").click(); await page.getByTestId("add-condition-button").click();
expect(await page.getByTestId("condition").count()).toEqual(2); // 1 added by default + 1 explicitly added expect(await page.getByTestId("condition").count()).toEqual(1); // 1 explicitly added
await page.getByTestId("add-group-button").click(); await page.getByTestId("add-group-button").click();
expect(await page.getByTestId("condition-group").count()).toEqual(1); expect(await page.getByTestId("condition-group").count()).toEqual(1);
expect(await page.getByTestId("condition").count()).toEqual(3); // 2 solo conditions + 1 condition in group expect(await page.getByTestId("condition").count()).toEqual(2); // 1 solo conditions + 1 condition in group
await screenshot(testInfo, page); await screenshot(testInfo, page);
await page.getByTestId("remove-condition").first().click(); await page.getByTestId("remove-condition").first().click();
expect(await page.getByTestId("condition").count()).toEqual(2); // 1 solo condition + 1 condition in group expect(await page.getByTestId("condition").count()).toEqual(1); // 0 solo condition + 1 condition in group
await page.getByTestId("remove-condition-group").first().click(); await page.getByTestId("remove-condition-group").first().click();
expect(await page.getByTestId("condition-group").count()).toEqual(0); expect(await page.getByTestId("condition-group").count()).toEqual(0);
@ -60,7 +60,10 @@ test.describe("Monitor Form", () => {
await resolveTypeSelect.getByRole("option", { name: "NS" }).click(); await resolveTypeSelect.getByRole("option", { name: "NS" }).click();
await page.getByTestId("add-condition-button").click(); await page.getByTestId("add-condition-button").click();
expect(await page.getByTestId("condition").count()).toEqual(2); // 1 added by default + 1 explicitly added expect(await page.getByTestId("condition").count()).toEqual(1); // 1 explicitly added
await page.getByTestId("add-condition-button").click();
expect(await page.getByTestId("condition").count()).toEqual(2); // 2 explicitly added
await page.getByTestId("condition-value").nth(0).fill("a.iana-servers.net"); await page.getByTestId("condition-value").nth(0).fill("a.iana-servers.net");
await page.getByTestId("condition-and-or").nth(0).selectOption("or"); await page.getByTestId("condition-and-or").nth(0).selectOption("or");
@ -89,7 +92,8 @@ test.describe("Monitor Form", () => {
await resolveTypeSelect.click(); await resolveTypeSelect.click();
await resolveTypeSelect.getByRole("option", { name: "NS" }).click(); await resolveTypeSelect.getByRole("option", { name: "NS" }).click();
expect(await page.getByTestId("condition").count()).toEqual(1); // 1 added by default await page.getByTestId("add-condition-button").click();
expect(await page.getByTestId("condition").count()).toEqual(1); // 1 explicitly added
await page.getByTestId("condition-value").nth(0).fill("definitely-not.net"); await page.getByTestId("condition-value").nth(0).fill("definitely-not.net");