Merge pull request #244 from Lamden/update_2.2.0

Update 2.2.0 all tests passing

Author: JeffWScott

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "lamden-wallet",
-  "version": "2.1.7",
+  "version": "2.2.0",
   "description": "A secure wallet for making transactions on the Lamden blockchain.",
   "author": "Jeff Scott <[email protected]>",
   "license": "",
@@ -17,6 +17,7 @@
     "test-dapps-wallet-connect": "mocha --timeout 60000 selenium/tests/dapp/content_lamdenWalletConnect.js",
     "test-dapps-get-info": "mocha --timeout 60000 selenium/tests/dapp/content_lamdenWalletGetInfo.js",
     "test-dapps-sendtx": "mocha --timeout 60000 selenium/tests/dapp/content_lamdenWalletSendTx.js",
+    "test-dapps-sendx-backtoback": "mocha --timeout 60000 selenium/tests/dapp/content_landenWalletSendTxBacktoBack.js",
     "test-tokens": "mocha --recursive --timeout 50000 selenium/tests/ui/tokens/*.js",
     "test-tokens-add": "mocha --timeout 50000 selenium/tests/ui/tokens/tokens-add.js",
     "test-tokens-upload": "mocha --timeout 60000 selenium/tests/ui/tokens/tokens-upload-images.js",

package.json

@@ -52,10 +52,9 @@ const addToken_Save = async (driver, token) => {
 
 const validateTokenOnAccountsScreen = async (driver, token) => {
     await helpers.gotoAccountsPage(driver)
-    await driver.findElement(By.className("collapse-btn")).click()
     await driver.wait(until.elementLocated(By.id(`token-row-${token.tokenSymbol}-${token.tokenName.replace(" ", "")}`)), 15000);
     await validateTokenLogo(driver, token)
-    await driver.findElement(By.className("collapse-btn")).click()
+    await driver.findElement(By.className("wrap-second")).click()
 }
 
 const validateTokenNotOnAccountsScreen = async (driver, token)=> {
@@ -180,7 +179,7 @@ const saveTokenModal = async (driver, token) => {
 }
 
 const gotoTokenDetails = async (driver, token) => {
-    let element = driver.findElement(By.className('collapse-btn'))
+    let element = driver.findElement(By.className('wrap-second'))
     await driver.executeScript("arguments[0].click();", element)
     await helpers.sleep(500);
     await driver.findElement(By.xpath(`//div[contains(text(),'${token.tokenName}')]`)).click()
@@ -220,13 +219,13 @@ const openAccountsScreen = async (driver) => {
 }
 
 const openCoinReceiveModal = async (driver) => {
-    await driver.findElement(By.className("collapse-btn")).click()
+    await driver.findElement(By.className("wrap-second")).click()
     await helpers.sleep(2000)
     await driver.findElement(By.id('receive-btn')).click();
 }
 
 const openCoinSendModal = async (driver) => {
-    await driver.findElement(By.className("collapse-btn")).click()
+    await driver.findElement(By.className("wrap-second")).click()
     await helpers.sleep(1000)
     await driver.findElement(By.id('send-btn')).click();
 }

selenium/helpers/helpers-token.js

@@ -287,34 +287,44 @@ const getWalletResponse = async (driver) => {
 
 const setupSendListener = (driver) => {
     return driver.executeScript(`
-        window.walletTxResult = new Promise((resolve, reject) => {window.txResolver = resolve})
+        window.walletTxResult = {};
+        window.txResolver = {};
+        window.walletTxResult['emptyuid'] = new Promise((resolve, reject) => {window.txResolver['emptyuid'] = resolve})
         document.addEventListener('lamdenWalletTxStatus', (response) => {
             let detail = response.detail
+            let uid;
+            if (detail.data && detail.data.uid) {
+                uid = detail.data.uid
+            } else {
+                uid = 'emptyuid'
+            }
 
             if (detail.data){
                 if (detail.data.blockResult){
                     if(detail.data.blockResult.hash) return
                 }
             }
-            window.txResolver(detail)
+            window.txResolver[uid](detail)
         });
     `);
 }
 
+const createUID = () => hashStringValue(new Date().toISOString())
+
 const sendTx = async (driver, transactionInfo, awaitResponse = true) => {
+    let uid = transactionInfo.uid
+    if (!uid) uid = 'emptyuid'
     return driver.executeScript(`
-        window.walletTxResult = undefined;
-        window.txResolver = undefined;
-        window.walletTxResult = new Promise((resolve, reject) => {window.txResolver = resolve})
+        window.walletTxResult['${uid}'] = new Promise((resolve, reject) => {window.txResolver['${uid}'] = resolve})
         document.dispatchEvent( new CustomEvent('lamdenWalletSendTx', {detail: '${JSON.stringify(transactionInfo)}'} ));
-        ${awaitResponse ? "console.log(await window.walletTxResult); return await window.walletTxResult" : ""}
+        ${awaitResponse ? `console.log(await window.walletTxResult['${uid}']); return await window.walletTxResult['${uid}']` : ""}
     `);
 }
 
-const getTxResult = async (driver) => {
+const getTxResult = async (driver, uid) => {
     return driver.executeScript(`
-        console.log(await window.walletTxResult)
-        return await window.walletTxResult
+        console.log(await window.walletTxResult['${uid}'])
+        return await window.walletTxResult['${uid}']
     `);
 }
 
@@ -534,5 +544,6 @@ module.exports = {
     gotoNetwork,
     clearNetwork,
     fillNetworkForm,
-    gotoBackup
+    gotoBackup,
+    createUID
 }