From 6d32c898c306ffc829a28ae8aaaf40b7a5053d77 Mon Sep 17 00:00:00 2001 From: Michael Geers Date: Fri, 27 Jun 2025 15:13:16 +0200 Subject: [PATCH] Battery grid charge non experimental (#22090) --- assets/js/components/Battery/BatterySettingsModal.vue | 9 ++------- tests/battery-settings.spec.ts | 5 ++--- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/assets/js/components/Battery/BatterySettingsModal.vue b/assets/js/components/Battery/BatterySettingsModal.vue index 2a2d21803..8b000d597 100644 --- a/assets/js/components/Battery/BatterySettingsModal.vue +++ b/assets/js/components/Battery/BatterySettingsModal.vue @@ -25,7 +25,7 @@ href="#" @click.prevent="showGridTab" > - {{ $t("batterySettings.gridChargeTab") }} 🧪 + {{ $t("batterySettings.gridChargeTab") }} @@ -313,12 +313,7 @@ export default defineComponent({ return this.battery.some(({ controllable }) => controllable); }, gridChargePossible() { - return ( - this.controllable && - this.isModalVisible && - this.smartCostAvailable && - this.$hiddenFeatures() - ); + return this.controllable && this.isModalVisible && this.smartCostAvailable; }, bufferOptions() { const options = []; diff --git a/tests/battery-settings.spec.ts b/tests/battery-settings.spec.ts index cd7c85bd4..0b536edb2 100644 --- 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, expectModalVisible, expectModalHidden } from "./utils"; +import { expectModalVisible, expectModalHidden } from "./utils"; test.use({ baseURL: baseUrl() }); test.beforeAll(async () => { @@ -38,13 +38,12 @@ test.describe("battery settings", async () => { test("grid charging", async ({ page }) => { await page.goto("/"); - 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 modal.getByRole("link", { name: "Grid charging 🧪" }).click(); + 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();