From 9a16718807e789b98bed871ce503fb540366ebee Mon Sep 17 00:00:00 2001
From: LianaHus <liana@ethdev.com>
Date: Wed, 29 Apr 2020 11:34:08 +0200
Subject: [PATCH 1/6] show message for error in test file

---
 src/app/tabs/test-tab.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/app/tabs/test-tab.js b/src/app/tabs/test-tab.js
index 5a4b56a16c..968ac20577 100644
--- a/src/app/tabs/test-tab.js
+++ b/src/app/tabs/test-tab.js
@@ -273,6 +273,7 @@ module.exports = class TestTab extends ViewPlugin {
       // if all tests has been through before stopping no need to print this.
       this.testsExecutionStopped.hidden = false
     }
+    if (_errors) this.testsExecutionStoppedError.hidden = false
     if (_errors || this.hasBeenStopped || this.readyTestsNumber === this.runningTestsNumber) {
       // All tests are ready or the operation has been canceled or there was a compilation error in one of the test files.
       const stopBtn = document.getElementById('runTestsTabStopAction')
@@ -364,6 +365,7 @@ module.exports = class TestTab extends ViewPlugin {
     this.testsOutput.innerHTML = ''
     this.testsOutput.hidden = true
     this.testsExecutionStopped.hidden = true
+    this.testsExecutionStoppedError.hidden = true
     const tests = this.data.selectedTests
     if (!tests) return
     this.resultStatistics.hidden = tests.length === 0
@@ -484,7 +486,9 @@ module.exports = class TestTab extends ViewPlugin {
     this.onActivationInternal()
     this.testsOutput = yo`<div class="mx-3 mb-2 pb-4 border-top border-primary" hidden='true' id="solidityUnittestsOutput" data-id="testTabSolidityUnitTestsOutput"></a>`
     this.testsExecutionStopped = yo`<label class="text-warning h6" data-id="testTabTestsExecutionStopped">The test execution has been stopped</label>`
+    this.testsExecutionStoppedError = yo`<label class="text-danger h6" data-id="testTabTestsExecutionStoppedError">The test execution has been stopped because of error in your test file</label>`
     this.testsExecutionStopped.hidden = true
+    this.testsExecutionStoppedError.hidden = true
     this.resultStatistics = this.createResultLabel()
     this.resultStatistics.hidden = true
     const el = yo`
@@ -507,6 +511,7 @@ module.exports = class TestTab extends ViewPlugin {
           <div class="align-items-start flex-column mt-2 mx-3 mb-0">
             ${this.resultStatistics}
             ${this.testsExecutionStopped}
+            ${this.testsExecutionStoppedError}
           </div>
           ${this.testsOutput}
         </div>

From 9363bc392eb2bf70d50c1166df137d1f91d55a1f Mon Sep 17 00:00:00 2001
From: LianaHus <liana@ethdev.com>
Date: Wed, 29 Apr 2020 11:50:07 +0200
Subject: [PATCH 2/6] updated test to check compilation error message

---
 test-browser/tests/solidityUnittests.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test-browser/tests/solidityUnittests.js b/test-browser/tests/solidityUnittests.js
index 869f62c717..ec3e4793ec 100644
--- a/test-browser/tests/solidityUnittests.js
+++ b/test-browser/tests/solidityUnittests.js
@@ -105,6 +105,7 @@ module.exports = {
     .pause(10000)
     .waitForElementPresent('*[data-id="testTabSolidityUnitTestsOutput"]')
     .assert.containsText('*[data-id="testTabSolidityUnitTestsOutput"]', 'SyntaxError: No visibility specified')
+    .assert.containsText('*[data-id="testTabTestsExecutionStoppedError"]', 'The test execution has been stopped because of error in your test file')
   },
 
   'Should fail on deploy': function (browser) {

From ba8cbc47b0d856acf557d60951899df41c95e9b0 Mon Sep 17 00:00:00 2001
From: LianaHus <liana@ethdev.com>
Date: Wed, 29 Apr 2020 11:57:42 +0200
Subject: [PATCH 3/6] added(s)

---
 src/app/tabs/test-tab.js                | 2 +-
 test-browser/tests/solidityUnittests.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/tabs/test-tab.js b/src/app/tabs/test-tab.js
index 968ac20577..ba7a4f8f0d 100644
--- a/src/app/tabs/test-tab.js
+++ b/src/app/tabs/test-tab.js
@@ -486,7 +486,7 @@ module.exports = class TestTab extends ViewPlugin {
     this.onActivationInternal()
     this.testsOutput = yo`<div class="mx-3 mb-2 pb-4 border-top border-primary" hidden='true' id="solidityUnittestsOutput" data-id="testTabSolidityUnitTestsOutput"></a>`
     this.testsExecutionStopped = yo`<label class="text-warning h6" data-id="testTabTestsExecutionStopped">The test execution has been stopped</label>`
-    this.testsExecutionStoppedError = yo`<label class="text-danger h6" data-id="testTabTestsExecutionStoppedError">The test execution has been stopped because of error in your test file</label>`
+    this.testsExecutionStoppedError = yo`<label class="text-danger h6" data-id="testTabTestsExecutionStoppedError">The test execution has been stopped because of error(s) in your test file</label>`
     this.testsExecutionStopped.hidden = true
     this.testsExecutionStoppedError.hidden = true
     this.resultStatistics = this.createResultLabel()
diff --git a/test-browser/tests/solidityUnittests.js b/test-browser/tests/solidityUnittests.js
index ec3e4793ec..6287a69971 100644
--- a/test-browser/tests/solidityUnittests.js
+++ b/test-browser/tests/solidityUnittests.js
@@ -105,7 +105,7 @@ module.exports = {
     .pause(10000)
     .waitForElementPresent('*[data-id="testTabSolidityUnitTestsOutput"]')
     .assert.containsText('*[data-id="testTabSolidityUnitTestsOutput"]', 'SyntaxError: No visibility specified')
-    .assert.containsText('*[data-id="testTabTestsExecutionStoppedError"]', 'The test execution has been stopped because of error in your test file')
+    .assert.containsText('*[data-id="testTabTestsExecutionStoppedError"]', 'The test execution has been stopped because of error(s) in your test file')
   },
 
   'Should fail on deploy': function (browser) {

From 9b7ef1481ffe967d25af5d27f368633d4bc51771 Mon Sep 17 00:00:00 2001
From: LianaHus <liana@ethdev.com>
Date: Wed, 29 Apr 2020 13:02:48 +0200
Subject: [PATCH 4/6] increased test waiting time

---
 test-browser/tests/solidityUnittests.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test-browser/tests/solidityUnittests.js b/test-browser/tests/solidityUnittests.js
index 6287a69971..cab3a3cc6d 100644
--- a/test-browser/tests/solidityUnittests.js
+++ b/test-browser/tests/solidityUnittests.js
@@ -152,7 +152,7 @@ function runTests (browser) {
     .pause(500)
     .scrollAndClick('#runTestsTabRunAction')
     .waitForElementPresent('#solidityUnittestsOutput div[class^="testPass"]')
-    .pause(15000)
+    .pause(20000)
     .assert.containsText('#solidityUnittestsOutput', 'browser/4_Ballot_test.sol')
     .assert.containsText('#solidityUnittestsOutput', '✓ Check winning proposal')
     .assert.containsText('#solidityUnittestsOutput', '✓ Check winnin proposal with return value')

From f35a28074a988cd6959c07c408941130eddcc91c Mon Sep 17 00:00:00 2001
From: LianaHus <liana@ethdev.com>
Date: Wed, 29 Apr 2020 13:39:28 +0200
Subject: [PATCH 5/6] more time

---
 test-browser/tests/solidityUnittests.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test-browser/tests/solidityUnittests.js b/test-browser/tests/solidityUnittests.js
index cab3a3cc6d..2ec38d608f 100644
--- a/test-browser/tests/solidityUnittests.js
+++ b/test-browser/tests/solidityUnittests.js
@@ -152,7 +152,7 @@ function runTests (browser) {
     .pause(500)
     .scrollAndClick('#runTestsTabRunAction')
     .waitForElementPresent('#solidityUnittestsOutput div[class^="testPass"]')
-    .pause(20000)
+    .pause(25000)
     .assert.containsText('#solidityUnittestsOutput', 'browser/4_Ballot_test.sol')
     .assert.containsText('#solidityUnittestsOutput', '✓ Check winning proposal')
     .assert.containsText('#solidityUnittestsOutput', '✓ Check winnin proposal with return value')

From be6524041f2ae4df302040c85d25030862221392 Mon Sep 17 00:00:00 2001
From: LianaHus <liana@ethdev.com>
Date: Wed, 29 Apr 2020 16:17:04 +0200
Subject: [PATCH 6/6] edited test to not wait waist time

---
 src/app/tabs/test-tab.js                |  8 ++++----
 test-browser/tests/solidityUnittests.js | 22 +++++++++++++---------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/app/tabs/test-tab.js b/src/app/tabs/test-tab.js
index ba7a4f8f0d..9ea79c2f92 100644
--- a/src/app/tabs/test-tab.js
+++ b/src/app/tabs/test-tab.js
@@ -136,14 +136,14 @@ module.exports = class TestTab extends ViewPlugin {
       this.rawFileName = result.filename
       this.runningTestFileName = this.cleanFileName(this.rawFileName, this.testSuite)
       this.outputHeader = yo`
-        <div id="${this.runningTestFileName}" class="pt-1">
+        <div id="${this.runningTestFileName}" data-id="testTabSolidityUnitTestsOutputheader" class="pt-1">
           <span class="font-weight-bold">${this.testSuite} (${this.rawFileName})</span>
         </div>
       `
       this.testsOutput.appendChild(this.outputHeader)
     } else if (result.type === 'testPass') {
       this.testsOutput.appendChild(yo`
-        <div id="${this.runningTestFileName}" class="${css.testPass} ${css.testLog} text-success border-0">
+        <div id="${this.runningTestFileName}" data-id="testTabSolidityUnitTestsOutputheader" class="${css.testPass} ${css.testLog} text-success border-0">
           ✓ ${result.value}
         </div>
       `)
@@ -181,7 +181,7 @@ module.exports = class TestTab extends ViewPlugin {
       `
 
       this.outputHeader && yo.update(this.outputHeader, yo`
-        <div id="${this.runningTestFileName}" class="pt-1">
+        <div id="${this.runningTestFileName}" data-id="testTabSolidityUnitTestsOutputheader" class="pt-1">
           ${label} <span class="font-weight-bold">${this.testSuite} (${this.rawFileName})</span>
         </div>
       `)
@@ -196,7 +196,7 @@ module.exports = class TestTab extends ViewPlugin {
       `
 
       this.outputHeader && yo.update(this.outputHeader, yo`
-        <div id="${this.runningTestFileName}" class="pt-1">
+        <div id="${this.runningTestFileName}"  data-id="testTabSolidityUnitTestsOutputheader" class="pt-1">
           ${label} <span class="font-weight-bold">${this.testSuite} (${this.rawFileName})</span>
         </div>
       `)
diff --git a/test-browser/tests/solidityUnittests.js b/test-browser/tests/solidityUnittests.js
index 2ec38d608f..9f2235ed76 100644
--- a/test-browser/tests/solidityUnittests.js
+++ b/test-browser/tests/solidityUnittests.js
@@ -44,8 +44,9 @@ module.exports = {
     .click('*[data-id="testTabCheckAllTests"]')
     .clickElementAtPosition('.singleTestLabel', 1)
     .scrollAndClick('*[data-id="testTabRunTestsTabRunAction"]')
-    .pause(15000)
-    .assert.containsText('*[data-id="testTabSolidityUnitTestsOutput"]', 'browser/simple_storage_test.sol')
+    .waitForElementPresent('*[data-id="testTabSolidityUnitTestsOutputheader"]', 80000)
+    .pause(5000)
+    .assert.containsText('*[data-id="testTabSolidityUnitTestsOutput"]', 'MyTest (browser/simple_storage_test.sol)')
     .assert.containsText('*[data-id="testTabSolidityUnitTestsOutput"]', '✓ Initial value should be100')
     .assert.containsText('*[data-id="testTabSolidityUnitTestsOutput"]', '✓ Value is set200')
     .assert.containsText('*[data-id="testTabSolidityUnitTestsOutput"]', '✘ Should fail for wrong value200')
@@ -63,12 +64,14 @@ module.exports = {
     .click('*[data-id="testTabCheckAllTests"]')
     .clickElementAtPosition('.singleTestLabel', 2)
     .scrollAndClick('*[data-id="testTabRunTestsTabRunAction"]')
-    .pause(20000)
+    .waitForElementPresent('*[data-id="testTabSolidityUnitTestsOutputheader"]', 40000)
+    .pause(5000)
     .assert.containsText('*[data-id="testTabSolidityUnitTestsOutput"]', 'browser/ks2b_test.sol')
     .assert.containsText('*[data-id="testTabSolidityUnitTestsOutput"]', '✓ Check project exists')
     .assert.containsText('*[data-id="testTabSolidityUnitTestsOutput"]', '✘ Check wrong project owner')
     .assert.containsText('*[data-id="testTabSolidityUnitTestsOutput"]', '✘ Check wrong sender')
     .assert.containsText('*[data-id="testTabSolidityUnitTestsOutput"]', '✘ Check wrong value')
+    .pause(5000)
     .assert.containsText('*[data-id="testTabSolidityUnitTestsOutput"]', '✓ Check project is fundable')
     .assert.containsText('*[data-id="testTabSolidityUnitTestsOutput"]', 'owner is incorrect')
     .assert.containsText('*[data-id="testTabSolidityUnitTestsOutput"]', 'wrong sender')
@@ -85,11 +88,11 @@ module.exports = {
     .click('*[data-id="testTabRunTestsTabStopAction"]')
     .pause(2000)
     .assert.containsText('*[data-id="testTabRunTestsTabStopAction"]', 'Stopping')
-    .pause(10000)
+    .waitForElementPresent('*[data-id="testTabSolidityUnitTestsOutputheader"]', 40000)
     .assert.containsText('*[data-id="testTabSolidityUnitTestsOutput"]', 'browser/ks2b_test.sol')
     .notContainsText('*[data-id="testTabSolidityUnitTestsOutput"]', 'browser/4_Ballot_test.sol')
     .notContainsText('*[data-id="testTabSolidityUnitTestsOutput"]', 'browser/simple_storage_test.sol')
-    .pause(5000)
+    .pause(6000)
     .assert.containsText('*[data-id="testTabTestsExecutionStopped"]', 'The test execution has been stopped')
   },
 
@@ -102,7 +105,7 @@ module.exports = {
     .click('*[data-id="testTabCheckAllTests"]')
     .clickElementAtPosition('.singleTestLabel', 3)
     .scrollAndClick('*[data-id="testTabRunTestsTabRunAction"]')
-    .pause(10000)
+    .waitForElementPresent('*[data-id="testTabSolidityUnitTestsOutputheader"]', 40000)
     .waitForElementPresent('*[data-id="testTabSolidityUnitTestsOutput"]')
     .assert.containsText('*[data-id="testTabSolidityUnitTestsOutput"]', 'SyntaxError: No visibility specified')
     .assert.containsText('*[data-id="testTabTestsExecutionStoppedError"]', 'The test execution has been stopped because of error(s) in your test file')
@@ -117,7 +120,7 @@ module.exports = {
     .click('*[data-id="testTabCheckAllTests"]')
     .clickElementAtPosition('.singleTestLabel', 4)
     .scrollAndClick('*[data-id="testTabRunTestsTabRunAction"]')
-    .pause(10000)
+    .waitForElementPresent('*[data-id="testTabSolidityUnitTestsOutputheader"]', 40000)
     .waitForElementPresent('*[data-id="testTabSolidityUnitTestsOutput"]')
     .assert.containsText('*[data-id="testTabSolidityUnitTestsOutput"]', 'contract deployment failed after trying twice')
   },
@@ -131,7 +134,7 @@ module.exports = {
     .click('*[data-id="testTabCheckAllTests"]')
     .clickElementAtPosition('.singleTestLabel', 5)
     .scrollAndClick('*[data-id="testTabRunTestsTabRunAction"]')
-    .pause(15000)
+    .waitForElementPresent('*[data-id="testTabSolidityUnitTestsOutputheader"]', 40000)
     .waitForElementPresent('*[data-id="testTabSolidityUnitTestsOutput"]')
     .assert.containsText('*[data-id="testTabSolidityUnitTestsOutput"]', `Method 'add' can not have parameters inside a test contract`)
   },
@@ -151,8 +154,9 @@ function runTests (browser) {
     .clickLaunchIcon('solidityUnitTesting')
     .pause(500)
     .scrollAndClick('#runTestsTabRunAction')
+    .waitForElementPresent('*[data-id="testTabSolidityUnitTestsOutputheader"]', 40000)
+    .pause(5000)
     .waitForElementPresent('#solidityUnittestsOutput div[class^="testPass"]')
-    .pause(25000)
     .assert.containsText('#solidityUnittestsOutput', 'browser/4_Ballot_test.sol')
     .assert.containsText('#solidityUnittestsOutput', '✓ Check winning proposal')
     .assert.containsText('#solidityUnittestsOutput', '✓ Check winnin proposal with return value')