From 5ce377e3baf4ff7463a506ad5053b484b9b94ca0 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Thu, 22 Feb 2018 18:10:02 +0100
Subject: [PATCH] fixTest_addinstance

---
 test-browser/helpers/contracts.js | 13 +++++++------
 test-browser/tests/ballot.js      |  4 ++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/test-browser/helpers/contracts.js b/test-browser/helpers/contracts.js
index 183612edcf..e7e5427d11 100644
--- a/test-browser/helpers/contracts.js
+++ b/test-browser/helpers/contracts.js
@@ -1,6 +1,5 @@
 'use strict'
 var deepequal = require('deep-equal')
-var ethJSUtil = require('ethereumjs-util')
 
 module.exports = {
   getCompiledContracts: getCompiledContracts,
@@ -162,18 +161,20 @@ function setEditorValue (value, callback) {
   return this
 }
 
-function addInstance(browser, address, isValidFormat, isValidChecksum, callback) {
+function addInstance (browser, address, isValidFormat, isValidChecksum, callback) {
   browser.setValue('.ataddressinput', address, function () {
     browser.click('div[class^="atAddress"]')
       .perform((client, done) => {
         browser.execute(function () {
+          var ret = document.querySelector('div[class^="modalBody"] div').innerHTML
+          document.querySelector('#modal-footer-ok').click()
+          return ret
+        }, [], function (result) {
           if (!isValidFormat) {
-            browser.assert.fail(document.querySelector('div[class^="modalBody"] div').innerHTML, 'Invalid address.', '')
+            browser.assert.fail(result.value, 'Invalid address.', '')
           } else if (!isValidChecksum) {
-            browser.assert.fail(document.querySelector('div[class^="modalBody"] div').innerHTML, 'Invalid checksum address.', '')
+            browser.assert.fail(result.value, 'Invalid checksum address.', '')
           }
-          document.querySelector('#modal-footer-ok').click()
-        }, [], function (result) {
           done()
         })
       }).perform(() => {
diff --git a/test-browser/tests/ballot.js b/test-browser/tests/ballot.js
index 00dabb091a..68ba90097b 100644
--- a/test-browser/tests/ballot.js
+++ b/test-browser/tests/ballot.js
@@ -72,8 +72,8 @@ function runTests (browser, testData) {
         })
       })
       .perform((client, done) => {
-        console.log('addInstance invalid checksum address 0x692a70d2e424a56d2c6c27aa97d1a86395877b3a')
-        contractHelper.addInstance(browser, '0x692a70d2e424a56d2c6c27aa97d1a86395877b3a', true, false, () => {
+        console.log('addInstance invalid checksum address 0x692a70D2e424a56D2C6C27aA97D1a86395877b3B')
+        contractHelper.addInstance(browser, '0x692a70D2e424a56D2C6C27aA97D1a86395877b3B', true, false, () => {
           done()
         })
       })