fixup tests

BoltzExchange · Feb 11, 2024 · 825e3f0 · 825e3f0
1 parent 329c38c
commit 825e3f0
Show file tree

Hide file tree

Showing 18 changed files with 493 additions and 610 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -33,16 +33,16 @@
         "git-cliff": "^1.4.0",
         "jest": "^29.7.0",
         "jest-environment-jsdom": "^29.7.0",
-        "jsdom": "^22.1.0",
-        "prettier": "^3.1.1",
-        "sass": "^1.69.5",
+        "jsdom": "^24.0.0",
+        "prettier": "^3.2.5",
+        "sass": "^1.70.0",
         "solid-jest": "^0.2.0",
         "solid-testing-library": "^0.5.1",
-        "typescript": "^5.2.2",
-        "vite": "^4.5.1",
-        "vite-plugin-mkcert": "^1.16.0",
-        "vite-plugin-node-polyfills": "^0.15.0",
-        "vite-plugin-solid": "^2.7.2"
+        "typescript": "^5.3.3",
+        "vite": "^5.1.1",
+        "vite-plugin-mkcert": "^1.17.3",
+        "vite-plugin-node-polyfills": "^0.21.0",
+        "vite-plugin-solid": "^2.9.1"
     },
     "dependencies": {
         "@bitcoinerlab/secp256k1": "^1.1.1",

diff --git a/src/index.tsx b/src/index.tsx
@@ -75,6 +75,7 @@ const cleanup = render(
                             <Route path="/error" component={Error} />
                             <Route path="/refund" component={Refund} />
                             <Route path="/history" component={History} />
+                            <Route path="*404" component={NotFound} />
                         </Router>
                     </PayProvider>
                 </CreateProvider>

diff --git a/tests/components/AddressInput.spec.tsx b/tests/components/AddressInput.spec.tsx
@@ -2,8 +2,9 @@ import { fireEvent, render, screen } from "@solidjs/testing-library";
 
 import AddressInput from "../../src/components/AddressInput";
 import { BTC, LBTC } from "../../src/consts";
-import { CreateProvider, useCreateContext } from "../../src/context/Create";
-import { GlobalProvider, useGlobalContext } from "../../src/context/Global";
+import { useCreateContext } from "../../src/context/Create";
+import { useGlobalContext } from "../../src/context/Global";
+import { contextWrapper } from "../helper";
 
 describe("AddressInput", () => {
     let signals: any;
@@ -31,14 +32,15 @@ describe("AddressInput", () => {
     `(
         "should validate address $network $address -> $valid",
         async ({ valid, network, address }) => {
-            render(() => (
-                <GlobalProvider>
-                    <CreateProvider>
+            render(
+                () => (
+                    <>
                         <TestComponent />
                         <AddressInput />
-                    </CreateProvider>
-                </GlobalProvider>
-            ));
+                    </>
+                ),
+                { wrapper: contextWrapper },
+            );
 
             signals.setAsset(network);
 

diff --git a/tests/components/AssetSelect.spec.tsx b/tests/components/AssetSelect.spec.tsx
@@ -2,9 +2,9 @@ import { fireEvent, render, screen } from "@solidjs/testing-library";
 
 import SelectAsset from "../../src/components/AssetSelect";
 import { BTC, LBTC, LN, sideReceive, sideSend } from "../../src/consts";
-import { CreateProvider, useCreateContext } from "../../src/context/Create";
-import { GlobalProvider } from "../../src/context/Global";
+import { useCreateContext } from "../../src/context/Create";
 import i18n from "../../src/i18n/i18n";
+import { contextWrapper } from "../helper";
 
 describe("AssetSelect", () => {
     let signals: any;
@@ -20,14 +20,15 @@ describe("AssetSelect", () => {
         ${BTC}
         ${LBTC}
     `("should highlight selected asset $asset", ({ asset }) => {
-        const res = render(() => (
-            <GlobalProvider>
-                <CreateProvider>
+        const res = render(
+            () => (
+                <>
                     <TestComponent />
                     <SelectAsset />
-                </CreateProvider>
-            </GlobalProvider>
-        ));
+                </>
+            ),
+            { wrapper: contextWrapper },
+        );
 
         signals.setAssetSend(asset);
         signals.setAssetSelect(true);
@@ -50,14 +51,15 @@ describe("AssetSelect", () => {
         ${sideSend}
         ${sideReceive}
     `("should set header text for $side", async ({ side }) => {
-        render(() => (
-            <GlobalProvider>
-                <CreateProvider>
+        render(
+            () => (
+                <>
                     <TestComponent />
                     <SelectAsset />
-                </CreateProvider>
-            </GlobalProvider>
-        ));
+                </>
+            ),
+            { wrapper: contextWrapper },
+        );
 
         signals.setAssetSelect(true);
         signals.setAssetSelected(side);
@@ -72,14 +74,15 @@ describe("AssetSelect", () => {
     });
 
     test("should ignore same asset selection", () => {
-        const { container } = render(() => (
-            <GlobalProvider>
-                <CreateProvider>
+        const { container } = render(
+            () => (
+                <>
                     <TestComponent />
                     <SelectAsset />
-                </CreateProvider>
-            </GlobalProvider>
-        ));
+                </>
+            ),
+            { wrapper: contextWrapper },
+        );
 
         signals.setAssetSend(BTC);
         signals.setAssetSelect(true);
@@ -115,14 +118,15 @@ describe("AssetSelect", () => {
             prevReceive,
             expectedOther,
         }) => {
-            render(() => (
-                <GlobalProvider>
-                    <CreateProvider>
+            render(
+                () => (
+                    <>
                         <TestComponent />
                         <SelectAsset />
-                    </CreateProvider>
-                </GlobalProvider>
-            ));
+                    </>
+                ),
+                { wrapper: contextWrapper },
+            );
 
             signals.setAsset(prevAsset);
             signals.setAssetSelect(true);

diff --git a/tests/components/BlockExplorer.spec.tsx b/tests/components/BlockExplorer.spec.tsx
@@ -2,8 +2,8 @@ import { render, screen } from "@solidjs/testing-library";
 
 import BlockExplorer from "../../src/components/BlockExplorer";
 import { pairs } from "../../src/config";
-import { GlobalProvider } from "../../src/context/Global";
 import i18n from "../../src/i18n/i18n";
+import { contextWrapper } from "../helper";
 
 describe("BlockExplorer", () => {
     test.each`
@@ -13,11 +13,9 @@ describe("BlockExplorer", () => {
     `(
         "should link to $asset addresses",
         async ({ asset, baseLink, address }) => {
-            render(() => (
-                <GlobalProvider>
-                    <BlockExplorer asset={asset} address={address} />
-                </GlobalProvider>
-            ));
+            render(() => <BlockExplorer asset={asset} address={address} />, {
+                wrapper: contextWrapper,
+            });
 
             const button = await screen.findByText(
                 i18n.en.blockexplorer.replace(
@@ -39,11 +37,9 @@ describe("BlockExplorer", () => {
     `(
         "should link to $asset transactions",
         async ({ asset, baseLink, txId }) => {
-            render(() => (
-                <GlobalProvider>
-                    <BlockExplorer asset={asset} txId={txId} />
-                </GlobalProvider>
-            ));
+            render(() => <BlockExplorer asset={asset} txId={txId} />, {
+                wrapper: contextWrapper,
+            });
 
             const button = await screen.findByText(
                 i18n.en.blockexplorer.replace(

diff --git a/tests/components/Fees.spec.tsx b/tests/components/Fees.spec.tsx
@@ -7,6 +7,7 @@ import { CreateProvider, useCreateContext } from "../../src/context/Create";
 import { GlobalProvider, useGlobalContext } from "../../src/context/Global";
 import { calculateSendAmount } from "../../src/utils/calculate";
 import { cfg } from "../config";
+import { contextWrapper } from "../helper";
 
 describe("Fees component", () => {
     let signals: any;
@@ -19,26 +20,28 @@ describe("Fees component", () => {
     };
 
     test("should render", async () => {
-        render(() => (
-            <GlobalProvider>
-                <CreateProvider>
+        render(
+            () => (
+                <>
                     <TestComponent />
                     <Fees />
-                </CreateProvider>
-            </GlobalProvider>
-        ));
+                </>
+            ),
+            { wrapper: contextWrapper },
+        );
         globalSignals.setConfig(cfg);
     });
 
     test("should recalculate limits on direction switch", () => {
-        render(() => (
-            <GlobalProvider>
-                <CreateProvider>
+        render(
+            () => (
+                <>
                     <TestComponent />
                     <Fees />
-                </CreateProvider>
-            </GlobalProvider>
-        ));
+                </>
+            ),
+            { wrapper: contextWrapper },
+        );
         globalSignals.setConfig(cfg);
 
         expect(signals.minimum()).toEqual(