Skip to content

Commit a5cd99d

Browse files
authored
Merge pull request #19 from ethereum/unitTesting-fix
unit testing issue fixed
2 parents d9e2233 + 73ca651 commit a5cd99d

File tree

2 files changed

+12
-21
lines changed

2 files changed

+12
-21
lines changed

apps/remix-ide/src/app/tabs/test-tab.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@ module.exports = class TestTab extends ViewPlugin {
103103

104104
if (eChecked) {
105105
checkAll.checked = true
106-
if ((this.readyTestsNumber === this.runningTestsNumber || this.hasBeenStopped) && document.getElementById('runTestsTabStopAction').innerText === 'Stop') {
106+
const stopBtnInnerText = document.getElementById('runTestsTabStopAction').innerText
107+
if ((this.readyTestsNumber === this.runningTestsNumber || this.hasBeenStopped) && stopBtnInnerText.trim() === 'Stop') {
107108
runBtn.removeAttribute('disabled')
108109
runBtn.setAttribute('title', 'Run tests')
109110
}

apps/remix-ide/test-browser/tests/solidityUnittests.test.js

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ module.exports = {
4343
.addFile('tests/simple_storage_test.sol', sources[0]['browser/tests/simple_storage_test.sol'])
4444
.click('*[data-id="verticalIconsKindsolidityUnitTesting"]')
4545
.waitForElementPresent('*[data-id="testTabCheckAllTests"]')
46-
// .click('*[data-id="testTabCheckAllTests"]') // unselecting all tests disables run button and it is not activated after single test select (remix-project bug/temp test fix)
47-
.clickElementAtPosition('.singleTestLabel', 0)
46+
.click('*[data-id="testTabCheckAllTests"]')
47+
.clickElementAtPosition('.singleTestLabel', 1)
4848
.scrollAndClick('*[data-id="testTabRunTestsTabRunAction"]')
4949
.waitForElementPresent('*[data-id="testTabSolidityUnitTestsOutputheader"]', 80000)
5050
.pause(5000)
@@ -63,9 +63,8 @@ module.exports = {
6363
.addFile('tests/ks2b_test.sol', sources[0]['browser/tests/ks2b_test.sol'])
6464
.click('*[data-id="verticalIconsKindsolidityUnitTesting"]')
6565
.waitForElementPresent('*[data-id="testTabCheckAllTests"]')
66-
// .click('*[data-id="testTabCheckAllTests"]') // unselecting all tests disables run button and it is not activated after single test select (remix-project bug/temp test fix)
67-
.clickElementAtPosition('.singleTestLabel', 0)
68-
.clickElementAtPosition('.singleTestLabel', 1)
66+
.click('*[data-id="testTabCheckAllTests"]')
67+
.clickElementAtPosition('.singleTestLabel', 2)
6968
.scrollAndClick('*[data-id="testTabRunTestsTabRunAction"]')
7069
.waitForElementPresent('*[data-id="testTabSolidityUnitTestsOutputheader"]', 40000)
7170
.pause(5000)
@@ -105,10 +104,8 @@ module.exports = {
105104
.clickLaunchIcon('fileExplorers')
106105
.openFile('browser/tests/compilationError_test.sol')
107106
.clickLaunchIcon('solidityUnitTesting')
108-
// .click('*[data-id="testTabCheckAllTests"]') // unselecting all tests disables run button and it is not activated after single test select (remix-project bug/temp test fix)
109-
.clickElementAtPosition('.singleTestLabel', 0)
110-
.clickElementAtPosition('.singleTestLabel', 1)
111-
.clickElementAtPosition('.singleTestLabel', 2)
107+
.click('*[data-id="testTabCheckAllTests"]')
108+
.clickElementAtPosition('.singleTestLabel', 3)
112109
.scrollAndClick('*[data-id="testTabRunTestsTabRunAction"]')
113110
.waitForElementPresent('*[data-id="testTabSolidityUnitTestsOutputheader"]', 40000)
114111
.waitForElementPresent('*[data-id="testTabSolidityUnitTestsOutput"]')
@@ -122,11 +119,8 @@ module.exports = {
122119
.clickLaunchIcon('fileExplorers')
123120
.openFile('browser/tests/deployError_test.sol')
124121
.clickLaunchIcon('solidityUnitTesting')
125-
// .click('*[data-id="testTabCheckAllTests"]') // unselecting all tests disables run button and it is not activated after single test select (remix-project bug/temp test fix)
126-
.clickElementAtPosition('.singleTestLabel', 0)
127-
.clickElementAtPosition('.singleTestLabel', 1)
128-
.clickElementAtPosition('.singleTestLabel', 2)
129-
.clickElementAtPosition('.singleTestLabel', 3)
122+
.click('*[data-id="testTabCheckAllTests"]')
123+
.clickElementAtPosition('.singleTestLabel', 4)
130124
.scrollAndClick('*[data-id="testTabRunTestsTabRunAction"]')
131125
.waitForElementPresent('*[data-id="testTabSolidityUnitTestsOutputheader"]', 40000)
132126
.waitForElementPresent('*[data-id="testTabSolidityUnitTestsOutput"]')
@@ -139,12 +133,8 @@ module.exports = {
139133
.clickLaunchIcon('fileExplorers')
140134
.openFile('browser/tests/methodFailure_test.sol')
141135
.clickLaunchIcon('solidityUnitTesting')
142-
// .click('*[data-id="testTabCheckAllTests"]')
143-
.clickElementAtPosition('.singleTestLabel', 0)
144-
.clickElementAtPosition('.singleTestLabel', 1)
145-
.clickElementAtPosition('.singleTestLabel', 2)
146-
.clickElementAtPosition('.singleTestLabel', 3)
147-
.clickElementAtPosition('.singleTestLabel', 4)
136+
.click('*[data-id="testTabCheckAllTests"]')
137+
.clickElementAtPosition('.singleTestLabel', 5)
148138
.scrollAndClick('*[data-id="testTabRunTestsTabRunAction"]')
149139
.waitForElementPresent('*[data-id="testTabSolidityUnitTestsOutputheader"]', 40000)
150140
.waitForElementPresent('*[data-id="testTabSolidityUnitTestsOutput"]')

0 commit comments

Comments
 (0)