aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Miller <danjm.com@gmail.com>2019-01-23 10:09:34 +0800
committerWhymarrh Whitby <whymarrh.whitby@gmail.com>2019-01-25 07:01:30 +0800
commit76f9bdec631ac490e409c8bf9cdb851570e91398 (patch)
tree522e49ffea3775686ed34afddf03a4688b5540b2
parent7d18a47c22bc43053233c09e4d113a1bc17b1b71 (diff)
downloadtangerine-wallet-browser-76f9bdec631ac490e409c8bf9cdb851570e91398.tar.gz
tangerine-wallet-browser-76f9bdec631ac490e409c8bf9cdb851570e91398.tar.zst
tangerine-wallet-browser-76f9bdec631ac490e409c8bf9cdb851570e91398.zip
Add integration test for ordering of shapeshift txs in history list.
-rw-r--r--development/states/tx-list-items.json213
-rw-r--r--test/integration/lib/tx-list-items.js22
2 files changed, 227 insertions, 8 deletions
diff --git a/development/states/tx-list-items.json b/development/states/tx-list-items.json
index caa0d37f6..24daf3254 100644
--- a/development/states/tx-list-items.json
+++ b/development/states/tx-list-items.json
@@ -497,6 +497,214 @@
"rawTx": "0xf8a8028405f5e10082d3e19466f30b996a7d345cd00badcfe75e81e25dc5e1eb80b844a9059cbb000000000000000000000000e7884118ee52ec3f4eef715cb022279d7d4181a9000000000000000000000000000000000000000000000000000000000000000b2aa05cb38a3a68e49008da2e93839f6dedeb96b1630c2a73c4cf5eb3fcc74299a100a039f17c0807469bd101165fa0749dc7065832b4a7c3a382b6cf7e29228c2a683d",
"status": "confirmed",
"submittedTime": 1522346282571,
+ "time": 1522348270251,
+ "txParams": {
+ "chainId": "0x3",
+ "data": "0xa9059cbb000000000000000000000000e7884118ee52ec3f4eef715cb022279d7d4181a9000000000000000000000000000000000000000000000000000000000000000b",
+ "from": "0x5b1cbd5636d484bf1cb6927a9425db9e7dc73ce4",
+ "gas": "0xd3e1",
+ "gasPrice": "0x5f5e100",
+ "nonce": "0x6",
+ "to": "0x66f30b996a7d345cd00badcfe75e81e25dc5e1ec",
+ "value": "0x0"
+ }
+ },
+ {
+ "estimatedGas": "8d41",
+ "firstRetryBlockNumber": "0x2cbc70",
+ "gasLimitSpecified": false,
+ "gasPriceSpecified": false,
+ "hash": "0xfbd997bf9bb85ca1598952ca23e7910502d527e06cb6ee1bbe7e7dd59d6909cd",
+ "history": [
+ {
+ "id": 2079438776801906,
+ "loadingDefaults": true,
+ "metamaskNetworkId": "1",
+ "status": "unapproved",
+ "time": 1522346270251,
+ "txParams": {
+ "data": "0xa9059cbb000000000000000000000000e7884118ee52ec3f4eef715cb022279d7d4181a9000000000000000000000000000000000000000000000000000000000000000b",
+ "from": "0x5b1cbd5636d484bf1cb6927a9425db9e7dc73ce4",
+ "to": "0x66f30b996a7d345cd00badcfe75e81e25dc5e1eb"
+ }
+ },
+ [
+ {
+ "op": "add",
+ "path": "/txParams/gasPrice",
+ "value": "0x37e11d600"
+ },
+ {
+ "op": "add",
+ "path": "/txParams/value",
+ "value": "0x0"
+ },
+ {
+ "op": "add",
+ "path": "/txParams/gas",
+ "value": "0xd3e1"
+ },
+ {
+ "op": "replace",
+ "path": "/loadingDefaults",
+ "value": false
+ },
+ {
+ "op": "add",
+ "path": "/gasPriceSpecified",
+ "value": false
+ },
+ {
+ "op": "add",
+ "path": "/gasLimitSpecified",
+ "value": false
+ },
+ {
+ "op": "add",
+ "path": "/estimatedGas",
+ "value": "8d41"
+ }
+ ],
+ [
+ {
+ "note": "confTx: user approved transaction",
+ "op": "replace",
+ "path": "/txParams/gasPrice",
+ "value": "0x5f5e100"
+ }
+ ],
+ [
+ {
+ "note": "txStateManager: setting status to approved",
+ "op": "replace",
+ "path": "/status",
+ "value": "approved"
+ }
+ ],
+ [
+ {
+ "note": "transactions#approveTransaction",
+ "op": "add",
+ "path": "/txParams/nonce",
+ "value": "0x2"
+ },
+ {
+ "op": "add",
+ "path": "/nonceDetails",
+ "value": {
+ "local": {
+ "details": {
+ "highest": 2,
+ "startPoint": 2
+ },
+ "name": "local",
+ "nonce": 2
+ },
+ "network": {
+ "details": {
+ "baseCount": 2
+ },
+ "name": "network",
+ "nonce": 2
+ },
+ "params": {
+ "highestLocalNonce": 2,
+ "highestSuggested": 2,
+ "nextNetworkNonce": 2
+ }
+ }
+ }
+ ],
+ [
+ {
+ "note": "txStateManager: setting status to signed",
+ "op": "add",
+ "path": "/txParams/chainId",
+ "value": "0x3"
+ },
+ {
+ "op": "replace",
+ "path": "/status",
+ "value": "signed"
+ }
+ ],
+ [
+ {
+ "note": "transactions#publishTransaction",
+ "op": "add",
+ "path": "/rawTx",
+ "value": "0xf8a8028405f5e10082d3e19466f30b996a7d345cd00badcfe75e81e25dc5e1eb80b844a9059cbb000000000000000000000000e7884118ee52ec3f4eef715cb022279d7d4181a9000000000000000000000000000000000000000000000000000000000000000b2aa05cb38a3a68e49008da2e93839f6dedeb96b1630c2a73c4cf5eb3fcc74299a100a039f17c0807469bd101165fa0749dc7065832b4a7c3a382b6cf7e29228c2a683d"
+ }
+ ],
+ [
+ {
+ "note": "transactions#setTxHash",
+ "op": "add",
+ "path": "/hash",
+ "value": "0xfbd997bf9bb85ca1598952ca23e7910502d527e06cb6ee1bbe7e7dd59d6909cd"
+ }
+ ],
+ [
+ {
+ "note": "txStateManager - add submitted time stamp",
+ "op": "add",
+ "path": "/submittedTime",
+ "value": 1522346282571
+ }
+ ],
+ [
+ {
+ "note": "txStateManager: setting status to submitted",
+ "op": "replace",
+ "path": "/status",
+ "value": "submitted"
+ }
+ ],
+ [
+ {
+ "note": "transactions/pending-tx-tracker#event: tx:block-update",
+ "op": "add",
+ "path": "/firstRetryBlockNumber",
+ "value": "0x2cbc70"
+ }
+ ],
+ [
+ {
+ "note": "txStateManager: setting status to confirmed",
+ "op": "replace",
+ "path": "/status",
+ "value": "confirmed"
+ }
+ ]
+ ],
+ "id": 2079438776801906,
+ "loadingDefaults": false,
+ "metamaskNetworkId": "1",
+ "nonceDetails": {
+ "local": {
+ "details": {
+ "highest": 2,
+ "startPoint": 2
+ },
+ "name": "local",
+ "nonce": 2
+ },
+ "network": {
+ "details": {
+ "baseCount": 2
+ },
+ "name": "network",
+ "nonce": 2
+ },
+ "params": {
+ "highestLocalNonce": 2,
+ "highestSuggested": 2,
+ "nextNetworkNonce": 2
+ }
+ },
+ "rawTx": "0xf8a8028405f5e10082d3e19466f30b996a7d345cd00badcfe75e81e25dc5e1eb80b844a9059cbb000000000000000000000000e7884118ee52ec3f4eef715cb022279d7d4181a9000000000000000000000000000000000000000000000000000000000000000b2aa05cb38a3a68e49008da2e93839f6dedeb96b1630c2a73c4cf5eb3fcc74299a100a039f17c0807469bd101165fa0749dc7065832b4a7c3a382b6cf7e29228c2a683d",
+ "status": "confirmed",
+ "submittedTime": 1522346282571,
"time": 1522346270251,
"txParams": {
"chainId": "0x3",
@@ -840,7 +1048,10 @@
"provider": {
"type": "testnet"
},
- "shapeShiftTxList": [{"depositAddress":"34vJ3AfmNcLiziA4VFgEVcQTwxVLD1qkke","depositType":"BTC","key":"shapeshift","response":{"status":"no_deposits","address":"34vJ3AfmNcLiziA4VFgEVcQTwxVLD1qkke"},"time":1522377459106}],
+ "shapeShiftTxList": [
+ {"depositAddress":"34vJ3AfmNcLiziA4VFgEVcQTwxVLD1qkke","depositType":"BTC","key":"shapeshift","response":{"status":"no_deposits","address":"34vJ3AfmNcLiziA4VFgEVcQTwxVLD1qkke"},"time":1522347459106},
+ {"depositAddress":"34vJ3AfmNcLiziA4VFgEVcQTwxVLD1qkkq","depositType":"BTC","key":"shapeshift","response":{"status":"no_deposits","address":"34vJ3AfmNcLiziA4VFgEVcQTwxVLD1qkkq"},"time":1522345459106}
+ ],
"lostAccounts": [],
"send": {},
"currentLocale": "en",
diff --git a/test/integration/lib/tx-list-items.js b/test/integration/lib/tx-list-items.js
index ac17a2a67..bf6f87937 100644
--- a/test/integration/lib/tx-list-items.js
+++ b/test/integration/lib/tx-list-items.js
@@ -30,7 +30,7 @@ async function runTxListItemsTest (assert, done) {
metamaskLogo[0].click()
const txListItems = await queryAsync($, '.transaction-list-item')
- assert.equal(txListItems.length, 6, 'all tx list items are rendered')
+ assert.equal(txListItems.length, 8, 'all tx list items are rendered')
const unapprovedMsg = txListItems[0]
const unapprovedMsgDescription = await findAsync($(unapprovedMsg), '.transaction-list-item__action')
@@ -40,11 +40,19 @@ async function runTxListItemsTest (assert, done) {
const approvedTxRenderedStatus = await findAsync($(approvedTx), '.transaction-list-item__status')
assert.equal(approvedTxRenderedStatus[0].textContent, 'pending', 'approvedTx has correct label')
- const shapeShiftTx = txListItems[4]
- const shapeShiftTxStatus = await findAsync($(shapeShiftTx), '.flex-column div:eq(1)')
- assert.equal(shapeShiftTxStatus[0].textContent, 'No deposits received', 'shapeShiftTx has correct status')
+ const confirmedTokenTx1 = txListItems[4]
+ const confirmedTokenTx1Address = await findAsync($(confirmedTokenTx1), '.transaction-list-item__status')
+ assert.equal(confirmedTokenTx1Address[0].textContent, 'Confirmed', 'confirmedTokenTx has correct status')
- const confirmedTokenTx = txListItems[5]
- const confirmedTokenTxAddress = await findAsync($(confirmedTokenTx), '.transaction-list-item__status')
- assert.equal(confirmedTokenTxAddress[0].textContent, 'Confirmed', 'confirmedTokenTx has correct address')
+ const shapeShiftTx1 = txListItems[5]
+ const shapeShiftTx1Status = await findAsync($(shapeShiftTx1), '.flex-column div:eq(1)')
+ assert.equal(shapeShiftTx1Status[0].textContent, 'No deposits received', 'shapeShiftTx has correct status')
+
+ const confirmedTokenTx2 = txListItems[6]
+ const confirmedTokenTx2Address = await findAsync($(confirmedTokenTx2), '.transaction-list-item__status')
+ assert.equal(confirmedTokenTx2Address[0].textContent, 'Confirmed', 'confirmedTokenTx has correct status')
+
+ const shapeShiftTx2 = txListItems[7]
+ const shapeShiftTx2Address = await findAsync($(shapeShiftTx2), '.flex-column div:eq(1)')
+ assert.equal(shapeShiftTx2Address[0].textContent, 'No deposits received', 'shapeShiftTx has correct status')
}