From d4710ba700b37948f61b1b841962b73379423c04 Mon Sep 17 00:00:00 2001 From: MS Date: Fri, 9 Dec 2022 10:51:33 +0100 Subject: Adapt libeufin test suite to recent API. The new libeufin-sandbox API enforces every bank account to be owned by one bank customer; this change therefore provides every test user a customer profile before trying the banking operations. --- .../test-libeufin-api-bankaccount.ts | 23 +++++----- .../test-libeufin-api-sandbox-camt.ts | 23 +++++----- .../test-libeufin-api-sandbox-transactions.ts | 12 +++--- .../src/integrationtests/test-libeufin-basic.ts | 50 ++++++++++------------ .../test-libeufin-nexus-balance.ts | 2 +- .../test-libeufin-sandbox-wire-transfer-cli.ts | 24 +++++------ .../src/integrationtests/test-libeufin-tutorial.ts | 2 +- 7 files changed, 65 insertions(+), 71 deletions(-) (limited to 'packages/taler-wallet-cli/src/integrationtests') diff --git a/packages/taler-wallet-cli/src/integrationtests/test-libeufin-api-bankaccount.ts b/packages/taler-wallet-cli/src/integrationtests/test-libeufin-api-bankaccount.ts index 26fecd77e..c3cbc0608 100644 --- a/packages/taler-wallet-cli/src/integrationtests/test-libeufin-api-bankaccount.ts +++ b/packages/taler-wallet-cli/src/integrationtests/test-libeufin-api-bankaccount.ts @@ -49,22 +49,21 @@ export async function runLibeufinApiBankaccountTest(t: GlobalTestState) { await sandbox.start(); await sandbox.pingUntilAvailable(); await LibeufinSandboxApi.createEbicsHost(sandbox, "mock"); - await LibeufinSandboxApi.createEbicsSubscriber(sandbox, { - hostID: "mock", - userID: "mock", - partnerID: "mock", - }); - await LibeufinSandboxApi.createEbicsBankAccount(sandbox, { - subscriber: { + await LibeufinSandboxApi.createDemobankAccount( + "mock", + "password-unused", + { baseUrl: sandbox.baseUrl + "/demobanks/default/access-api/" }, + "DE71500105179674997361" + ); + await LibeufinSandboxApi.createDemobankEbicsSubscriber( + { hostID: "mock", partnerID: "mock", userID: "mock", }, - iban: "DE71500105179674997361", - bic: "BELADEBEXXX", - name: "mock", - label: "mock", - }); + "mock", + { baseUrl: sandbox.baseUrl + "/demobanks/default/" } + ); await LibeufinNexusApi.createEbicsBankConnection(nexus, { name: "bankaccount-api-test-connection", ebicsURL: "http://localhost:5012/ebicsweb", diff --git a/packages/taler-wallet-cli/src/integrationtests/test-libeufin-api-sandbox-camt.ts b/packages/taler-wallet-cli/src/integrationtests/test-libeufin-api-sandbox-camt.ts index 250d17d3d..cb85c1ffc 100644 --- a/packages/taler-wallet-cli/src/integrationtests/test-libeufin-api-sandbox-camt.ts +++ b/packages/taler-wallet-cli/src/integrationtests/test-libeufin-api-sandbox-camt.ts @@ -33,18 +33,17 @@ export async function runLibeufinApiSandboxCamtTest(t: GlobalTestState) { }); await sandbox.start(); await sandbox.pingUntilAvailable(); - await LibeufinSandboxApi.createBankAccount(sandbox, { - iban: "DE71500105179674997361", - bic: "BELADEBEXXX", - name: "Mock Name", - label: "mock-account-0", - }); - await LibeufinSandboxApi.createBankAccount(sandbox, { - iban: "DE71500105179674997361", - bic: "BELADEBEXXX", - name: "Mock Name", - label: "mock-account-1", - }); + + await LibeufinSandboxApi.createDemobankAccount( + "mock-account-0", + "password-unused", + { baseUrl: sandbox.baseUrl + "/demobanks/default/access-api/" } + ); + await LibeufinSandboxApi.createDemobankAccount( + "mock-account-1", + "password-unused", + { baseUrl: sandbox.baseUrl + "/demobanks/default/access-api/" } + ); await sandbox.makeTransaction( "mock-account-0", "mock-account-1", diff --git a/packages/taler-wallet-cli/src/integrationtests/test-libeufin-api-sandbox-transactions.ts b/packages/taler-wallet-cli/src/integrationtests/test-libeufin-api-sandbox-transactions.ts index 224c45970..24fd9d3ef 100644 --- a/packages/taler-wallet-cli/src/integrationtests/test-libeufin-api-sandbox-transactions.ts +++ b/packages/taler-wallet-cli/src/integrationtests/test-libeufin-api-sandbox-transactions.ts @@ -32,12 +32,12 @@ export async function runLibeufinApiSandboxTransactionsTest( }); await sandbox.start(); await sandbox.pingUntilAvailable(); - await LibeufinSandboxApi.createBankAccount(sandbox, { - iban: "DE71500105179674997361", - bic: "BELADEBEXXX", - name: "Mock Name", - label: "mock-account", - }); + await LibeufinSandboxApi.createDemobankAccount( + "mock-account", + "password-unused", + { baseUrl: sandbox.baseUrl + "/demobanks/default/access-api/" }, + "DE71500105179674997361" + ); await LibeufinSandboxApi.simulateIncomingTransaction( sandbox, "mock-account", diff --git a/packages/taler-wallet-cli/src/integrationtests/test-libeufin-basic.ts b/packages/taler-wallet-cli/src/integrationtests/test-libeufin-basic.ts index 8002f093f..94fd76683 100644 --- a/packages/taler-wallet-cli/src/integrationtests/test-libeufin-basic.ts +++ b/packages/taler-wallet-cli/src/integrationtests/test-libeufin-basic.ts @@ -81,41 +81,37 @@ export async function createLibeufinTestEnvironment( await LibeufinSandboxApi.createEbicsHost(libeufinSandbox, "host01"); // Subscriber and bank Account for the exchange - await LibeufinSandboxApi.createEbicsSubscriber(libeufinSandbox, { - hostID: "host01", - partnerID: "partner01", - userID: "user01", - }); - await LibeufinSandboxApi.createEbicsBankAccount(libeufinSandbox, { - bic: "DEUTDEBB101", - iban: exchangeIban, - label: "exchangeacct", - name: "Taler Exchange", - subscriber: { + await LibeufinSandboxApi.createDemobankAccount( + "exchangeacct", + "password-unused", + { baseUrl: libeufinSandbox.baseUrl + "/demobanks/default/access-api/" }, + exchangeIban + ); + await LibeufinSandboxApi.createDemobankEbicsSubscriber( + { hostID: "host01", partnerID: "partner01", userID: "user01", }, - }); - // Subscriber and bank Account for the merchant - // (Merchant doesn't need EBICS access, but sandbox right now only supports EBICS - // accounts.) - await LibeufinSandboxApi.createEbicsSubscriber(libeufinSandbox, { - hostID: "host01", - partnerID: "partner02", - userID: "user02", - }); - await LibeufinSandboxApi.createEbicsBankAccount(libeufinSandbox, { - bic: "AUTOATW1XXX", - iban: merchantIban, - label: "merchantacct", - name: "Merchant", - subscriber: { + "exchangeacct", + { baseUrl: libeufinSandbox.baseUrl + "/demobanks/default/" } + ); + + await LibeufinSandboxApi.createDemobankAccount( + "merchantacct", + "password-unused", + { baseUrl: libeufinSandbox.baseUrl + "/demobanks/default/access-api/" }, + merchantIban + ); + await LibeufinSandboxApi.createDemobankEbicsSubscriber( + { hostID: "host01", partnerID: "partner02", userID: "user02", }, - }); + "merchantacct", + { baseUrl: libeufinSandbox.baseUrl + "/demobanks/default/" }, + ); await LibeufinNexusApi.createEbicsBankConnection(libeufinNexus, { name: "myconn", diff --git a/packages/taler-wallet-cli/src/integrationtests/test-libeufin-nexus-balance.ts b/packages/taler-wallet-cli/src/integrationtests/test-libeufin-nexus-balance.ts index a52de8d96..b1ef53a79 100644 --- a/packages/taler-wallet-cli/src/integrationtests/test-libeufin-nexus-balance.ts +++ b/packages/taler-wallet-cli/src/integrationtests/test-libeufin-nexus-balance.ts @@ -23,6 +23,7 @@ import { NexusUserBundle, launchLibeufinServices, LibeufinNexusApi, + LibeufinCli } from "../harness/libeufin.js"; /** @@ -66,7 +67,6 @@ export async function runLibeufinNexusBalanceTest(t: GlobalTestState) { "EUR:10", "first payment", ); - // user 01 gets another 10 await libeufinServices.libeufinSandbox.makeTransaction( user02sandbox.ebicsBankAccount.label, // debit diff --git a/packages/taler-wallet-cli/src/integrationtests/test-libeufin-sandbox-wire-transfer-cli.ts b/packages/taler-wallet-cli/src/integrationtests/test-libeufin-sandbox-wire-transfer-cli.ts index 7f274f554..e56cb3d68 100644 --- a/packages/taler-wallet-cli/src/integrationtests/test-libeufin-sandbox-wire-transfer-cli.ts +++ b/packages/taler-wallet-cli/src/integrationtests/test-libeufin-sandbox-wire-transfer-cli.ts @@ -32,19 +32,19 @@ export async function runLibeufinSandboxWireTransferCliTest( }); await sandbox.start(); await sandbox.pingUntilAvailable(); - await LibeufinSandboxApi.createBankAccount(sandbox, { - iban: "DE71500105179674997361", - bic: "BELADEBEXXX", - name: "Mock Name", - label: "mock-account", - }); + await LibeufinSandboxApi.createDemobankAccount( + "mock-account", + "password-unused", + { baseUrl: sandbox.baseUrl + "/demobanks/default/access-api/" }, + "DE71500105179674997361" + ); + await LibeufinSandboxApi.createDemobankAccount( + "mock-account-2", + "password-unused", + { baseUrl: sandbox.baseUrl + "/demobanks/default/access-api/" }, + "DE71500105179674997364" + ); - await LibeufinSandboxApi.createBankAccount(sandbox, { - iban: "DE71500105179674997364", - bic: "BELADEBEXXX", - name: "Mock Name 2", - label: "mock-account-2", - }); await sandbox.makeTransaction( "mock-account", "mock-account-2", diff --git a/packages/taler-wallet-cli/src/integrationtests/test-libeufin-tutorial.ts b/packages/taler-wallet-cli/src/integrationtests/test-libeufin-tutorial.ts index 0701fd1c5..7bc067cfe 100644 --- a/packages/taler-wallet-cli/src/integrationtests/test-libeufin-tutorial.ts +++ b/packages/taler-wallet-cli/src/integrationtests/test-libeufin-tutorial.ts @@ -49,7 +49,7 @@ export async function runLibeufinTutorialTest(t: GlobalTestState) { nexusUrl: libeufinNexus.baseUrl, sandboxDatabaseUri: `jdbc:sqlite:${t.testDir}/libeufin-sandbox.sqlite3`, nexusDatabaseUri: `jdbc:sqlite:${t.testDir}/libeufin-nexus.sqlite3`, - user: nexusUser, + nexusUser: nexusUser, }); const ebicsDetails = { -- cgit v1.2.3