From b13bd85215ad64e7a2764ac7e7fee5945ffa1c07 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Tue, 29 Aug 2023 09:02:16 +0200
Subject: taler-harness: remove axios usage, renovate some tests

---
 .../integrationtests/test-merchant-longpolling.ts  | 33 ++++++++--------------
 1 file changed, 11 insertions(+), 22 deletions(-)

(limited to 'packages/taler-harness/src/integrationtests/test-merchant-longpolling.ts')

diff --git a/packages/taler-harness/src/integrationtests/test-merchant-longpolling.ts b/packages/taler-harness/src/integrationtests/test-merchant-longpolling.ts
index 59f23fe5d..8d271c5d1 100644
--- a/packages/taler-harness/src/integrationtests/test-merchant-longpolling.ts
+++ b/packages/taler-harness/src/integrationtests/test-merchant-longpolling.ts
@@ -24,20 +24,18 @@ import {
   codecForMerchantOrderStatusUnpaid,
 } from "@gnu-taler/taler-util";
 import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
-import axiosImp from "axios";
-import { GlobalTestState, MerchantPrivateApi } from "../harness/harness.js";
+import { GlobalTestState, MerchantPrivateApi, harnessHttpLib } from "../harness/harness.js";
 import {
   createSimpleTestkudosEnvironmentV2,
-  withdrawViaBankV2
+  withdrawViaBankV2,
 } from "../harness/helpers.js";
-const axios = axiosImp.default;
+import { createPlatformHttpLib } from "@gnu-taler/taler-util/http";
 
 /**
  * Run test for basic, bank-integrated withdrawal.
  */
 export async function runMerchantLongpollingTest(t: GlobalTestState) {
   // Set up test environment
-
   const { walletClient, bank, exchange, merchant } =
     await createSimpleTestkudosEnvironmentV2(t);
 
@@ -83,9 +81,7 @@ export async function runMerchantLongpollingTest(t: GlobalTestState) {
   // First, request order status without longpolling
   {
     console.log("requesting", publicOrderStatusUrl.href);
-    let publicOrderStatusResp = await axios.get(publicOrderStatusUrl.href, {
-      validateStatus: () => true,
-    });
+    let publicOrderStatusResp = await harnessHttpLib.fetch(publicOrderStatusUrl.href);
 
     if (publicOrderStatusResp.status != 402) {
       throw Error(
@@ -98,9 +94,7 @@ export async function runMerchantLongpollingTest(t: GlobalTestState) {
   publicOrderStatusUrl.searchParams.set("timeout_ms", "500");
 
   console.log("requesting", publicOrderStatusUrl.href);
-  let publicOrderStatusResp = await axios.get(publicOrderStatusUrl.href, {
-    validateStatus: () => true,
-  });
+  let publicOrderStatusResp = await harnessHttpLib.fetch(publicOrderStatusUrl.href);
 
   if (publicOrderStatusResp.status != 402) {
     throw Error(
@@ -109,7 +103,7 @@ export async function runMerchantLongpollingTest(t: GlobalTestState) {
   }
 
   let pubUnpaidStatus = codecForMerchantOrderStatusUnpaid().decode(
-    publicOrderStatusResp.data,
+    await publicOrderStatusResp.json(),
   );
 
   console.log(pubUnpaidStatus);
@@ -135,9 +129,7 @@ export async function runMerchantLongpollingTest(t: GlobalTestState) {
     preparePayResp.contractTermsHash,
   );
 
-  let publicOrderStatusPromise = axios.get(publicOrderStatusUrl.href, {
-    validateStatus: () => true,
-  });
+  let publicOrderStatusPromise = harnessHttpLib.fetch(publicOrderStatusUrl.href);
 
   t.assertTrue(preparePayResp.status === PreparePayResultType.PaymentPossible);
 
@@ -152,15 +144,12 @@ export async function runMerchantLongpollingTest(t: GlobalTestState) {
   }
 
   pubUnpaidStatus = codecForMerchantOrderStatusUnpaid().decode(
-    publicOrderStatusResp.data,
+    await publicOrderStatusResp.json(),
   );
 
-  const confirmPayRes = await walletClient.call(
-    WalletApiOperation.ConfirmPay,
-    {
-      proposalId: proposalId,
-    },
-  );
+  const confirmPayRes = await walletClient.call(WalletApiOperation.ConfirmPay, {
+    proposalId: proposalId,
+  });
 
   t.assertTrue(confirmPayRes.type === ConfirmPayResultType.Done);
 }
-- 
cgit v1.2.3