diff options
author | Alexander Tseung <alextsg@gmail.com> | 2018-08-07 05:08:00 +0800 |
---|---|---|
committer | Alexander Tseung <alextsg@gmail.com> | 2018-08-24 07:45:27 +0800 |
commit | c9ec5ed38d0e2475778ca6eb18d29b3389f67190 (patch) | |
tree | c10d2b7600e2a33bb1969731a075f62fef6f44d4 | |
parent | e104744d3b29af518bc60c45339d4d4458baaa68 (diff) | |
download | tangerine-wallet-browser-c9ec5ed38d0e2475778ca6eb18d29b3389f67190.tar tangerine-wallet-browser-c9ec5ed38d0e2475778ca6eb18d29b3389f67190.tar.gz tangerine-wallet-browser-c9ec5ed38d0e2475778ca6eb18d29b3389f67190.tar.bz2 tangerine-wallet-browser-c9ec5ed38d0e2475778ca6eb18d29b3389f67190.tar.lz tangerine-wallet-browser-c9ec5ed38d0e2475778ca6eb18d29b3389f67190.tar.xz tangerine-wallet-browser-c9ec5ed38d0e2475778ca6eb18d29b3389f67190.tar.zst tangerine-wallet-browser-c9ec5ed38d0e2475778ca6eb18d29b3389f67190.zip |
Fix e2e tests
-rw-r--r-- | test/e2e/beta/metamask-beta-ui.spec.js | 14 | ||||
-rw-r--r-- | ui/app/css/itcss/components/transaction-list.scss | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/test/e2e/beta/metamask-beta-ui.spec.js b/test/e2e/beta/metamask-beta-ui.spec.js index 6bae5768b..25e25dac4 100644 --- a/test/e2e/beta/metamask-beta-ui.spec.js +++ b/test/e2e/beta/metamask-beta-ui.spec.js @@ -587,7 +587,7 @@ describe('MetaMask', function () { await driver.switchTo().window(extension) await delay(regularDelayMs) - const txListItem = await findElement(driver, By.css('.tx-list-item')) + const txListItem = await findElement(driver, By.css('.transaction-list-item')) await txListItem.click() await delay(regularDelayMs) @@ -749,21 +749,21 @@ describe('MetaMask', function () { }) it('finds the transaction in the transactions list', async function () { - const transactions = await findElements(driver, By.css('.tx-list-item')) + const transactions = await findElements(driver, By.css('.transaction-list-item')) assert.equal(transactions.length, 1) - const txValues = await findElements(driver, By.css('.tx-list-value')) + const txValues = await findElements(driver, By.css('.transaction-list-item__amount--primary')) assert.equal(txValues.length, 1) // test cancelled on firefox until https://github.com/mozilla/geckodriver/issues/906 is resolved, // or possibly until we use latest version of firefox in the tests if (process.env.SELENIUM_BROWSER !== 'firefox') { - await driver.wait(until.elementTextMatches(txValues[0], /50\sTST/), 10000) + await driver.wait(until.elementTextMatches(txValues[0], /-50\sTST/), 10000) } - const txStatuses = await findElements(driver, By.css('.tx-list-status')) - const tx = await driver.wait(until.elementTextMatches(txStatuses[0], /Confirmed|Failed/), 10000) - assert.equal(await tx.getText(), 'Confirmed') + const txStatuses = await findElements(driver, By.css('.transaction-list-item__status')) + const tx = await driver.wait(until.elementTextMatches(txStatuses[0], /Outgoing|Failed/), 10000) + assert.equal(await tx.getText(), 'Outgoing') }) }) diff --git a/ui/app/css/itcss/components/transaction-list.scss b/ui/app/css/itcss/components/transaction-list.scss index 1d45ff13b..3435353d9 100644 --- a/ui/app/css/itcss/components/transaction-list.scss +++ b/ui/app/css/itcss/components/transaction-list.scss @@ -243,7 +243,7 @@ } .tx-list-item { - border-top: 1px solid rgb(231, 231, 231); + border-bottom: 1px solid $geyser; flex: 0 0 auto; display: flex; flex-flow: row nowrap; |