From 8fde3229075929234b217e6e75c5ae2e962d1221 Mon Sep 17 00:00:00 2001 From: Thomas Huang Date: Tue, 6 Dec 2022 08:49:08 -0800 Subject: [PATCH] Continue converting tests from enzyme to @testing-library/react (#16753) --- jest.config.js | 2 +- test/data/mock-send-state.json | 21 + test/data/mock-state.json | 5 + ui/components/ui/dialog/index.js | 1 + ui/pages/send/gas-display/gas-display.js | 5 +- .../send-content.component.test.js.snap | 347 ++++++++++++++ .../send-content/send-content.component.js | 2 +- .../send-content.component.test.js | 431 +++++++++++------- .../__snapshots__/send-gas-row.test.js.snap | 125 +++++ .../send-gas-row.component.test.js | 32 -- .../send-gas-row.container.test.js | 71 --- .../send-gas-row/send-gas-row.test.js | 22 + .../send-row-wrapper.test.js.snap | 57 +++ .../send-row-wrapper.component.test.js | 111 ----- .../send-row-wrapper/send-row-wrapper.test.js | 59 +++ 15 files changed, 911 insertions(+), 380 deletions(-) create mode 100644 ui/pages/send/send-content/__snapshots__/send-content.component.test.js.snap create mode 100644 ui/pages/send/send-content/send-gas-row/__snapshots__/send-gas-row.test.js.snap delete mode 100644 ui/pages/send/send-content/send-gas-row/send-gas-row.component.test.js delete mode 100644 ui/pages/send/send-content/send-gas-row/send-gas-row.container.test.js create mode 100644 ui/pages/send/send-content/send-gas-row/send-gas-row.test.js create mode 100644 ui/pages/send/send-content/send-row-wrapper/__snapshots__/send-row-wrapper.test.js.snap delete mode 100644 ui/pages/send/send-content/send-row-wrapper/send-row-wrapper.component.test.js create mode 100644 ui/pages/send/send-content/send-row-wrapper/send-row-wrapper.test.js diff --git a/jest.config.js b/jest.config.js index 98da7bca5..7db4dee25 100644 --- a/jest.config.js +++ b/jest.config.js @@ -10,7 +10,7 @@ module.exports = { coverageReporters: ['html', 'text-summary', 'json-summary'], coverageThreshold: { global: { - branches: 44, + branches: 48, functions: 46, lines: 52, statements: 52, diff --git a/test/data/mock-send-state.json b/test/data/mock-send-state.json index 72eefb6ef..82ec0fe5c 100644 --- a/test/data/mock-send-state.json +++ b/test/data/mock-send-state.json @@ -18,6 +18,27 @@ }, "warning": null }, + "confirmTransaction": { + "txData": { + "id": 3111025347726181, + "time": 1620723786838, + "status": "unapproved", + "metamaskNetworkId": "5", + "chainId": "0x5", + "loadingDefaults": false, + "txParams": { + "from": "0x64a845a5b02460acf8a3d84503b0d68d028b4bb4", + "to": "0xaD6D458402F60fD3Bd25163575031ACDce07538D", + "value": "0x0", + "data": "0x095ea7b30000000000000000000000009bc5baf874d2da8d216ae9f137804184ee5afef40000000000000000000000000000000000000000000000000000000000011170", + "gas": "0xea60", + "gasPrice": "0x4a817c800" + }, + "type": "transfer", + "origin": "https://metamask.github.io", + "transactionCategory": "approve" + } + }, "history": { "mostRecentOverviewPage": "/mostRecentOverviewPage" }, diff --git a/test/data/mock-state.json b/test/data/mock-state.json index a83d6bb87..5eb643c68 100644 --- a/test/data/mock-state.json +++ b/test/data/mock-state.json @@ -1,4 +1,7 @@ { + "ENS": { + "resolution": "" + }, "appState": { "networkDropdownOpen": false, "gasIsLoading": false, @@ -19,6 +22,8 @@ "mostRecentOverviewPage": "/mostRecentOverviewPage" }, "metamask": { + "ipfsGateway": "", + "dismissSeedBackUpReminder": false, "usePhishDetect": true, "participateInMetaMetrics": false, "gasEstimateType": "fee-market", diff --git a/ui/components/ui/dialog/index.js b/ui/components/ui/dialog/index.js index 457aa6a4d..e9f10dc24 100644 --- a/ui/components/ui/dialog/index.js +++ b/ui/components/ui/dialog/index.js @@ -11,6 +11,7 @@ export default function Dialog(props) { 'dialog--error': type === 'error', 'dialog--warning': type === 'warning', })} + data-testid="dialog-message" onClick={onClick} > {children} diff --git a/ui/pages/send/gas-display/gas-display.js b/ui/pages/send/gas-display/gas-display.js index 24d201652..3bc48c6ee 100644 --- a/ui/pages/send/gas-display/gas-display.js +++ b/ui/pages/send/gas-display/gas-display.js @@ -425,7 +425,10 @@ export default function GasDisplay({ gasError }) { /> {(gasError || isInsufficientTokenError) && ( - + +
+
+
+
+ Asset: +
+
+
+
+
+
+ +
+
+
+ ETH +
+
+ + Balance: + +
+ + + 0 + + + ETH + +
+
+
+ +
+
+
+
+
+
+
+ Amount: + +
+
+
+
+
+
+ +
+ ETH +
+
+
+ No conversion rate available +
+
+ +
+
+
+
+
+
+
+ Hex data: +
+
+
+