From cd2eaf76dca5383323691b3476792c8b38781922 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dni=20=E2=9A=A1?= Date: Wed, 3 Jan 2024 22:15:54 +0100 Subject: [PATCH 1/5] chore: move tests to ts --- tests/{History.spec.js => History.spec.ts} | 0 tests/{Nav.spec.jsx => Nav.spec.tsx} | 2 +- .../{AssetSelect.spec.jsx => AssetSelect.spec.tsx} | 2 +- tests/components/ClickableAmount.spec.jsx | 2 +- tests/components/{Error.spec.jsx => Error.spec.tsx} | 1 + tests/components/{Fees.spec.jsx => Fees.spec.tsx} | 3 ++- tests/components/{Reverse.spec.jsx => Reverse.spec.tsx} | 4 ++-- tests/{config.js => config.ts} | 0 tests/i18n/{detect.spec.js => detect.spec.ts} | 2 +- tests/i18n/{i18n.spec.js => i18n.spec.ts} | 2 +- tests/{signals.spec.js => signals.spec.ts} | 2 +- tests/utils/webln.spec.ts | 7 +++++++ 12 files changed, 18 insertions(+), 9 deletions(-) rename tests/{History.spec.js => History.spec.ts} (100%) rename tests/{Nav.spec.jsx => Nav.spec.tsx} (94%) rename tests/components/{AssetSelect.spec.jsx => AssetSelect.spec.tsx} (98%) rename tests/components/{Error.spec.jsx => Error.spec.tsx} (90%) rename tests/components/{Fees.spec.jsx => Fees.spec.tsx} (92%) rename tests/components/{Reverse.spec.jsx => Reverse.spec.tsx} (88%) rename tests/{config.js => config.ts} (100%) rename tests/i18n/{detect.spec.js => detect.spec.ts} (94%) rename tests/i18n/{i18n.spec.js => i18n.spec.ts} (94%) rename tests/{signals.spec.js => signals.spec.ts} (96%) diff --git a/tests/History.spec.js b/tests/History.spec.ts similarity index 100% rename from tests/History.spec.js rename to tests/History.spec.ts diff --git a/tests/Nav.spec.jsx b/tests/Nav.spec.tsx similarity index 94% rename from tests/Nav.spec.jsx rename to tests/Nav.spec.tsx index fb3ed6de..82776b9f 100644 --- a/tests/Nav.spec.jsx +++ b/tests/Nav.spec.tsx @@ -1,6 +1,6 @@ import { Router } from "@solidjs/router"; import { render, screen } from "@solidjs/testing-library"; -import { describe, expect } from "vitest"; +import { describe, expect, test } from "vitest"; import Nav from "../src/Nav"; diff --git a/tests/components/AssetSelect.spec.jsx b/tests/components/AssetSelect.spec.tsx similarity index 98% rename from tests/components/AssetSelect.spec.jsx rename to tests/components/AssetSelect.spec.tsx index d2eff919..1cddbe4c 100644 --- a/tests/components/AssetSelect.spec.jsx +++ b/tests/components/AssetSelect.spec.tsx @@ -1,5 +1,5 @@ import { fireEvent, render, screen } from "@solidjs/testing-library"; -import { describe, expect, test } from "vitest"; +import { describe, expect, test, vi } from "vitest"; import SelectAsset from "../../src/components/AssetSelect"; import { BTC, LBTC, LN, sideReceive, sideSend } from "../../src/consts"; diff --git a/tests/components/ClickableAmount.spec.jsx b/tests/components/ClickableAmount.spec.jsx index a90664a9..7b710838 100644 --- a/tests/components/ClickableAmount.spec.jsx +++ b/tests/components/ClickableAmount.spec.jsx @@ -1,5 +1,5 @@ import { fireEvent, render } from "@solidjs/testing-library"; -import { describe, expect, vitest } from "vitest"; +import { describe, expect, test, vitest } from "vitest"; import ClickableAmount from "../../src/components/ClickableAmount"; import t from "../../src/i18n"; diff --git a/tests/components/Error.spec.jsx b/tests/components/Error.spec.tsx similarity index 90% rename from tests/components/Error.spec.jsx rename to tests/components/Error.spec.tsx index 65c40624..a4c4a8f1 100644 --- a/tests/components/Error.spec.jsx +++ b/tests/components/Error.spec.tsx @@ -1,4 +1,5 @@ import { render, screen } from "@solidjs/testing-library"; +import { describe, expect, test } from "vitest"; import Error from "../../src/Error"; import i18n from "../../src/i18n/i18n"; diff --git a/tests/components/Fees.spec.jsx b/tests/components/Fees.spec.tsx similarity index 92% rename from tests/components/Fees.spec.jsx rename to tests/components/Fees.spec.tsx index 10f7d5c4..0e84e2b0 100644 --- a/tests/components/Fees.spec.jsx +++ b/tests/components/Fees.spec.tsx @@ -1,5 +1,5 @@ import { render } from "@solidjs/testing-library"; -import { beforeAll, beforeEach, expect, vi } from "vitest"; +import { beforeAll, beforeEach, describe, expect, test, vi } from "vitest"; import Fees from "../../src/components/Fees"; import * as signals from "../../src/signals"; @@ -8,6 +8,7 @@ import { cfg } from "../config"; describe("Fees component", () => { beforeAll(() => { + // @ts-ignore signals.setConfig(cfg); signals.setReverse(true); }); diff --git a/tests/components/Reverse.spec.jsx b/tests/components/Reverse.spec.tsx similarity index 88% rename from tests/components/Reverse.spec.jsx rename to tests/components/Reverse.spec.tsx index 30d261ba..fb889af2 100644 --- a/tests/components/Reverse.spec.jsx +++ b/tests/components/Reverse.spec.tsx @@ -2,7 +2,7 @@ import { fireEvent, render } from "@solidjs/testing-library"; import { describe, expect, test } from "vitest"; import Reverse from "../../src/components/Reverse"; -import { BTC, LN } from "../../src/config"; +import { BTC, LN } from "../../src/consts"; import { assetReceive, assetSend, @@ -16,7 +16,7 @@ describe("Reverse", () => { setAssetSend(BTC); setAssetReceive(LN); - expect(reverse()).toEqual(true); + expect(reverse()).toEqual(false); const { container: { firstChild: flip }, diff --git a/tests/config.js b/tests/config.ts similarity index 100% rename from tests/config.js rename to tests/config.ts diff --git a/tests/i18n/detect.spec.js b/tests/i18n/detect.spec.ts similarity index 94% rename from tests/i18n/detect.spec.js rename to tests/i18n/detect.spec.ts index 9fed1366..98415e5d 100644 --- a/tests/i18n/detect.spec.js +++ b/tests/i18n/detect.spec.ts @@ -1,4 +1,4 @@ -import { describe, expect } from "vitest"; +import { describe, expect, test } from "vitest"; import { defaultLanguage } from "../../src/config"; import { getNavigatorLanguage } from "../../src/i18n/detect"; diff --git a/tests/i18n/i18n.spec.js b/tests/i18n/i18n.spec.ts similarity index 94% rename from tests/i18n/i18n.spec.js rename to tests/i18n/i18n.spec.ts index edd12a4d..e3967ed7 100644 --- a/tests/i18n/i18n.spec.js +++ b/tests/i18n/i18n.spec.ts @@ -1,4 +1,4 @@ -import { describe, expect } from "vitest"; +import { describe, expect, test } from "vitest"; import { rawDict } from "../../src/i18n/i18n"; diff --git a/tests/signals.spec.js b/tests/signals.spec.ts similarity index 96% rename from tests/signals.spec.js rename to tests/signals.spec.ts index 319cfc8e..59e19751 100644 --- a/tests/signals.spec.js +++ b/tests/signals.spec.ts @@ -1,4 +1,4 @@ -import { expect } from "vitest"; +import { describe, expect, test } from "vitest"; import { BTC, LBTC, LN } from "../src/consts"; import { diff --git a/tests/utils/webln.spec.ts b/tests/utils/webln.spec.ts index fed5240d..3a2bfd76 100644 --- a/tests/utils/webln.spec.ts +++ b/tests/utils/webln.spec.ts @@ -6,6 +6,7 @@ import { detectWebLNProvider, enableWebln } from "../../src/utils/webln"; describe("WebLN", () => { beforeEach(() => { log.error = vitest.fn(); + // @ts-ignore window.webln = undefined; }); @@ -24,6 +25,7 @@ describe("WebLN", () => { }); test("should call WebLN callback if enable call succeeds", async () => { + // @ts-ignore window.webln = { enable: vitest.fn().mockResolvedValue(undefined), } as any; @@ -31,7 +33,9 @@ describe("WebLN", () => { expect(await enableWebln(cb)); + // @ts-ignore expect(window.webln.enable).toHaveBeenCalledTimes(1); + // @ts-ignore expect(window.webln.enable).toHaveBeenCalledWith(); expect(cb).toHaveBeenCalledTimes(1); @@ -39,6 +43,7 @@ describe("WebLN", () => { }); test("should not call WebLN callback if enable call fails", async () => { + // @ts-ignore window.webln = { enable: vitest.fn().mockRejectedValue("unauthorized"), } as any; @@ -46,7 +51,9 @@ describe("WebLN", () => { expect(await enableWebln(cb)); + // @ts-ignore expect(window.webln.enable).toHaveBeenCalledTimes(1); + // @ts-ignore expect(window.webln.enable).toHaveBeenCalledWith(); expect(cb).toHaveBeenCalledTimes(0); From 5e66a31448696386eb2f9beed0aa43355f2a5d7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dni=20=E2=9A=A1?= Date: Thu, 4 Jan 2024 00:27:56 +0100 Subject: [PATCH 2/5] revert --- tests/utils/webln.spec.ts | 8 -------- 1 file changed, 8 deletions(-) diff --git a/tests/utils/webln.spec.ts b/tests/utils/webln.spec.ts index 3a2bfd76..c6d9dfdd 100644 --- a/tests/utils/webln.spec.ts +++ b/tests/utils/webln.spec.ts @@ -6,8 +6,6 @@ import { detectWebLNProvider, enableWebln } from "../../src/utils/webln"; describe("WebLN", () => { beforeEach(() => { log.error = vitest.fn(); - // @ts-ignore - window.webln = undefined; }); test("should not detect WebLN when no injected provider is present", async () => { @@ -25,7 +23,6 @@ describe("WebLN", () => { }); test("should call WebLN callback if enable call succeeds", async () => { - // @ts-ignore window.webln = { enable: vitest.fn().mockResolvedValue(undefined), } as any; @@ -33,9 +30,7 @@ describe("WebLN", () => { expect(await enableWebln(cb)); - // @ts-ignore expect(window.webln.enable).toHaveBeenCalledTimes(1); - // @ts-ignore expect(window.webln.enable).toHaveBeenCalledWith(); expect(cb).toHaveBeenCalledTimes(1); @@ -43,7 +38,6 @@ describe("WebLN", () => { }); test("should not call WebLN callback if enable call fails", async () => { - // @ts-ignore window.webln = { enable: vitest.fn().mockRejectedValue("unauthorized"), } as any; @@ -51,9 +45,7 @@ describe("WebLN", () => { expect(await enableWebln(cb)); - // @ts-ignore expect(window.webln.enable).toHaveBeenCalledTimes(1); - // @ts-ignore expect(window.webln.enable).toHaveBeenCalledWith(); expect(cb).toHaveBeenCalledTimes(0); From b1b81559330d7297ca48bb853e562288f5286946 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dni=20=E2=9A=A1?= Date: Thu, 4 Jan 2024 08:35:03 +0100 Subject: [PATCH 3/5] ficofix config signal --- src/signals.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/signals.ts b/src/signals.ts index 87e9bd06..95d3999d 100644 --- a/src/signals.ts +++ b/src/signals.ts @@ -14,7 +14,7 @@ export const [assetSelected, setAssetSelected] = createSignal(null); export const [asset, setAsset] = createSignal(defaultSelection); export const [reverse, setReverse] = createSignal(true); -export const [config, setConfig] = createSignal(0); +export const [config, setConfig] = createSignal({}); export const [online, setOnline] = createSignal(true); export const [wasmSupported, setWasmSupported] = createSignal(true); From a21159e9bb0221ae6aaa890335cbaffdf59d031a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dni=20=E2=9A=A1?= Date: Thu, 4 Jan 2024 08:37:46 +0100 Subject: [PATCH 4/5] rest of tests --- tests/utils/{denomination.spec.js => denomination.spec.ts} | 2 ++ tests/utils/{feeChecker.spec.js => feeChecker.spec.ts} | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) rename tests/utils/{denomination.spec.js => denomination.spec.ts} (98%) rename tests/utils/{feeChecker.spec.js => feeChecker.spec.ts} (95%) diff --git a/tests/utils/denomination.spec.js b/tests/utils/denomination.spec.ts similarity index 98% rename from tests/utils/denomination.spec.js rename to tests/utils/denomination.spec.ts index 16f46366..a2a59104 100644 --- a/tests/utils/denomination.spec.js +++ b/tests/utils/denomination.spec.ts @@ -1,3 +1,5 @@ +import { beforeAll, describe, expect, test } from "vitest"; + import { setDenomination, setMaximum } from "../../src/signals"; import { calculateDigits, diff --git a/tests/utils/feeChecker.spec.js b/tests/utils/feeChecker.spec.ts similarity index 95% rename from tests/utils/feeChecker.spec.js rename to tests/utils/feeChecker.spec.ts index aea7f0f1..eeb78203 100644 --- a/tests/utils/feeChecker.spec.js +++ b/tests/utils/feeChecker.spec.ts @@ -1,3 +1,5 @@ +import { beforeAll, describe, expect, test } from "vitest"; + import { BTC, LBTC } from "../../src/consts"; import { setAsset, setConfig } from "../../src/signals"; import { feeChecker } from "../../src/utils/feeChecker"; @@ -60,7 +62,7 @@ const cfg = { }, }; -const deepCopy = (value) => JSON.parse(JSON.stringify(value)); +const deepCopy = (value: object) => JSON.parse(JSON.stringify(value)); describe("feeChecker", () => { beforeAll(() => { From 90c11b6f21be72d9b8c51a803b2efbb478228d94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dni=20=E2=9A=A1?= Date: Thu, 4 Jan 2024 08:56:38 +0100 Subject: [PATCH 5/5] remove ignore --- tests/components/Fees.spec.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/components/Fees.spec.tsx b/tests/components/Fees.spec.tsx index 0e84e2b0..90497f91 100644 --- a/tests/components/Fees.spec.tsx +++ b/tests/components/Fees.spec.tsx @@ -8,7 +8,6 @@ import { cfg } from "../config"; describe("Fees component", () => { beforeAll(() => { - // @ts-ignore signals.setConfig(cfg); signals.setReverse(true); });