mirror
/
remix-project
mirror of https://github.com/ethereum/remix-project.git
2
0
Fork 0
Code Issues Releases Wiki Activity

Re-enabled syntax highlighting tests

Browse Source
pull/5370/head
ioedeveloper 5 years ago
parent 9eff7b2583
commit 7392c090cd
2 changed files with 37 additions and 38 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      apps/remix-ide/src/app/editor/sourceHighlighter.js
  2. 71
      apps/remix-ide/test-browser/tests/editor.test.js

4
apps/remix-ide/src/app/editor/sourceHighlighter.js
Unescape View File

@ -31,7 +31,7 @@ class SourceHighlighter {
} }
} }
currentSourceLocationFromfileName (lineColumnPos, filePath, style) { async currentSourceLocationFromfileName (lineColumnPos, filePath, style) {
if (this.statementMarker) this._deps.editor.removeMarker(this.statementMarker, this.source) if (this.statementMarker) this._deps.editor.removeMarker(this.statementMarker, this.source)
if (this.fullLineMarker) this._deps.editor.removeMarker(this.fullLineMarker, this.source) if (this.fullLineMarker) this._deps.editor.removeMarker(this.fullLineMarker, this.source)
this.statementMarker = null this.statementMarker = null
@ -40,7 +40,7 @@ class SourceHighlighter {
if (lineColumnPos) { if (lineColumnPos) {
this.source = filePath this.source = filePath
if (this._deps.config.get('currentFile') !== this.source) { if (this._deps.config.get('currentFile') !== this.source) {
this._deps.fileManager.switchFile(this.source) await this._deps.fileManager.switchFile(this.source)
} }
const css = csjs` const css = csjs`

71
apps/remix-ide/test-browser/tests/editor.test.js
Unescape View File

@ -70,44 +70,43 @@ module.exports = {
.checkElementStyle('.ace_comment.ace_doc', 'color', aceThemes.dark.comment) .checkElementStyle('.ace_comment.ace_doc', 'color', aceThemes.dark.comment)
.checkElementStyle('.ace_function', 'color', aceThemes.dark.function) .checkElementStyle('.ace_function', 'color', aceThemes.dark.function)
.checkElementStyle('.ace_variable', 'color', aceThemes.dark.variable) .checkElementStyle('.ace_variable', 'color', aceThemes.dark.variable)
.end()
}, },
// 'Should highlight source code': function (browser) { 'Should highlight source code': function (browser) {
// browser.addFile('sourcehighlight.js', sourcehighlightScript) browser.addFile('sourcehighlight.js', sourcehighlightScript)
// .switchFile('browser/sourcehighlight.js') .switchFile('browser/sourcehighlight.js')
// .executeScript('remix.exeCurrent()') .executeScript('remix.exeCurrent()')
// .editorScroll('down', 60) .editorScroll('down', 60)
// .waitForElementPresent('.highlightLine32') .waitForElementPresent('.highlightLine32')
// .checkElementStyle('.highlightLine32', 'background-color', 'rgb(8, 108, 181)') .checkElementStyle('.highlightLine32', 'background-color', 'rgb(8, 108, 181)')
// .waitForElementPresent('.highlightLine40') .waitForElementPresent('.highlightLine40')
// .checkElementStyle('.highlightLine40', 'background-color', 'rgb(8, 108, 181)') .checkElementStyle('.highlightLine40', 'background-color', 'rgb(8, 108, 181)')
// .waitForElementPresent('.highlightLine50') .waitForElementPresent('.highlightLine50')
// .checkElementStyle('.highlightLine50', 'background-color', 'rgb(8, 108, 181)') .checkElementStyle('.highlightLine50', 'background-color', 'rgb(8, 108, 181)')
// }, },
// 'Should remove 1 highlight from source code': function (browser) { 'Should remove 1 highlight from source code': function (browser) {
// browser.addFile('removeSourcehighlightScript.js', removeSourcehighlightScript) browser.addFile('removeSourcehighlightScript.js', removeSourcehighlightScript)
// .switchFile('browser/removeSourcehighlightScript.js') .switchFile('browser/removeSourcehighlightScript.js')
// .executeScript('remix.exeCurrent()') .executeScript('remix.exeCurrent()')
// .switchFile('browser/3_Ballot.sol') .switchFile('browser/3_Ballot.sol')
// .editorScroll('down', 60) .editorScroll('down', 60)
// .waitForElementNotPresent('.highlightLine32') .waitForElementNotPresent('.highlightLine32')
// .checkElementStyle('.highlightLine40', 'background-color', 'rgb(8, 108, 181)') .checkElementStyle('.highlightLine40', 'background-color', 'rgb(8, 108, 181)')
// .checkElementStyle('.highlightLine50', 'background-color', 'rgb(8, 108, 181)') .checkElementStyle('.highlightLine50', 'background-color', 'rgb(8, 108, 181)')
// }, },
// 'Should remove all highlights from source code': function (browser) { 'Should remove all highlights from source code': function (browser) {
// browser.addFile('removeAllSourcehighlightScript.js', removeAllSourcehighlightScript) browser.addFile('removeAllSourcehighlightScript.js', removeAllSourcehighlightScript)
// .switchFile('browser/removeAllSourcehighlightScript.js') .switchFile('browser/removeAllSourcehighlightScript.js')
// .executeScript('remix.exeCurrent()') .executeScript('remix.exeCurrent()')
// .switchFile('browser/3_Ballot.sol') .switchFile('browser/3_Ballot.sol')
// .editorScroll('down', 60) .editorScroll('down', 60)
// .waitForElementNotPresent('.highlightLine32') .waitForElementNotPresent('.highlightLine32')
// .waitForElementNotPresent('.highlightLine40') .waitForElementNotPresent('.highlightLine40')
// .waitForElementNotPresent('.highlightLine50') .waitForElementNotPresent('.highlightLine50')
// .end() .end()
// }, },
tearDown: sauce tearDown: sauce
} }

Write Preview
Loading…
Cancel
Save