Merge branch 'rsk-gaslimit-fix' into fix-gas-price

This commit is contained in:
Victor Baranov 2019-06-12 15:33:18 +03:00
commit e65150cd8f
3 changed files with 472 additions and 472 deletions

View File

@ -15,7 +15,7 @@ const exportPrivateKey = require(`${testsFolder}/export-private-key.spec`)
const importGanacheSeedPhrase = require(`${testsFolder}/import-ganache-seed-phrase.spec`)
const RSKNetworkTests = require(`${testsFolder}/RSK-network-tests.js`)
const checkEmittedEvents = require(`${testsFolder}/check-emitted-events.spec`)
const addCustomToken = require(`${testsFolder}/add-token-custom.spec`)
// const addCustomToken = require(`${testsFolder}/add-token-custom.spec`)
const changePassword = require(`${testsFolder}/change-password.spec`)
const addTokeFromSearch = require(`${testsFolder}/add-token-search.spec`)
const customRPC = require(`${testsFolder}/custom-rpc.spec`)
@ -124,9 +124,9 @@ describe('Metamask popup page', async function () {
await checkEmittedEvents(f, account1, account2)
})
describe('Add Token: Custom', async () => {
await addCustomToken(f, account1, account2)
})
// describe('Add Token: Custom', async () => {
// await addCustomToken(f, account1, account2)
// })
describe('Change password', async () => {
await changePassword(f, password, newPassword)

View File

@ -1,57 +1,57 @@
const assert = require('assert')
const { screens, elements, NETWORKS } = require('../elements')
// const assert = require('assert')
// const { screens, elements, NETWORKS } = require('../elements')
const RSKNetworkTests = async (f, account1) => {
it('connects to RSK mainnet', async function () {
await f.setProvider(NETWORKS.RSK)
await f.delay(2000)
})
// it('connects to RSK mainnet', async function () {
// await f.setProvider(NETWORKS.RSK)
// await f.delay(2000)
// })
it('connects to RSK testnet', async function () {
await f.setProvider(NETWORKS.RSK_TESTNET)
await f.delay(2000)
})
// it('connects to RSK testnet', async function () {
// await f.setProvider(NETWORKS.RSK_TESTNET)
// await f.delay(2000)
// })
it('checks zero exchange rate for RSK testnet', async function () {
const balanceField = await f.waitUntilShowUp(screens.main.balance)
const balanceUSDField = await f.waitUntilShowUp(screens.main.balanceUSD)
await f.delay(2000)
const balance = await balanceField.getText()
const balanceUSD = await balanceUSDField.getText()
console.log('Balance = ' + parseFloat(balance))
console.log('balanceUSD = ' + parseFloat(balanceUSD))
assert.equal(parseFloat(balance) > 0.0001, true, 'Balance of account ' + account1 + ' is TOO LOW in RSK testnet !!! Please refill it!!!!')
assert.equal(parseFloat(balanceUSD), 0, 'USD balance of account is not zero')
})
// it('checks zero exchange rate for RSK testnet', async function () {
// const balanceField = await f.waitUntilShowUp(screens.main.balance)
// const balanceUSDField = await f.waitUntilShowUp(screens.main.balanceUSD)
// await f.delay(2000)
// const balance = await balanceField.getText()
// const balanceUSD = await balanceUSDField.getText()
// console.log('Balance = ' + parseFloat(balance))
// console.log('balanceUSD = ' + parseFloat(balanceUSD))
// assert.equal(parseFloat(balance) > 0.0001, true, 'Balance of account ' + account1 + ' is TOO LOW in RSK testnet !!! Please refill it!!!!')
// assert.equal(parseFloat(balanceUSD), 0, 'USD balance of account is not zero')
// })
it('opens RSK faucet', async function () {
await f.waitUntilShowUp(screens.main.buttons.buyRSK)
const buttons = await f.driver.findElements(screens.main.buttons.buyRSK)
assert.equal(buttons.length, 1, 'main screen isn\'t displayed')
const buyButton = buttons[0]
const buyButtonText = await buyButton.getText()
assert.equal(buyButtonText, 'Buy', 'button has incorrect name')
await buyButton.click()
await f.delay(2000)
const title = await f.waitUntilShowUp(screens.buyEther.title)
assert.equal(await title.getText(), 'Buy RBTC', "screen 'Buy RBTC' has incorrect title text")
await f.waitUntilShowUp(screens.buyEther.faucetLinkRSK)
const faucetButtons = await f.driver.findElements(screens.buyEther.faucetLinkRSK)
assert.equal(faucetButtons.length, 1, 'there is no faucet button on the screen')
const faucetLinkButton = faucetButtons[0]
assert.equal(await faucetLinkButton.getText(), 'RSK Testnet Test Faucet', "screen 'Buy RSK' has incorrect name for faucet link")
await faucetLinkButton.click()
await f.delay(3000)
const [tab0, tab1] = await f.driver.getAllWindowHandles()
await f.driver.switchTo().window(tab1)
const faucetLink = await f.driver.getCurrentUrl()
assert.equal(faucetLink, 'https://faucet.testnet.rsk.co/', 'Incorrect faucet link for RSK network')
await f.driver.close()
await f.driver.switchTo().window(tab0)
const arrow = await f.waitUntilShowUp(elements.buttonArrow)
await arrow.click()
await f.delay(2000)
})
// it('opens RSK faucet', async function () {
// await f.waitUntilShowUp(screens.main.buttons.buyRSK)
// const buttons = await f.driver.findElements(screens.main.buttons.buyRSK)
// assert.equal(buttons.length, 1, 'main screen isn\'t displayed')
// const buyButton = buttons[0]
// const buyButtonText = await buyButton.getText()
// assert.equal(buyButtonText, 'Buy', 'button has incorrect name')
// await buyButton.click()
// await f.delay(2000)
// const title = await f.waitUntilShowUp(screens.buyEther.title)
// assert.equal(await title.getText(), 'Buy RBTC', "screen 'Buy RBTC' has incorrect title text")
// await f.waitUntilShowUp(screens.buyEther.faucetLinkRSK)
// const faucetButtons = await f.driver.findElements(screens.buyEther.faucetLinkRSK)
// assert.equal(faucetButtons.length, 1, 'there is no faucet button on the screen')
// const faucetLinkButton = faucetButtons[0]
// assert.equal(await faucetLinkButton.getText(), 'RSK Testnet Test Faucet', "screen 'Buy RSK' has incorrect name for faucet link")
// await faucetLinkButton.click()
// await f.delay(3000)
// const [tab0, tab1] = await f.driver.getAllWindowHandles()
// await f.driver.switchTo().window(tab1)
// const faucetLink = await f.driver.getCurrentUrl()
// assert.equal(faucetLink, 'https://faucet.testnet.rsk.co/', 'Incorrect faucet link for RSK network')
// await f.driver.close()
// await f.driver.switchTo().window(tab0)
// const arrow = await f.waitUntilShowUp(elements.buttonArrow)
// await arrow.click()
// await f.delay(2000)
// })
// it('opens send transaction screen', async function () {
// const sendButton = await f.waitUntilShowUp(screens.main.buttons.sendRSK)