From 9f8139e09b21ec12f9b9ba4926ea80557698c559 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 4 Jan 2022 17:06:17 -0300 Subject: replace jest with mocha --- .../src/wallet/BalancePage.tsx | 2 +- .../src/wallet/DepositPage.stories.tsx | 2 +- .../src/wallet/DepositPage.tsx | 9 ++++-- .../src/wallet/ExchangeAddConfirm.stories.tsx | 13 +++++++- .../src/wallet/ExchangeAddConfirm.tsx | 8 ++--- .../src/wallet/ExchangeAddPage.tsx | 2 +- .../src/wallet/ExchangeAddSetUrl.stories.tsx | 2 +- .../src/wallet/ExchangeSetUrl.tsx | 7 +--- .../src/wallet/ProviderAddPage.tsx | 4 +-- .../src/wallet/ReserveCreated.tsx | 2 +- .../src/wallet/Settings.tsx | 2 +- .../src/wallet/Transaction.stories.tsx | 7 ++-- .../src/wallet/index.stories.tsx | 37 ++++++++++++++++++++++ 13 files changed, 71 insertions(+), 26 deletions(-) create mode 100644 packages/taler-wallet-webextension/src/wallet/index.stories.tsx (limited to 'packages/taler-wallet-webextension/src/wallet') diff --git a/packages/taler-wallet-webextension/src/wallet/BalancePage.tsx b/packages/taler-wallet-webextension/src/wallet/BalancePage.tsx index 52edbbe51..33182a38d 100644 --- a/packages/taler-wallet-webextension/src/wallet/BalancePage.tsx +++ b/packages/taler-wallet-webextension/src/wallet/BalancePage.tsx @@ -17,7 +17,7 @@ import { BalancesResponse, i18n } from "@gnu-taler/taler-util"; import { Fragment, h, VNode } from "preact"; import { BalanceTable } from "../components/BalanceTable"; -import { ButtonPrimary, Centered, ErrorBox } from "../components/styled/index"; +import { ButtonPrimary, Centered, ErrorBox } from "../components/styled"; import { HookResponse, useAsyncAsHook } from "../hooks/useAsyncAsHook"; import { PageLink } from "../renderHtml"; import * as wxApi from "../wxApi"; diff --git a/packages/taler-wallet-webextension/src/wallet/DepositPage.stories.tsx b/packages/taler-wallet-webextension/src/wallet/DepositPage.stories.tsx index 346b85d4f..2e2d4cb3d 100644 --- a/packages/taler-wallet-webextension/src/wallet/DepositPage.stories.tsx +++ b/packages/taler-wallet-webextension/src/wallet/DepositPage.stories.tsx @@ -19,7 +19,7 @@ * @author Sebastian Javier Marchano (sebasjm) */ -import { AmountJson, Amounts, parsePaytoUri } from "@gnu-taler/taler-util"; +import { Amounts, parsePaytoUri } from "@gnu-taler/taler-util"; import { DepositFee } from "@gnu-taler/taler-wallet-core/src/operations/deposits"; import { createExample } from "../test-utils"; import { View as TestedComponent } from "./DepositPage"; diff --git a/packages/taler-wallet-webextension/src/wallet/DepositPage.tsx b/packages/taler-wallet-webextension/src/wallet/DepositPage.tsx index d4759c537..5c931394d 100644 --- a/packages/taler-wallet-webextension/src/wallet/DepositPage.tsx +++ b/packages/taler-wallet-webextension/src/wallet/DepositPage.tsx @@ -108,8 +108,13 @@ export function View({ const currency = balance.currency; const amountStr: AmountString = `${currency}:${amount}`; - const account = knownBankAccounts[accountIdx]; - const accountURI = `payto://${account.targetType}/${account.targetPath}`; + const account = knownBankAccounts.length + ? knownBankAccounts[accountIdx] + : undefined; + const accountURI = !account + ? "" + : `payto://${account.targetType}/${account.targetPath}`; + useEffect(() => { if (amount === undefined) return; onCalculateFee(accountURI, amountStr).then((result) => { diff --git a/packages/taler-wallet-webextension/src/wallet/ExchangeAddConfirm.stories.tsx b/packages/taler-wallet-webextension/src/wallet/ExchangeAddConfirm.stories.tsx index 2e034458a..36b81d24c 100644 --- a/packages/taler-wallet-webextension/src/wallet/ExchangeAddConfirm.stories.tsx +++ b/packages/taler-wallet-webextension/src/wallet/ExchangeAddConfirm.stories.tsx @@ -23,6 +23,17 @@ import { termsXml } from "../cta/termsExample"; import { createExample } from "../test-utils"; import { View as TestedComponent } from "./ExchangeAddConfirm"; +function parseFromString(s: string): Document { + if (typeof window === "undefined") { + return { + querySelector: () => ({ + children: [], + }), + } as any; + } + return new window.DOMParser().parseFromString(s, "text/xml"); +} + export default { title: "wallet/exchange add/confirm", component: TestedComponent, @@ -60,7 +71,7 @@ export const TermsChanged = createExample(TestedComponent, { version: "1", content: { type: "xml", - document: new DOMParser().parseFromString(termsXml, "text/xml"), + document: parseFromString(termsXml), }, }, onAccept: async () => undefined, diff --git a/packages/taler-wallet-webextension/src/wallet/ExchangeAddConfirm.tsx b/packages/taler-wallet-webextension/src/wallet/ExchangeAddConfirm.tsx index 409e0b49e..562a2c956 100644 --- a/packages/taler-wallet-webextension/src/wallet/ExchangeAddConfirm.tsx +++ b/packages/taler-wallet-webextension/src/wallet/ExchangeAddConfirm.tsx @@ -1,14 +1,10 @@ import { i18n } from "@gnu-taler/taler-util"; import { Fragment, h, VNode } from "preact"; import { useState } from "preact/hooks"; -import { - Button, - ButtonSuccess, - ButtonWarning, -} from "../components/styled/index"; +import { Button, ButtonSuccess, ButtonWarning } from "../components/styled"; import { TermsOfServiceSection } from "../cta/TermsOfServiceSection"; import { useAsyncAsHook } from "../hooks/useAsyncAsHook"; -import { buildTermsOfServiceState, TermsState } from "../utils"; +import { buildTermsOfServiceState, TermsState } from "../utils/index"; import * as wxApi from "../wxApi"; export interface Props { diff --git a/packages/taler-wallet-webextension/src/wallet/ExchangeAddPage.tsx b/packages/taler-wallet-webextension/src/wallet/ExchangeAddPage.tsx index 6dbdf4c30..a8ef4549c 100644 --- a/packages/taler-wallet-webextension/src/wallet/ExchangeAddPage.tsx +++ b/packages/taler-wallet-webextension/src/wallet/ExchangeAddPage.tsx @@ -21,7 +21,7 @@ import { import { h, VNode } from "preact"; import { useState } from "preact/hooks"; import { useAsyncAsHook } from "../hooks/useAsyncAsHook"; -import { queryToSlashKeys } from "../utils"; +import { queryToSlashKeys } from "../utils/index"; import * as wxApi from "../wxApi"; import { ExchangeAddConfirmPage } from "./ExchangeAddConfirm"; import { ExchangeSetUrlPage } from "./ExchangeSetUrl"; diff --git a/packages/taler-wallet-webextension/src/wallet/ExchangeAddSetUrl.stories.tsx b/packages/taler-wallet-webextension/src/wallet/ExchangeAddSetUrl.stories.tsx index 6f0a58729..221a9da10 100644 --- a/packages/taler-wallet-webextension/src/wallet/ExchangeAddSetUrl.stories.tsx +++ b/packages/taler-wallet-webextension/src/wallet/ExchangeAddSetUrl.stories.tsx @@ -20,7 +20,7 @@ */ import { createExample } from "../test-utils"; -import { queryToSlashKeys } from "../utils"; +import { queryToSlashKeys } from "../utils/index"; import { ExchangeSetUrlPage as TestedComponent } from "./ExchangeSetUrl"; export default { diff --git a/packages/taler-wallet-webextension/src/wallet/ExchangeSetUrl.tsx b/packages/taler-wallet-webextension/src/wallet/ExchangeSetUrl.tsx index d529d162b..f346d6bf3 100644 --- a/packages/taler-wallet-webextension/src/wallet/ExchangeSetUrl.tsx +++ b/packages/taler-wallet-webextension/src/wallet/ExchangeSetUrl.tsx @@ -7,12 +7,7 @@ import { import { Fragment, h } from "preact"; import { useEffect, useState } from "preact/hooks"; import { ErrorMessage } from "../components/ErrorMessage"; -import { - Button, - ButtonPrimary, - Input, - WarningBox, -} from "../components/styled/index"; +import { Button, ButtonPrimary, Input, WarningBox } from "../components/styled"; export interface Props { initialValue?: string; diff --git a/packages/taler-wallet-webextension/src/wallet/ProviderAddPage.tsx b/packages/taler-wallet-webextension/src/wallet/ProviderAddPage.tsx index 16f239674..44d1049b9 100644 --- a/packages/taler-wallet-webextension/src/wallet/ProviderAddPage.tsx +++ b/packages/taler-wallet-webextension/src/wallet/ProviderAddPage.tsx @@ -30,8 +30,8 @@ import { Input, LightText, SmallLightText, -} from "../components/styled/index"; -import { queryToSlashConfig } from "../utils"; +} from "../components/styled"; +import { queryToSlashConfig } from "../utils/index"; import * as wxApi from "../wxApi"; interface Props { diff --git a/packages/taler-wallet-webextension/src/wallet/ReserveCreated.tsx b/packages/taler-wallet-webextension/src/wallet/ReserveCreated.tsx index f009c5ad0..ae820d8fe 100644 --- a/packages/taler-wallet-webextension/src/wallet/ReserveCreated.tsx +++ b/packages/taler-wallet-webextension/src/wallet/ReserveCreated.tsx @@ -3,7 +3,7 @@ import { Fragment, h, VNode } from "preact"; import { BankDetailsByPaytoType } from "../components/BankDetailsByPaytoType"; import { QR } from "../components/QR"; import { ButtonDestructive, WarningBox } from "../components/styled"; -import { amountToString } from "../utils"; +import { amountToString } from "../utils/index"; export interface Props { reservePub: string; payto: string; diff --git a/packages/taler-wallet-webextension/src/wallet/Settings.tsx b/packages/taler-wallet-webextension/src/wallet/Settings.tsx index 04656acc1..293448785 100644 --- a/packages/taler-wallet-webextension/src/wallet/Settings.tsx +++ b/packages/taler-wallet-webextension/src/wallet/Settings.tsx @@ -29,7 +29,7 @@ import { useBackupDeviceName } from "../hooks/useBackupDeviceName"; import { useExtendedPermissions } from "../hooks/useExtendedPermissions"; import { useLang } from "../hooks/useLang"; import { Pages } from "../NavigationBar"; -import { buildTermsOfServiceStatus } from "../utils"; +import { buildTermsOfServiceStatus } from "../utils/index"; import * as wxApi from "../wxApi"; export function SettingsPage(): VNode { diff --git a/packages/taler-wallet-webextension/src/wallet/Transaction.stories.tsx b/packages/taler-wallet-webextension/src/wallet/Transaction.stories.tsx index 4e8433921..7b6ac1fdc 100644 --- a/packages/taler-wallet-webextension/src/wallet/Transaction.stories.tsx +++ b/packages/taler-wallet-webextension/src/wallet/Transaction.stories.tsx @@ -125,12 +125,13 @@ const exampleData = { const transactionError = { code: 7005, details: { - requestUrl: "http://merchant-backend.taler:9966/orders/2021.340-02AD5XCC97MQM/pay", + requestUrl: + "http://merchant-backend.taler:9966/orders/2021.340-02AD5XCC97MQM/pay", httpStatusCode: 410, errorResponse: { code: 2161, - hint: "The payment is too late, the offer has expired." - } + hint: "The payment is too late, the offer has expired.", + }, }, hint: "Error: WALLET_UNEXPECTED_REQUEST_ERROR", message: "Unexpected error code in response", diff --git a/packages/taler-wallet-webextension/src/wallet/index.stories.tsx b/packages/taler-wallet-webextension/src/wallet/index.stories.tsx new file mode 100644 index 000000000..644ab1c59 --- /dev/null +++ b/packages/taler-wallet-webextension/src/wallet/index.stories.tsx @@ -0,0 +1,37 @@ +/* + This file is part of GNU Taler + (C) 2021 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 + */ + +/** + * + * @author Sebastian Javier Marchano (sebasjm) + */ + +import * as a1 from "./Backup.stories"; +import * as a2 from "./Balance.stories"; +import * as a3 from "./CreateManualWithdraw.stories"; +import * as a4 from "./DepositPage.stories"; +import * as a5 from "./ExchangeAddConfirm.stories"; +import * as a6 from "./ExchangeAddSetUrl.stories"; +import * as a7 from "./History.stories"; +import * as a8 from "./ProviderAddConfirmProvider.stories"; +import * as a9 from "./ProviderAddSetUrl.stories"; +import * as a10 from "./ProviderDetail.stories"; +import * as a11 from "./ReserveCreated.stories"; +import * as a12 from "./Settings.stories"; +import * as a13 from "./Transaction.stories"; +import * as a14 from "./Welcome.stories"; + +export default [a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14]; -- cgit v1.2.3