commit 54c477894d2222d7a2ec549f2843b16517c0a651 parent b8432123a9ea5f55cd8632ac5427e3940671d1e0 Author: Sebastian <sebasjm@taler-systems.com> Date: Wed, 1 Jul 2026 16:10:48 -0300 fix integration test Diffstat:
5 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/packages/taler-harness/README.md b/packages/taler-harness/README.md @@ -48,7 +48,7 @@ search for the driver and the browser. For example ``` -export BROWSER_PATH=/opt/browsers/chromedriver/linux-145.0.7632.46/chromedriver-linux64/:/opt/browsers/chrome/linux-145.0.7632.45/chrome-linux64/ +export BROWSER_PATH=/opt/browsers/chrome/linux-145.0.7632.45/chrome-linux64/ taler-harness run-integrationtests web-merchant-login ``` diff --git a/packages/taler-harness/src/harness/environments.ts b/packages/taler-harness/src/harness/environments.ts @@ -514,6 +514,9 @@ export function createBrowser(t: GlobalTestState) { case "firefox": { const firefoxOpts = new Firefox.Options(); firefoxOpts.addArguments("--headless"); + if (process.env.BROWSER_BINARY) { + firefoxOpts.setBinary(process.env.BROWSER_BINARY) + } const driver = new Builder() .forBrowser(Browser.FIREFOX) .setFirefoxOptions(firefoxOpts) @@ -527,6 +530,9 @@ export function createBrowser(t: GlobalTestState) { chromeOpts.addArguments("--no-sandbox", "-headless"); // chromeOpts.addArguments("--no-sandbox", "--headless","--no-startup-window"); chromeOpts.addArguments(`--incognito`); + if (process.env.BROWSER_BINARY) { + chromeOpts.setBinaryPath(process.env.BROWSER_BINARY) + } const driver = new Builder() .forBrowser(Browser.CHROME) diff --git a/packages/taler-harness/src/harness/harness.ts b/packages/taler-harness/src/harness/harness.ts @@ -2301,6 +2301,7 @@ export class BrowserService { `web-browser`, process.env.BROWSER_PATH ? { + ...process.env, PATH: process.env.BROWSER_PATH, } : undefined, @@ -2320,6 +2321,7 @@ export class BrowserService { `web-browser`, process.env.BROWSER_PATH ? { + ...process.env, PATH: process.env.BROWSER_PATH, } : undefined, diff --git a/packages/taler-harness/src/integrationtests/test-web-merchant-login.ts b/packages/taler-harness/src/integrationtests/test-web-merchant-login.ts @@ -42,7 +42,7 @@ export async function runWebMerchantLoginTest(t: GlobalTestState) { const form = await browser.findElement(By.css("form")); const username = await form.findElement(By.css("input[name=username]")); - const password = await form.findElement(By.css("input[name=token]")); + const password = await form.findElement(By.css("input[name=password]")); const submit = await form.findElement(By.css("button[type=submit]")); await browser.sleep(100); diff --git a/packages/taler-merchant-webui/src/paths/login/index.tsx b/packages/taler-merchant-webui/src/paths/login/index.tsx @@ -31,24 +31,20 @@ import { } from "@gnu-taler/taler-util"; import { Button, - Loading, undefinedIfEmpty, useNotificationContext, - useTranslationContext, + useTranslationContext } from "@gnu-taler/web-util/browser"; import { Fragment, h, VNode } from "preact"; -import { useState } from "preact/hooks"; +import { useMemo, useState } from "preact/hooks"; import { FormErrors, FormProvider, } from "../../components/form/FormProvider.js"; -import { doAutoFocus, Input } from "../../components/form/Input.js"; -import { Tooltip } from "../../components/Tooltip.js"; -import { useMerchantChallengeHandlerContext } from "../../context/challenge.js"; -import { useSessionContext } from "../../context/session.js"; -import { useMemo } from "preact/hooks"; import { InputPassword } from "../../components/form/InputPassword.js"; import { InputWithAddon } from "../../components/form/InputWithAddon.js"; +import { useMerchantChallengeHandlerContext } from "../../context/challenge.js"; +import { useSessionContext } from "../../context/session.js"; const TALER_SCREEN_ID = 79;