From 88fefd0bc3a637984c0edd64f638e966eaf4f100 Mon Sep 17 00:00:00 2001
From: ioedeveloper <daviddisu8@gmail.com>
Date: Wed, 19 Feb 2020 18:36:46 +0000
Subject: [PATCH] Modified testFunction command

---
 src/app/ui/txLogger.js                      |  2 +-
 test-browser/commands/testTransactionLog.js | 13 +++++++++++++
 test-browser/tests/ballot.js                | 14 --------------
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/app/ui/txLogger.js b/src/app/ui/txLogger.js
index 92eae0c9b5..fe20ca1d1f 100644
--- a/src/app/ui/txLogger.js
+++ b/src/app/ui/txLogger.js
@@ -215,7 +215,7 @@ function renderKnownTransaction (self, data, blockchain) {
         ${checkTxStatus(data.receipt, txType)}
         ${context(self, {from, to, data}, blockchain)}
         <div class=${css.buttons}>
-          <button data-shared="txLoggerDebugButton" data-id="txLoggerDebugButton${data.tx.hash}" class="${css.debug} btn btn-primary btn-sm" onclick=${(e) => debug(e, data, self)}>Debug</div>
+          <button class="${css.debug} btn btn-primary btn-sm" data-shared="txLoggerDebugButton" data-id="txLoggerDebugButton${data.tx.hash}" onclick=${(e) => debug(e, data, self)}>Debug</div>
         </div>
         <i class="${css.arrow} fas fa-angle-down"></i>
       </div>
diff --git a/test-browser/commands/testTransactionLog.js b/test-browser/commands/testTransactionLog.js
index df2bb942d0..ab7e7c5245 100644
--- a/test-browser/commands/testTransactionLog.js
+++ b/test-browser/commands/testTransactionLog.js
@@ -7,6 +7,19 @@ class testTransactionLog extends EventEmitter {
     const logs = {}
     const setLog = (index, value) => logs[Object.keys(logs)[index]] = value;
 
+    browser.waitForElementPresent('.instance button[title="' + fnFullName + '"]')
+    .perform(function (client, done) {
+      client.execute(function () {
+        document.querySelector('#runTabView').scrollTop = document.querySelector('#runTabView').scrollHeight
+      }, [], function () {
+        if (expectedInput) {
+          client.setValue('#runTabView input[title="' + expectedInput.types + '"]', expectedInput.values, function () {})
+        }
+        done()
+      })
+    })
+    .click('.instance button[title="' + fnFullName + '"]')
+    .pause(500)
     browser.waitForElementVisible(`*[data-id="txLogger${txHash}"]`)
     .click(`*[data-id="txLogger${txHash}"]`)
     .waitForElementVisible(`*[data-id="txLoggerTable${txHash}"]`)
diff --git a/test-browser/tests/ballot.js b/test-browser/tests/ballot.js
index 5add4d96b6..0cebb4ba5e 100644
--- a/test-browser/tests/ballot.js
+++ b/test-browser/tests/ballot.js
@@ -55,7 +55,6 @@ module.exports = {
     .clickLaunchIcon('fileExplorers')
     .addAtAddressInstance('0x692a70D2e424a56D2C6C27aA97D1a86395877b3A', true, true)
     .pause(500)
-<<<<<<< HEAD
     .waitForElementPresent('*[data-id="universalDappUiContractActionWrapper"]')
     .click('*[data-id="universalDappUiTitleExpander"]')
     .clickFunction('delegate - transact (not payable)', {types: 'address to', values: '"0x4b0897b0513fdc7c541b6d9d7e929c4e5364d2db"'})
@@ -65,19 +64,6 @@ module.exports = {
         'transaction hash': '0xca58080c8099429caeeffe43b8104df919c2c543dceb9edf9242fa55f045c803',
         'decoded input': { 'address to': '0x4B0897b0513fdC7C541B6d9D7E929C4e5364D2dB' }
       })
-=======
-    .waitForElementPresent('.instance:nth-of-type(2)')
-    .click('.instance:nth-of-type(2) > div > button')
-    .createContract(["0xca58080c8099429caeeffe43b8104df919c2c543dceb9edf9242fa55f045c803"])
-    .pause(100000)
-    .testTransactionLog('0x57f7ac07a894739a8bbf059248f47aa49935bfcf673494114b1c5c0c183890f0', {
-      status: '0x1 Transaction mined and execution succeed',
-      'transaction hash': '0x57f7ac07a894739a8bbf059248f47aa49935bfcf673494114b1c5c0c183890f0',
-      'decoded input': { 
-        'bytes32[] proposalNames': [ '0x48656c6c6f20576f726c64210000000000000000000000000000000000000000' ]
-      }
-    })
->>>>>>> Improve transaction log tests
   },
 
   'Deploy and use Ballot using external web3': function (browser) {