gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-wallet-core] branch master updated: deletion test


From: gnunet
Subject: [taler-wallet-core] branch master updated: deletion test
Date: Thu, 04 Mar 2021 15:59:36 +0100

This is an automated email from the git hooks/post-receive script.

dold pushed a commit to branch master
in repository wallet-core.

The following commit(s) were added to refs/heads/master by this push:
     new 90af26ac deletion test
90af26ac is described below

commit 90af26ace5d8b784330e53c672ce7a864c94cb18
Author: Florian Dold <florian@dold.me>
AuthorDate: Thu Mar 4 15:59:31 2021 +0100

    deletion test
---
 .../src/integrationtests/harness.ts                |  2 +-
 ...tances.ts => test-merchant-instances-delete.ts} | 61 ++--------------------
 .../integrationtests/test-merchant-instances.ts    |  2 +-
 .../src/integrationtests/testrunner.ts             |  2 +
 4 files changed, 8 insertions(+), 59 deletions(-)

diff --git a/packages/taler-wallet-cli/src/integrationtests/harness.ts 
b/packages/taler-wallet-cli/src/integrationtests/harness.ts
index 169aa8aa..2b26ef7f 100644
--- a/packages/taler-wallet-cli/src/integrationtests/harness.ts
+++ b/packages/taler-wallet-cli/src/integrationtests/harness.ts
@@ -1195,7 +1195,7 @@ export class MerchantApiClient {
 
   async deleteInstance(instanceId: string) {
     const baseUrl = this.baseUrl;
-    const url = new URL(`private/instances/${instanceId}`);
+    const url = new URL(`private/instances/${instanceId}`, this.baseUrl);
     await axios.delete(url.href, {
       headers: this.makeAuthHeader(),
     });
diff --git 
a/packages/taler-wallet-cli/src/integrationtests/test-merchant-instances.ts 
b/packages/taler-wallet-cli/src/integrationtests/test-merchant-instances-delete.ts
similarity index 63%
copy from 
packages/taler-wallet-cli/src/integrationtests/test-merchant-instances.ts
copy to 
packages/taler-wallet-cli/src/integrationtests/test-merchant-instances-delete.ts
index 5d1c06e1..e6f7d574 100644
--- a/packages/taler-wallet-cli/src/integrationtests/test-merchant-instances.ts
+++ 
b/packages/taler-wallet-cli/src/integrationtests/test-merchant-instances-delete.ts
@@ -28,9 +28,9 @@ import {
 } from "./harness";
 
 /**
- * Do basic checks on instance management and authentication.
+ * Test instance deletion and authentication for it
  */
-export async function runMerchantInstancesTest(t: GlobalTestState) {
+export async function runMerchantInstancesDeleteTest(t: GlobalTestState) {
   // Set up test environment
 
   const db = await setupDb(t);
@@ -94,69 +94,16 @@ export async function runMerchantInstancesTest(t: 
GlobalTestState) {
     method: "external",
   });
 
-  {
-    const r = await merchantClient.getInstances();
-    t.assertDeepEqual(r.instances.length, 2);
-  }
-
-  // Check that a "malformed" bearer Authorization header gets ignored
-  {
-    const url = merchant.makeInstanceBaseUrl();
-    const resp = await axios.get(new URL("private/instances", url).href, {
-      headers: {
-        Authorization: "foo bar-baz",
-      },
-    });
-    t.assertDeepEqual(resp.status, 200);
-  }
-
-  {
-    const fullDetails = await merchantClient.getInstanceFullDetails("default");
-    t.assertDeepEqual(fullDetails.auth.method, "external");
-  }
-
   await merchantClient.changeAuth({
     method: "token",
     token: "secret-token:foobar",
   });
 
-  // Now this should fail, as we didn't change the auth of the client yet.
-  const exc = await t.assertThrowsAsync(async () => {
-    await merchantClient.getInstances();
-  });
-
-  t.assertAxiosError(exc);
-  t.assertAxiosError(exc.response?.status === 401);
-
   merchantClient = new MerchantApiClient(merchant.makeInstanceBaseUrl(), {
     method: "token",
     token: "secret-token:foobar",
   });
 
-  // With the new client auth settings, request should work again.
-  await merchantClient.getInstances();
-
-  // Now, try some variations.
-
-  {
-    const url = merchant.makeInstanceBaseUrl();
-    const resp = await axios.get(new URL("private/instances", url).href, {
-      headers: {
-        // Note the spaces
-        Authorization: "Bearer     secret-token:foobar",
-      },
-    });
-    t.assertDeepEqual(resp.status, 200);
-  }
-
-  // Check that auth is reported properly
-  {
-    const fullDetails = await merchantClient.getInstanceFullDetails("default");
-    t.assertDeepEqual(fullDetails.auth.method, "token");
-    // Token should *not* be reported back.
-    t.assertDeepEqual(fullDetails.auth.token, undefined);
-  }
-
   // Check that deleting an instance checks the auth
   // of the default instance.
   {
@@ -168,7 +115,7 @@ export async function runMerchantInstancesTest(t: 
GlobalTestState) {
     );
 
     const exc = await t.assertThrowsAsync(async () => {
-      await unauthMerchantClient.deleteInstance("");
+      await unauthMerchantClient.deleteInstance("myinst");
     });
     console.log(exc);
     t.assertAxiosError(exc);
@@ -176,4 +123,4 @@ export async function runMerchantInstancesTest(t: 
GlobalTestState) {
   }
 }
 
-runMerchantInstancesTest.suites = ["merchant"];
+runMerchantInstancesDeleteTest.suites = ["merchant"];
diff --git 
a/packages/taler-wallet-cli/src/integrationtests/test-merchant-instances.ts 
b/packages/taler-wallet-cli/src/integrationtests/test-merchant-instances.ts
index 5d1c06e1..fe7f28b4 100644
--- a/packages/taler-wallet-cli/src/integrationtests/test-merchant-instances.ts
+++ b/packages/taler-wallet-cli/src/integrationtests/test-merchant-instances.ts
@@ -168,7 +168,7 @@ export async function runMerchantInstancesTest(t: 
GlobalTestState) {
     );
 
     const exc = await t.assertThrowsAsync(async () => {
-      await unauthMerchantClient.deleteInstance("");
+      await unauthMerchantClient.deleteInstance("myinst");
     });
     console.log(exc);
     t.assertAxiosError(exc);
diff --git a/packages/taler-wallet-cli/src/integrationtests/testrunner.ts 
b/packages/taler-wallet-cli/src/integrationtests/testrunner.ts
index 6b158e8d..50850d6d 100644
--- a/packages/taler-wallet-cli/src/integrationtests/testrunner.ts
+++ b/packages/taler-wallet-cli/src/integrationtests/testrunner.ts
@@ -62,6 +62,7 @@ import CancellationToken from "cancellationtoken";
 import { runMerchantInstancesTest } from "./test-merchant-instances";
 import { runMerchantInstancesUrlsTest } from "./test-merchant-instances-urls";
 import { runWalletBackupBasicTest } from "./test-wallet-backup-basic";
+import { runMerchantInstancesDeleteTest } from 
"./test-merchant-instances-delete";
 
 /**
  * Test runner.
@@ -87,6 +88,7 @@ const allTests: TestMainFunction[] = [
   runLibeufinRefundTest,
   runMerchantExchangeConfusionTest,
   runMerchantInstancesTest,
+  runMerchantInstancesDeleteTest,
   runMerchantInstancesUrlsTest,
   runMerchantLongpollingTest,
   runMerchantRefundApiTest,

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]