fix battery grid charge e2e

evcc-io · andig · Jun 12, 2025 · Jun 12, 2025 · Jun 12, 2025 · Jun 12, 2025
commit 08e3776ac8a7f11e5cfc0e56de6eebebb7fb49ea
diff --git a/assets/js/components/Loadpoints/SettingsModal.vue b/assets/js/components/Loadpoints/SettingsModal.vue
@@ -12,7 +12,7 @@
 				:current-limit="smartCostLimit"
 				:smart-cost-type="smartCostType"
 				:currency="currency"
-				:is-loadpoint="true"
+				is-loadpoint
 				:loadpoint-id="Number(loadpointId)"
 				:multiple-loadpoints="multipleLoadpoints"
 				:possible="smartCostAvailable"

diff --git a/tests/battery-settings.spec.ts b/tests/battery-settings.spec.ts
@@ -1,6 +1,6 @@
 import { test, expect } from "@playwright/test";
 import { start, stop, baseUrl } from "./evcc";
-import { enableExperimental } from "./utils";
+import { enableExperimental, expectModalVisible, expectModalHidden } from "./utils";
 test.use({ baseURL: baseUrl() });
 
 test.beforeAll(async () => {
@@ -41,18 +41,21 @@ test.describe("battery settings", async () => {
     await enableExperimental(page);
     await page.getByTestId("topnavigation-button").click();
     await page.getByTestId("topnavigation-battery").click();
+    const modal = page.getByTestId("battery-settings-modal");
+    await expectModalVisible(modal);
 
-    await page.getByRole("link", { name: "Grid charging 🧪" }).click();
-    await page.getByLabel("Price limit").selectOption({ label: "≤ 50.0 ct/kWh" });
-    await expect(page.getByTestId("battery-settings-modal")).toContainText("5.0 ct – 50.0 ct");
+    await modal.getByRole("link", { name: "Grid charging 🧪" }).click();
+    await modal.getByLabel("Price limit").selectOption({ label: "≤ 50.0 ct/kWh" });
+    await expect(modal).toContainText("5.0 ct – 50.0 ct");
     await page.getByRole("button", { name: "Close" }).click();
-    await expect(page.getByTestId("battery-settings-modal")).not.toBeVisible();
+    await expectModalHidden(modal);
     await page.getByTestId("energyflow").click();
     await page.getByRole("button", { name: "grid charging active (≤ 50.0 ct)" }).click();
-    await expect(page.getByTestId("battery-settings-modal")).toBeVisible();
-    await page.getByLabel("Price limit").selectOption({ label: "≤ -10.0 ct/kWh" });
-    await page.getByRole("button", { name: "Close" }).click();
-    await expect(page.getByTestId("battery-settings-modal")).not.toBeVisible();
+    await expectModalVisible(modal);
+    await modal.getByLabel("Price limit").selectOption({ label: "≤ -10.0 ct/kWh" });
+    await modal.getByRole("button", { name: "Close" }).click();
+    await expectModalHidden(modal);
+    await expect(modal).not.toBeVisible();
     await expect(page.getByRole("button", { name: "grid charging when ≤ -10.0 ct" })).toBeVisible();
   });
 });
diff --git a/tests/utils.ts b/tests/utils.ts
@@ -2,7 +2,7 @@

 export async function enableExperimental(page: Page): Promise<void> {
  await page.getByTestId("topnavigation-button").click();
  await page.getByTestId("topnavigation-settings").click();
  await page.getByLabel("Experimental 🧪").click();
  await page.getByRole("button", { name: "Close" }).click();
  await expect(page.locator(".modal-backdrop")).not.toBeVisible();
@@ -16,7 +16,6 @@
 export async function expectModalHidden(modal: Locator): Promise<void> {
   await expect(modal).not.toBeVisible();
   await expect(modal).toHaveAttribute("aria-hidden", "true");
-  await expect(modal.page().locator(".modal-backdrop")).not.toBeVisible();
 }
 
 export async function editorClear(editor: Locator, iterations = 6): Promise<void> {