summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Dold <florian@dold.me>2021-08-04 17:47:28 +0200
committerFlorian Dold <florian@dold.me>2021-08-04 17:47:28 +0200
commit17f2132b4a2a0b5f038347814bc859a035b2ad80 (patch)
tree8e1f3d2e4817c337afcce5229847bf74d15c8d40
parentf88e14f66d37c339816cb9ba73a84491e7133307 (diff)
downloadwallet-core-17f2132b4a2a0b5f038347814bc859a035b2ad80.tar.gz
wallet-core-17f2132b4a2a0b5f038347814bc859a035b2ad80.tar.bz2
wallet-core-17f2132b4a2a0b5f038347814bc859a035b2ad80.zip
fix test expectation in merchant-refund-api
-rw-r--r--packages/taler-util/src/talerconfig.ts8
-rw-r--r--packages/taler-wallet-cli/src/integrationtests/test-merchant-refund-api.ts4
-rw-r--r--packages/taler-wallet-cli/src/lint.ts2
3 files changed, 4 insertions, 10 deletions
diff --git a/packages/taler-util/src/talerconfig.ts b/packages/taler-util/src/talerconfig.ts
index ebc418859..32213f834 100644
--- a/packages/taler-util/src/talerconfig.ts
+++ b/packages/taler-util/src/talerconfig.ts
@@ -613,12 +613,8 @@ export class Configuration {
}
getAmount(section: string, option: string): ConfigValue<AmountJson> {
- const val = (
- this.sectionMap[section] ?? {
- entries: {},
- }
- ).entries[option];
- return new ConfigValue(section, option, val.value, (x) =>
+ const val = this.findEntry(section, option)?.value;
+ return new ConfigValue(section, option, val, (x) =>
Amounts.parseOrThrow(x),
);
}
diff --git a/packages/taler-wallet-cli/src/integrationtests/test-merchant-refund-api.ts b/packages/taler-wallet-cli/src/integrationtests/test-merchant-refund-api.ts
index 3e505d9ca..dc7863874 100644
--- a/packages/taler-wallet-cli/src/integrationtests/test-merchant-refund-api.ts
+++ b/packages/taler-wallet-cli/src/integrationtests/test-merchant-refund-api.ts
@@ -145,9 +145,7 @@ async function testRefundApiWithFulfillmentUrl(
console.log(publicOrderStatusResp.status);
console.log(publicOrderStatusResp.data);
// We didn't give any authentication, so we should get a fulfillment URL back
- t.assertTrue(publicOrderStatusResp.status === 202);
- const fu = publicOrderStatusResp.data.fulfillment_url;
- t.assertTrue(typeof fu === "string" && fu.startsWith("https://example.com"));
+ t.assertTrue(publicOrderStatusResp.status === 403);
}
async function testRefundApiWithFulfillmentMessage(
diff --git a/packages/taler-wallet-cli/src/lint.ts b/packages/taler-wallet-cli/src/lint.ts
index f7dfefe38..68d383b1d 100644
--- a/packages/taler-wallet-cli/src/lint.ts
+++ b/packages/taler-wallet-cli/src/lint.ts
@@ -274,7 +274,7 @@ export async function checkExchangeHttpd(
* Do some basic checks in the configuration of a Taler deployment.
*/
export async function lintExchangeDeployment(): Promise<void> {
- if (process.getuid() != 1) {
+ if (process.getuid() != 0) {
console.log(
"warning: the exchange deployment linter is designed to be run as root",
);