Merge branch 'develop' into copy-abi

poanetwork · Dec 26, 2018 · 887b45d · 887b45d
2 parents e155e9e + dca7c49
commit 887b45d
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 18 deletions.
diff --git a/old-ui/app/account-detail.js b/old-ui/app/account-detail.js
@@ -215,10 +215,10 @@ AccountDetailScreen.prototype.render = function () {
 
           h('.flex-grow'),
 
-          h('button', {
+          !ifContractAcc(currentKeyring) ? h('button', {
             onClick: () => props.dispatch(actions.buyEthView(selected)),
             style: { marginRight: '10px' },
-          }, 'Buy'),
+          }, 'Buy') : null,
 
           h('button', {
             onClick: () => {
@@ -228,7 +228,7 @@ AccountDetailScreen.prototype.render = function () {
                 return props.dispatch(actions.showSendPage())
               }
             },
-          }, 'Send'),
+          }, ifContractAcc(currentKeyring) ? 'Execute methods' : 'Send'),
 
         ]),
       ]),

diff --git a/test/e2e/elements.js b/test/e2e/elements.js
@@ -73,8 +73,8 @@ module.exports = {
       buttonNext: By.css('.section > div:nth-child(1) > button:nth-child(2)'),
       buttonArrow: By.className('fa fa-arrow-left fa-lg cursor-pointer'),
       buttonCopyABI: By.className('btn-violet'),
+      buttonExecuteMethod: By.css('#app-content > div > div.app-primary.from-right > div > div > div.flex-row > button'),
     },
-
     eventsEmitter: {
       button: By.className('btn btn-default'),
       event: By.className('Toastify__toast-body'),

diff --git a/test/e2e/metamask.spec.js b/test/e2e/metamask.spec.js
@@ -392,11 +392,14 @@ describe('Metamask popup page', async function () {
     describe('Execute Method screen', () => {
       const notContractAddress = '0x56B2e3C3cFf7f3921Dc2e0F8B8e20d1eEc29216b'
       describe("Check UI and button's functionality", () => {
-        it("Click button 'Send', 'Execute Method' screen opens", async function () {
+
+        it("Click button 'Execute method'", async function () {
           await driver.navigate().refresh()
           await delay(2000)
-          const button = await waitUntilShowUp(screens.main.buttons.send)
-          await click(button)
+          const button = await waitUntilShowUp(screens.executeMethod.buttonExecuteMethod)
+          assert.notEqual(button, false, "button doesn't displayed")
+          assert.equal(await button.getText(), 'Execute methods', 'button has incorrect name')
+          await button.click()
         })
 
         it('title is displayed and correct', async function () {
@@ -411,18 +414,19 @@ describe('Metamask popup page', async function () {
           const identicon = await waitUntilShowUp(screens.main.identicon, 40)
           assert.notEqual(identicon, false, "main screen isn't opened")
         })
+      })
+      describe('Check output for data type : ADDRESS', () => {
+        const address = '0x56B2e3C3cFf7f3921Dc2e0F8B8e20d1eEc29216b'
 
-        it("Click button 'Send', 'Execute Method' screen opens", async function () {
+        it("Click button 'Execute method'", async function () {
           await driver.navigate().refresh()
           await delay(2000)
-          const button = await waitUntilShowUp(screens.main.buttons.send)
-          await click(button)
+          const button = await waitUntilShowUp(screens.executeMethod.buttonExecuteMethod)
+          assert.notEqual(button, false, "button doesn't displayed")
+          assert.equal(await button.getText(), 'Execute methods', 'button has incorrect name')
+          await button.click()
         })
 
-      })
-      describe('Check output for data type : ADDRESS', () => {
-        const address = '0x56B2e3C3cFf7f3921Dc2e0F8B8e20d1eEc29216b'
-
         it("Select method 'returnAddress'", async function () {
           const field = await waitUntilShowUp(screens.executeMethod.selectArrow)
           await field.click()
@@ -528,7 +532,8 @@ describe('Metamask popup page', async function () {
         })
       })
       describe('Check output for data type : BOOLEAN', () => {
-          it("Select method 'returnBoolean'", async function () {
+
+        it("Select method 'returnBoolean'", async function () {
           const field = await waitUntilShowUp(screens.executeMethod.selectArrow)
           await field.click()
           await waitUntilShowUp(screens.executeMethod.items)
@@ -594,8 +599,10 @@ describe('Metamask popup page', async function () {
 
       })
       describe('Check output for data type : BYTES', () => {
+
         const bytesValue = '0x010203'
-        it("Select method 'returnBytes1'", async function () {
+
+   it("Select method 'returnBytes1'", async function () {
           const field = await waitUntilShowUp(screens.executeMethod.selectArrow)
           await field.click()
           await waitUntilShowUp(screens.executeMethod.items)
@@ -638,8 +645,10 @@ describe('Metamask popup page', async function () {
 
       })
       describe('Check output for data type : UINT256', () => {
+
         const uint256Value = '1122334455667788991122334455667788'
-        it("Select method 'returnUint256'", async function () {
+
+   it("Select method 'returnUint256'", async function () {
           const field = await waitUntilShowUp(screens.executeMethod.selectArrow)
           await field.click()
           await waitUntilShowUp(screens.executeMethod.items)
@@ -683,8 +692,10 @@ describe('Metamask popup page', async function () {
 
       })
       describe('Check output for data type : INT256', () => {
+
         const int256Value = '-1122334455667788991122334455667788'
-        it("Select method 'returnInt256'", async function () {
+
+       it("Select method 'returnInt256'", async function () {
           const field = await waitUntilShowUp(screens.executeMethod.selectArrow)
           await field.click()
           await waitUntilShowUp(screens.executeMethod.items)