commit 358113dca3dd800f2cb42e64045197e60e348a3e
parent 35b0d41da52f97d0c3565cb27887688784d3d45e
Author: Florian Dold <florian@dold.me>
Date: Sun, 8 Mar 2026 13:41:34 +0100
harness: fix test filename
Diffstat:
3 files changed, 67 insertions(+), 67 deletions(-)
diff --git a/packages/taler-harness/src/integrationtests/test-web-merchant-login.ts b/packages/taler-harness/src/integrationtests/test-web-merchant-login.ts
@@ -0,0 +1,65 @@
+/*
+ This file is part of GNU Taler
+ (C) 2021 Taler Systems S.A.
+
+ GNU Taler is free software; you can redistribute it and/or modify it under the
+ terms of the GNU General Public License as published by the Free Software
+ Foundation; either version 3, or (at your option) any later version.
+
+ GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along with
+ GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
+ */
+
+/**
+ * Imports.
+ */
+import { createSimpleTestkudosEnvironmentV3 } from "harness/environments.js";
+import { By } from "selenium-webdriver";
+import {
+ GlobalTestState,
+ MERCHANT_DEFAULT_AUTH,
+} from "../harness/harness.js";
+
+/**
+ * Do basic checks on instance management and authentication.
+ */
+export async function runWebMerchantLoginTest(t: GlobalTestState) {
+ // Set up test environment
+
+ const { merchant, createBrowser } =
+ await createSimpleTestkudosEnvironmentV3(t);
+
+ const browser = await createBrowser({});
+
+ await browser.get(merchant.makeInstanceBaseUrl());
+
+ const title = await browser.getTitle();
+
+ t.assertDeepEqual("GNU Taler Merchant Backoffice", title);
+
+ await browser.manage().setTimeouts({ implicit: 2000 });
+
+ 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 submit = await form.findElement(By.css("button[type=submit]"));
+ await browser.sleep(100);
+
+ const inferedUsername = await username.getAttribute("value")
+ t.assertTrue(inferedUsername === "admin");
+ await password.sendKeys(MERCHANT_DEFAULT_AUTH.password);
+ await submit.click();
+
+ await browser.sleep(100);
+
+ const nousername = await browser.findElement(By.css("aside"));
+ t.assertTrue(nousername !== undefined);
+
+ await browser.quit();
+}
+
+runWebMerchantLoginTest.suites = ["web", "merchant"];
diff --git a/packages/taler-harness/src/integrationtests/testrunner.ts b/packages/taler-harness/src/integrationtests/testrunner.ts
@@ -48,7 +48,6 @@ import { runDenomLostComplexTest } from "./test-denom-lost-complex.js";
import { runDenomLostTest } from "./test-denom-lost.js";
import { runDenomUnofferedTest } from "./test-denom-unoffered.js";
import { runDepositFaultTest } from "./test-deposit-fault.js";
-import { runWalletDepositLargeTest } from "./test-wallet-deposit-large.js";
import { runDepositMergeTest } from "./test-deposit-merge.js";
import { runDepositTooLargeTest } from "./test-deposit-too-large.js";
import { runDepositTwiceTest } from "./test-deposit-twice.js";
@@ -186,6 +185,7 @@ import { runWalletCryptoWorkerTest } from "./test-wallet-cryptoworker.js";
import { runWalletDblessTest } from "./test-wallet-dbless.js";
import { runWalletDd48Test } from "./test-wallet-dd48.js";
import { runWalletDenomExpireTest } from "./test-wallet-denom-expire.js";
+import { runWalletDepositLargeTest } from "./test-wallet-deposit-large.js";
import { runWalletDevExperimentsTest } from "./test-wallet-dev-experiments.js";
import { runWalletDevexpFakeprotoverTest } from "./test-wallet-devexp-fakeprotover.js";
import { runWalletExchangeFeaturesTest } from "./test-wallet-exchange-features.js";
@@ -207,6 +207,7 @@ import { runWalletTransactionsTest } from "./test-wallet-transactions.js";
import { runWalletWirefeesTest } from "./test-wallet-wirefees.js";
import { runWalletWithdrawalRedenominateTest } from "./test-wallet-withdrawal-redenominate.js";
import { runWallettestingTest } from "./test-wallettesting.js";
+import { runWebMerchantLoginTest } from "./test-web-merchant-login.js";
import { runWithdrawalAbortBankTest } from "./test-withdrawal-abort-bank.js";
import { runWithdrawalAmountTest } from "./test-withdrawal-amount.js";
import { runWithdrawalBankIntegratedTest } from "./test-withdrawal-bank-integrated.js";
@@ -222,7 +223,6 @@ import { runWithdrawalHugeTest } from "./test-withdrawal-huge.js";
import { runWithdrawalIdempotentTest } from "./test-withdrawal-idempotent.js";
import { runWithdrawalManualTest } from "./test-withdrawal-manual.js";
import { runWithdrawalPrepareTest } from "./test-withdrawal-prepare.js";
-import { runWebMerchantLoginTest } from "./web/test-merchant-login.js";
/**
* Test runner.
diff --git a/packages/taler-harness/src/integrationtests/web/test-merchant-login.ts b/packages/taler-harness/src/integrationtests/web/test-merchant-login.ts
@@ -1,65 +0,0 @@
-/*
- This file is part of GNU Taler
- (C) 2021 Taler Systems S.A.
-
- GNU Taler is free software; you can redistribute it and/or modify it under the
- terms of the GNU General Public License as published by the Free Software
- Foundation; either version 3, or (at your option) any later version.
-
- GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY
- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along with
- GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
- */
-
-/**
- * Imports.
- */
-import { createSimpleTestkudosEnvironmentV3 } from "harness/environments.js";
-import { By } from "selenium-webdriver";
-import {
- GlobalTestState,
- MERCHANT_DEFAULT_AUTH,
-} from "../../harness/harness.js";
-
-/**
- * Do basic checks on instance management and authentication.
- */
-export async function runWebMerchantLoginTest(t: GlobalTestState) {
- // Set up test environment
-
- const { merchant, createBrowser } =
- await createSimpleTestkudosEnvironmentV3(t);
-
- const browser = await createBrowser({});
-
- await browser.get(merchant.makeInstanceBaseUrl());
-
- const title = await browser.getTitle();
-
- t.assertDeepEqual("GNU Taler Merchant Backoffice", title);
-
- await browser.manage().setTimeouts({ implicit: 2000 });
-
- 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 submit = await form.findElement(By.css("button[type=submit]"));
- await browser.sleep(100);
-
- const inferedUsername = await username.getAttribute("value")
- t.assertTrue(inferedUsername === "admin");
- await password.sendKeys(MERCHANT_DEFAULT_AUTH.password);
- await submit.click();
-
- await browser.sleep(100);
-
- const nousername = await browser.findElement(By.css("aside"));
- t.assertTrue(nousername !== undefined);
-
- await browser.quit();
-}
-
-runWebMerchantLoginTest.suites = ["web", "merchant"];
