taler-typescript-core

commit 29399f02b4d33d2d6f1846eff69acdced244e389
parent d7acef9bde835ba673ad6f73ae0034daf222e83b
Author: Florian Dold <florian@dold.me>
Date:   Mon,  7 Apr 2025 22:07:21 +0200

harness: fix more merchant tests

Diffstat:
M
packages/taler-harness/src/integrationtests/test-merchant-instances-urls.ts
 | 
60
++++++++++++++++++++++++++++++------------------------------
M
packages/taler-harness/src/integrationtests/test-merchant-instances.ts
 | 
4
++--

2 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/packages/taler-harness/src/integrationtests/test-merchant-instances-urls.ts b/packages/taler-harness/src/integrationtests/test-merchant-instances-urls.ts
@@ -56,13 +56,13 @@ export async function runMerchantInstancesUrlsTest(t: GlobalTestState) {
   await merchant.start();
   await merchant.pingUntilAvailable();
 
-  const tok = "secret-token:i-am-default" as AccessToken;
-  const clientForDefault = new TalerMerchantManagementHttpClient(
+  const tok = "secret-token:i-am-admin" as AccessToken;
+  const clientForAdminInst = new TalerMerchantManagementHttpClient(
     merchant.makeInstanceBaseUrl(),
   );
 
   succeedOrThrow(
-    await clientForDefault.createInstance(tok, {
+    await clientForAdminInst.createInstance(tok, {
       id: "admin",
       address: {},
       use_stefan: true,
@@ -73,17 +73,17 @@ export async function runMerchantInstancesUrlsTest(t: GlobalTestState) {
         Duration.fromSpec({ seconds: 60 }),
       ),
       jurisdiction: {},
-      name: "My Default Instance",
+      name: "My Admin Instance",
       auth: {
         method: MerchantAuthMethod.TOKEN,
-        token: "secret-token:i-am-default" as AccessToken,
+        token: "secret-token:i-am-admin" as AccessToken,
       },
     }),
   );
 
   succeedOrThrow(
-    await clientForDefault.createInstance(
-      "secret-token:i-am-default" as AccessToken,
+    await clientForAdminInst.createInstance(
+      "secret-token:i-am-admin" as AccessToken,
       {
         id: "myinst",
         address: {},
@@ -116,69 +116,69 @@ export async function runMerchantInstancesUrlsTest(t: GlobalTestState) {
     t.assertDeepEqual(resp.status, expectedStatus);
   }
 
-  const tokDefault = "secret-token:i-am-default";
+  const tokAdmin = "secret-token:i-am-admin";
 
-  const defaultBaseUrl = merchant.makeInstanceBaseUrl();
+  const adminInstBaseUrl = merchant.makeInstanceBaseUrl();
 
   await check(
-    `${defaultBaseUrl}private/instances/default/instances/default/config`,
-    tokDefault,
+    `${adminInstBaseUrl}private/instances/admin/instances/admin/config`,
+    tokAdmin,
     404,
   );
 
-  // Instance management is only available when accessing the default instance
+  // Instance management is only available when accessing the admin instance
   // directly.
   await check(
-    `${defaultBaseUrl}instances/default/private/instances`,
+    `${adminInstBaseUrl}instances/admin/private/instances`,
     "foo",
     404,
   );
 
-  // Non-default instances don't allow instance management.
-  await check(`${defaultBaseUrl}instances/foo/private/instances`, "foo", 404);
+  // Non-admin instances don't allow instance management.
+  await check(`${adminInstBaseUrl}instances/foo/private/instances`, "foo", 404);
   await check(
-    `${defaultBaseUrl}instances/myinst/private/instances`,
+    `${adminInstBaseUrl}instances/myinst/private/instances`,
     "foo",
     404,
   );
 
-  await check(`${defaultBaseUrl}config`, "foo", 200);
-  await check(`${defaultBaseUrl}instances/default/config`, "foo", 200);
-  await check(`${defaultBaseUrl}instances/myinst/config`, "foo", 200);
-  await check(`${defaultBaseUrl}instances/foo/config`, "foo", 404);
+  await check(`${adminInstBaseUrl}config`, "foo", 200);
+  await check(`${adminInstBaseUrl}instances/admin/config`, "foo", 200);
+  await check(`${adminInstBaseUrl}instances/myinst/config`, "foo", 200);
+  await check(`${adminInstBaseUrl}instances/foo/config`, "foo", 404);
   await check(
-    `${defaultBaseUrl}instances/default/instances/config`,
+    `${adminInstBaseUrl}instances/admin/instances/config`,
     "foo",
     404,
   );
 
   await check(
-    `${defaultBaseUrl}private/instances/myinst/config`,
-    tokDefault,
+    `${adminInstBaseUrl}private/instances/myinst/config`,
+    tokAdmin,
     404,
   );
 
   await check(
-    `${defaultBaseUrl}instances/myinst/private/orders`,
-    tokDefault,
+    `${adminInstBaseUrl}instances/myinst/private/orders`,
+    tokAdmin,
     401,
   );
 
   await check(
-    `${defaultBaseUrl}instances/myinst/private/orders`,
-    tokDefault,
+    `${adminInstBaseUrl}instances/myinst/private/orders`,
+    tokAdmin,
     401,
   );
 
   await check(
-    `${defaultBaseUrl}instances/myinst/private/orders`,
+    `${adminInstBaseUrl}instances/myinst/private/orders`,
     "secret-token:i-am-myinst",
     200,
   );
 
   await check(
-    `${defaultBaseUrl}private/instances/myinst/orders`,
-    tokDefault,
+    `${adminInstBaseUrl}private/instances/myinst/orders`,
+    tokAdmin,
     404,
   );
 }
diff --git a/packages/taler-harness/src/integrationtests/test-merchant-instances.ts b/packages/taler-harness/src/integrationtests/test-merchant-instances.ts
@@ -135,7 +135,7 @@ export async function runMerchantInstancesTest(t: GlobalTestState) {
 
   {
     const fullDetails = succeedOrThrow(
-      await merchantClient.getInstanceDetails(undefined, "default"),
+      await merchantClient.getInstanceDetails(undefined, "admin"),
     );
     t.assertDeepEqual(fullDetails.auth.method, "external");
   }
@@ -173,7 +173,7 @@ export async function runMerchantInstancesTest(t: GlobalTestState) {
   // Check that auth is reported properly
   {
     const fullDetails = succeedOrThrow(
-      await merchantClient.getInstanceDetails(auth, "default"),
+      await merchantClient.getInstanceDetails(auth, "admin"),
     );
     t.assertDeepEqual(fullDetails.auth.method, "token");
     // Token should *not* be reported back.