diff options
Diffstat (limited to 'packages/taler-integrationtests')
| -rw-r--r-- | packages/taler-integrationtests/package.json | 29 | ||||
| -rwxr-xr-x | packages/taler-integrationtests/scenario | 2 | ||||
| -rw-r--r-- | packages/taler-integrationtests/src/harness.ts | 39 | ||||
| -rw-r--r-- | packages/taler-integrationtests/src/test-refund-incremental.ts | 126 | ||||
| -rw-r--r-- | packages/taler-integrationtests/src/test-refund.ts | 102 | ||||
| -rwxr-xr-x | packages/taler-integrationtests/testrunner | 2 | ||||
| -rw-r--r-- | packages/taler-integrationtests/tsconfig.json | 3 |
7 files changed, 266 insertions, 37 deletions
diff --git a/packages/taler-integrationtests/package.json b/packages/taler-integrationtests/package.json index 713852370..ba2f112ef 100644 --- a/packages/taler-integrationtests/package.json +++ b/packages/taler-integrationtests/package.json @@ -4,40 +4,19 @@ "description": "Integration tests and fault injection for GNU Taler components", "main": "index.js", "scripts": { - "compile": "tsc", - "test": "tsc && ava" + "compile": "tsc -b" }, "author": "Florian Dold <dold@taler.net>", "license": "AGPL-3.0-or-later", "devDependencies": { - "@ava/typescript": "^1.1.1", - "ava": "^3.11.1", "esm": "^3.2.25", "source-map-support": "^0.5.19", - "ts-node": "^8.10.2" + "ts-node": "^8.10.2", + "typescript": "^3.9.7" }, "dependencies": { "axios": "^0.19.2", "taler-wallet-core": "workspace:*", - "tslib": "^2.0.0", - "typescript": "^3.9.7" - }, - "ava": { - "require": [ - "esm" - ], - "files": [ - "src/**/test-*" - ], - "typescript": { - "extensions": [ - "js", - "ts", - "tsx" - ], - "rewritePaths": { - "src/": "lib/" - } - } + "tslib": "^2.0.0" } } diff --git a/packages/taler-integrationtests/scenario b/packages/taler-integrationtests/scenario index a0050258e..9bef68ffa 100755 --- a/packages/taler-integrationtests/scenario +++ b/packages/taler-integrationtests/scenario @@ -17,7 +17,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" cd $DIR -./node_modules/.bin/tsc +./node_modules/.bin/tsc -b export ESM_OPTIONS='{"sourceMap": true}' diff --git a/packages/taler-integrationtests/src/harness.ts b/packages/taler-integrationtests/src/harness.ts index 027869d15..2507d12f7 100644 --- a/packages/taler-integrationtests/src/harness.ts +++ b/packages/taler-integrationtests/src/harness.ts @@ -50,7 +50,7 @@ import { EddsaKeyPair } from "taler-wallet-core/lib/crypto/talerCrypto"; const exec = util.promisify(require("child_process").exec); -async function delay(ms: number): Promise<void> { +export async function delayMs(ms: number): Promise<void> { return new Promise((resolve, reject) => { setTimeout(() => resolve(), ms); }); @@ -410,7 +410,7 @@ async function pingProc( return; } catch (e) { console.log(`service ${serviceName} not ready:`, e.toString()); - await delay(1000); + await delayMs(1000); } if (!proc || proc.proc.exitCode !== null) { throw Error(`service process ${serviceName} stopped unexpectedly`); @@ -951,14 +951,39 @@ export class MerchantService { } async queryPrivateOrderStatus(instanceName: string, orderId: string) { - let url; + const reqUrl = new URL( + `private/orders/${orderId}`, + this.makeInstanceBaseUrl(instanceName), + ); + const resp = await axios.get(reqUrl.href); + return codecForMerchantOrderPrivateStatusResponse().decode(resp.data); + } + + makeInstanceBaseUrl(instanceName: string): string { if (instanceName === "default") { - url = `http://localhost:${this.merchantConfig.httpPort}/private/orders/${orderId}`; + return `http://localhost:${this.merchantConfig.httpPort}/`; } else { - url = `http://localhost:${this.merchantConfig.httpPort}/instances/${instanceName}/private/orders/${orderId}`; + return `http://localhost:${this.merchantConfig.httpPort}/instances/${instanceName}/`; + } + } + + async giveRefund(r: { + instance: string; + orderId: string; + amount: string; + justification: string; + }): Promise<{ talerRefundUri: string }> { + const reqUrl = new URL( + `private/orders/${r.orderId}/refund`, + this.makeInstanceBaseUrl(r.instance), + ); + const resp = await axios.post(reqUrl.href, { + refund: r.amount, + reason: r.justification, + }); + return { + talerRefundUri: resp.data.taler_refund_uri, } - const resp = await axios.get(url); - return codecForMerchantOrderPrivateStatusResponse().decode(resp.data); } async createOrder( diff --git a/packages/taler-integrationtests/src/test-refund-incremental.ts b/packages/taler-integrationtests/src/test-refund-incremental.ts new file mode 100644 index 000000000..29685dd3e --- /dev/null +++ b/packages/taler-integrationtests/src/test-refund-incremental.ts @@ -0,0 +1,126 @@ +/* + This file is part of GNU Taler + (C) 2020 Taler Systems S.A. + + GNU Taler is free software; you can redistribute it and/or modify it under the + terms of the GNU General Public License as published by the Free Software + Foundation; either version 3, or (at your option) any later version. + + GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with + GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/> + */ + +/** + * Imports. + */ +import { runTest, GlobalTestState, delayMs } from "./harness"; +import { createSimpleTestkudosEnvironment, withdrawViaBank } from "./helpers"; + +/** + * Run test for basic, bank-integrated withdrawal. + */ +runTest(async (t: GlobalTestState) => { + // Set up test environment + + const { + wallet, + bank, + exchange, + merchant, + } = await createSimpleTestkudosEnvironment(t); + + // Withdraw digital cash into the wallet. + + await withdrawViaBank(t, { wallet, bank, exchange, amount: "TESTKUDOS:20" }); + + // Set up order. + + const orderResp = await merchant.createOrder("default", { + order: { + summary: "Buy me!", + amount: "TESTKUDOS:5", + fulfillment_url: "taler://fulfillment-success/thx", + }, + }); + + let orderStatus = await merchant.queryPrivateOrderStatus( + "default", + orderResp.order_id, + ); + + t.assertTrue(orderStatus.order_status === "unpaid") + + // Make wallet pay for the order + + const r1 = await wallet.apiRequest("preparePay", { + talerPayUri: orderStatus.taler_pay_uri, + }); + t.assertTrue(r1.type === "response"); + + const r2 = await wallet.apiRequest("confirmPay", { + // FIXME: should be validated, don't cast! + proposalId: (r1.result as any).proposalId, + }); + t.assertTrue(r2.type === "response"); + + // Check if payment was successful. + + orderStatus = await merchant.queryPrivateOrderStatus( + "default", + orderResp.order_id, + ); + + t.assertTrue(orderStatus.order_status === "paid"); + + let ref = await merchant.giveRefund({ + amount: "TESTKUDOS:2.5", + instance: "default", + justification: "foo", + orderId: orderResp.order_id, + }); + + console.log("first refund increase response", ref); + + // Wait at least a second, because otherwise the increased + // refund will be grouped with the previous one. + await delayMs(1.2); + + ref = await merchant.giveRefund({ + amount: "TESTKUDOS:5", + instance: "default", + justification: "bar", + orderId: orderResp.order_id, + }); + + console.log("second refund increase response", ref); + + let r = await wallet.apiRequest("applyRefund", { + talerRefundUri: ref.talerRefundUri, + }); + console.log(r); + + orderStatus = await merchant.queryPrivateOrderStatus( + "default", + orderResp.order_id, + ); + + t.assertTrue(orderStatus.order_status === "paid"); + + t.assertAmountEquals(orderStatus.refund_amount, "TESTKUDOS:5"); + + console.log(JSON.stringify(orderStatus, undefined, 2)); + + await wallet.runUntilDone(); + + r = await wallet.apiRequest("getBalances", {}); + console.log(JSON.stringify(r, undefined, 2)); + + r = await wallet.apiRequest("getTransactions", {}); + console.log(JSON.stringify(r, undefined, 2)); + + await t.shutdown(); +}); diff --git a/packages/taler-integrationtests/src/test-refund.ts b/packages/taler-integrationtests/src/test-refund.ts new file mode 100644 index 000000000..c2f152f53 --- /dev/null +++ b/packages/taler-integrationtests/src/test-refund.ts @@ -0,0 +1,102 @@ +/* + This file is part of GNU Taler + (C) 2020 Taler Systems S.A. + + GNU Taler is free software; you can redistribute it and/or modify it under the + terms of the GNU General Public License as published by the Free Software + Foundation; either version 3, or (at your option) any later version. + + GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with + GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/> + */ + +/** + * Imports. + */ +import { runTest, GlobalTestState } from "./harness"; +import { createSimpleTestkudosEnvironment, withdrawViaBank } from "./helpers"; + +/** + * Run test for basic, bank-integrated withdrawal. + */ +runTest(async (t: GlobalTestState) => { + // Set up test environment + + const { + wallet, + bank, + exchange, + merchant, + } = await createSimpleTestkudosEnvironment(t); + + // Withdraw digital cash into the wallet. + + await withdrawViaBank(t, { wallet, bank, exchange, amount: "TESTKUDOS:20" }); + + // Set up order. + + const orderResp = await merchant.createOrder("default", { + order: { + summary: "Buy me!", + amount: "TESTKUDOS:5", + fulfillment_url: "taler://fulfillment-success/thx", + }, + }); + + let orderStatus = await merchant.queryPrivateOrderStatus( + "default", + orderResp.order_id, + ); + + t.assertTrue(orderStatus.order_status === "unpaid") + + // Make wallet pay for the order + + const r1 = await wallet.apiRequest("preparePay", { + talerPayUri: orderStatus.taler_pay_uri, + }); + t.assertTrue(r1.type === "response"); + + const r2 = await wallet.apiRequest("confirmPay", { + // FIXME: should be validated, don't cast! + proposalId: (r1.result as any).proposalId, + }); + t.assertTrue(r2.type === "response"); + + // Check if payment was successful. + + orderStatus = await merchant.queryPrivateOrderStatus( + "default", + orderResp.order_id, + ); + + t.assertTrue(orderStatus.order_status === "paid"); + + const ref = await merchant.giveRefund({ + amount: "TESTKUDOS:5", + instance: "default", + justification: "foo", + orderId: orderResp.order_id, + }); + + console.log(ref); + + let r = await wallet.apiRequest("applyRefund", { + talerRefundUri: ref.talerRefundUri, + }); + console.log(r); + + await wallet.runUntilDone(); + + r = await wallet.apiRequest("getBalances", {}); + console.log(JSON.stringify(r, undefined, 2)); + + r = await wallet.apiRequest("getTransactions", {}); + console.log(JSON.stringify(r, undefined, 2)); + + await t.shutdown(); +}); diff --git a/packages/taler-integrationtests/testrunner b/packages/taler-integrationtests/testrunner index 6476d73fa..03cb15b3c 100755 --- a/packages/taler-integrationtests/testrunner +++ b/packages/taler-integrationtests/testrunner @@ -17,7 +17,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" cd $DIR -./node_modules/.bin/tsc +./node_modules/.bin/tsc -b export ESM_OPTIONS='{"sourceMap": true}' diff --git a/packages/taler-integrationtests/tsconfig.json b/packages/taler-integrationtests/tsconfig.json index 9fa8001a8..2fe0853d4 100644 --- a/packages/taler-integrationtests/tsconfig.json +++ b/packages/taler-integrationtests/tsconfig.json @@ -25,9 +25,6 @@ }, "references": [ { - "path": "../idb-bridge/", - }, - { "path": "../taler-wallet-core" } ], |