diff options
| -rw-r--r-- | test/base.conf.js | 2 | ||||
| -rw-r--r-- | test/integration/lib/confirm-sig-requests.js | 18 | ||||
| -rw-r--r-- | test/integration/lib/send-new-ui.js | 2 | ||||
| -rw-r--r-- | ui/app/components/pending-tx/confirm-send-ether.js | 3 |
4 files changed, 7 insertions, 18 deletions
diff --git a/test/base.conf.js b/test/base.conf.js index 192c98327..e2e9d44ba 100644 --- a/test/base.conf.js +++ b/test/base.conf.js @@ -10,8 +10,6 @@ module.exports = function(config) { terminal: false, }, - browserNoActivityTimeout: 100000000, - // frameworks to use // available frameworks: https://npmjs.org/browse/keyword/karma-adapter frameworks: ['qunit'], diff --git a/test/integration/lib/confirm-sig-requests.js b/test/integration/lib/confirm-sig-requests.js index 3936ac5fa..1576e317c 100644 --- a/test/integration/lib/confirm-sig-requests.js +++ b/test/integration/lib/confirm-sig-requests.js @@ -21,22 +21,14 @@ async function runConfirmSigRequestsTest(assert, done) { selectState.val('confirm sig requests') reactTriggerChange(selectState[0]) - // await timeout(1000000) - - const pendingRequestItem = $.find('.tx-list-item.tx-list-pending-item-container.tx-list-clickable') - - if (pendingRequestItem[0]) { - pendingRequestItem[0].click() - } + const pendingRequestItem = await queryAsync($, '.tx-list-item.tx-list-pending-item-container.tx-list-clickable') + pendingRequestItem[0].click() let confirmSigHeadline = await queryAsync($, '.request-signature__headline') assert.equal(confirmSigHeadline[0].textContent, 'Your signature is being requested') - let confirmSigMessage = await queryAsync($, '.request-signature__notice') - assert.ok(confirmSigMessage[0].textContent.match(/^Signing\sthis\smessage/)) - let confirmSigRowValue = await queryAsync($, '.request-signature__row-value') - assert.equal(confirmSigRowValue[0].textContent, '0x879a053d4800c6354e76c7985a865d2922c82fb5b3f4577b2fe08b998954f2e0') + assert.ok(confirmSigRowValue[0].textContent.match(/^\#\sTerms\sof\sUse/)) let confirmSigSignButton = await queryAsync($, 'button.btn-primary--lg') confirmSigSignButton[0].click() @@ -44,8 +36,8 @@ async function runConfirmSigRequestsTest(assert, done) { confirmSigHeadline = await queryAsync($, '.request-signature__headline') assert.equal(confirmSigHeadline[0].textContent, 'Your signature is being requested') - confirmSigRowValue = await queryAsync($, '.request-signature__row-value') - assert.ok(confirmSigRowValue[0].textContent.match(/^\#\sTerms\sof\sUse/)) + let confirmSigMessage = await queryAsync($, '.request-signature__notice') + assert.ok(confirmSigMessage[0].textContent.match(/^Signing\sthis\smessage/)) confirmSigSignButton = await queryAsync($, 'button.btn-primary--lg') confirmSigSignButton[0].click() diff --git a/test/integration/lib/send-new-ui.js b/test/integration/lib/send-new-ui.js index fc3d7a5d1..163f3658c 100644 --- a/test/integration/lib/send-new-ui.js +++ b/test/integration/lib/send-new-ui.js @@ -173,8 +173,6 @@ async function runSendFlowTest(assert, done) { console.log(`+++++++++++++++++++++++++++++++= confirmScreenConfirmButton[0]`, confirmScreenConfirmButton[0]); confirmScreenConfirmButton[0].click() - await timeout(10000000) - const txView = await queryAsync($, '.tx-view') console.log(`++++++++++++++++++++++++++++++++ txView[0]`, txView[0]); diff --git a/ui/app/components/pending-tx/confirm-send-ether.js b/ui/app/components/pending-tx/confirm-send-ether.js index a9beeacbb..afd459415 100644 --- a/ui/app/components/pending-tx/confirm-send-ether.js +++ b/ui/app/components/pending-tx/confirm-send-ether.js @@ -283,6 +283,7 @@ ConfirmSendEther.prototype.editTransaction = function (txMeta) { ConfirmSendEther.prototype.render = function () { const { + editTransaction, currentCurrency, clearSend, conversionRate, @@ -338,7 +339,7 @@ ConfirmSendEther.prototype.render = function () { h('.page-container__header', [ h('.page-container__header-row', [ h('span.page-container__back-button', { - onClick: () => this.editTransaction(txMeta), + onClick: () => editTransaction(txMeta), style: { visibility: !txMeta.lastGasPrice ? 'initial' : 'hidden', }, |