From 09a4147fe84d30ec6cc7934cb235853a6f45ac81 Mon Sep 17 00:00:00 2001 From: yann300 Date: Wed, 25 Apr 2018 11:29:23 +0200 Subject: [PATCH] improve testing output and event --- test-browser/helpers/contracts.js | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/test-browser/helpers/contracts.js b/test-browser/helpers/contracts.js index ac526ab565..c9b26d9d25 100644 --- a/test-browser/helpers/contracts.js +++ b/test-browser/helpers/contracts.js @@ -135,13 +135,25 @@ function testFunction (fnFullName, txHash, log, expectedInput, expectedReturn, e .click('#editor-container div[class^="terminal"] span[id="tx' + txHash + '"] div[class^="log"]') .perform(function (client, done) { if (expectedReturn) { - client.assert.containsText('#editor-container div[class^="terminal"] span[id="tx' + txHash + '"] table[class^="txTable"] #decodedoutput', expectedReturn) + client.getText('#editor-container div[class^="terminal"] span[id="tx' + txHash + '"] table[class^="txTable"] #decodedoutput', (result) => { + console.log(result) + var equal = deepequal(JSON.parse(result.value), JSON.parse(expectedReturn)) + if (!equal) { + client.assert.fail('expected ' + expectedReturn + ' got ' + result.value, 'info about error', '') + } + }) } done() }) .perform(function (client, done) { if (expectedEvent) { - client.assert.containsText('#editor-container div[class^="terminal"] span[id="tx' + txHash + '"] table[class^="txTable"] #logs', expectedEvent) + client.getText('#editor-container div[class^="terminal"] span[id="tx' + txHash + '"] table[class^="txTable"] #logs', (result) => { + console.log(result) + var equal = deepequal(JSON.parse(result.value), JSON.parse(expectedEvent)) + if (!equal) { + client.assert.fail('expected ' + expectedEvent + ' got ' + result.value, 'info about error', '') + } + }) } done() if (callback) callback()