taler-typescript-core

commit ec23a21b5f2771bf16722481ddd32010d9843093
parent 2d44d0bd463a691450939d91b5be3c513e41abe3
Author: Florian Dold <florian@dold.me>
Date:   Thu, 12 Mar 2026 17:34:51 +0100

harness: fix bad check in kyc-merchant-deposit-rewrite

Diffstat:
M
packages/taler-harness/src/harness/harness.ts
 | 
3
++-
M
packages/taler-harness/src/integrationtests/test-kyc-merchant-deposit-rewrite.ts
 | 
3
++-
M
packages/taler-harness/src/integrationtests/test-payment-abort.ts
 | 
20
+++++++++++++++-----

3 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/packages/taler-harness/src/harness/harness.ts b/packages/taler-harness/src/harness/harness.ts
@@ -2356,8 +2356,9 @@ export class MerchantService implements MerchantServiceInterface {
       "${TALER_DATA_HOME}/merchant/merchant.priv",
     );
     config.setString("merchantdb-postgres", "config", mc.database);
-    // Do not contact demo.taler.net exchange in tests
+    // Do not contact exchange in tests
     config.setString("merchant-exchange-kudos", "disabled", "yes");
+    config.setString("merchant-exchange-chf", "disabled", "yes");
     config.writeTo(cfgFilename, { excludeDefaults: true });
 
     return new MerchantService(gc, mc, cfgFilename);
diff --git a/packages/taler-harness/src/integrationtests/test-kyc-merchant-deposit-rewrite.ts b/packages/taler-harness/src/integrationtests/test-kyc-merchant-deposit-rewrite.ts
@@ -207,8 +207,9 @@ export async function runKycMerchantDepositRewriteTest(t: GlobalTestState) {
       const d = await merchantApi.getCurrentInstanceKycStatus(
         merchantAdminAccessToken,
       );
+      logger.info(`status: ${j2s(d)}`);
       t.assertTrue(d.type === "ok");
-      if (d.body.kyc_data[0].payto_kycauths) {
+      if (d.body.kyc_data[0].status == MerchantAccountKycStatus.KYC_REQUIRED) {
         return d.body;
       }
       return undefined;
diff --git a/packages/taler-harness/src/integrationtests/test-payment-abort.ts b/packages/taler-harness/src/integrationtests/test-payment-abort.ts
@@ -40,8 +40,14 @@ import { GlobalTestState, harnessHttpLib } from "../harness/harness.js";
 export async function runPaymentAbortTest(t: GlobalTestState) {
   // Set up test environment
 
-  const { walletClient, bank, exchange, faultyMerchant, faultyExchange, merchantAdminAccessToken } =
-    await createFaultInjectedMerchantTestkudosEnvironment(t);
+  const {
+    walletClient,
+    bank,
+    exchange,
+    faultyMerchant,
+    faultyExchange,
+    merchantAdminAccessToken,
+  } = await createFaultInjectedMerchantTestkudosEnvironment(t);
 
   // Withdraw digital cash into the wallet.
 
@@ -72,9 +78,13 @@ export async function runPaymentAbortTest(t: GlobalTestState) {
   );
 
   let orderStatus = succeedOrThrow(
-    await merchantClient.getOrderDetails(merchantAdminAccessToken, orderResp.order_id, {
-      sessionId: "mysession-one",
-    }),
+    await merchantClient.getOrderDetails(
+      merchantAdminAccessToken,
+      orderResp.order_id,
+      {
+        sessionId: "mysession-one",
+      },
+    ),
   );
 
   t.assertTrue(orderStatus.order_status === "unpaid");