pull/5370/head
yann300 3 years ago committed by Aniket
parent 2149d34ce4
commit be9bb4a466
  1. 23
      apps/remix-ide-e2e/src/tests/remixd.test.ts
  2. 12
      apps/remix-ide/src/app/files/fileManager.js
  3. 2
      apps/remix-ide/src/app/files/fileProvider.js

@ -79,19 +79,18 @@ module.exports = {
.testContracts('test_import_node_modules_with_github_import.sol', sources[4]['test_import_node_modules_with_github_import.sol'], ['ERC20', 'test11'])
},
'Static Analysis run with remixd': function (browser) {
browser.testContracts('Untitled.sol', sources[5]['test_static_analysis_with_remixd_and_hardhat'], ['test5'])
.clickLaunchIcon('solidityStaticAnalysis')
.click('#staticanalysisButton button')
.waitForElementPresent('#staticanalysisresult .warning', 2000, true, function () {
browser
.click('[data-id="staticAnalysisModuleMiscellaneous1"')
.click('[data-id="staticAnalysisModuleMiscellaneous1"')
.getEditorValue((content) => {
browser.assert.ok(content.indexOf(
'function _sendLogPayload(bytes memory payload) private view {') !== -1,
'code has not been loaded')
browser.testContracts('test_static_analysis_with_remixd_and_hardhat.sol', sources[5]['test_static_analysis_with_remixd_and_hardhat.sol'], ['test5'])
.clickLaunchIcon('solidityStaticAnalysis')
.click('#staticanalysisButton button')
.waitForElementPresent('#staticanalysisresult .warning', 2000, true, function () {
browser
.click('[data-id="staticAnalysisModuleMiscellaneous1"')
.getEditorValue((content) => {
browser.assert.ok(content.indexOf(
'function _sendLogPayload(bytes memory payload) private view {') !== -1,
'code has not been loaded')
})
})
})
},
'Run git status': '' + function (browser) {

@ -545,29 +545,29 @@ class FileManager extends Plugin {
/**
* Try to resolve the given file path (the actual path in the file system)
* e.g if it's specified a github link, npm library, or any external content,
* e.g if it's specified a github link, npm library, or any external content,
* it returns the actual path where the content can be found.
* @param {string} file url we are trying to resolve
* @returns {{ string, provider }} file path resolved and its provider.
*/
getPathFromUrl (file) {
getPathFromUrl (file) {
const provider = this.fileProviderOf(file)
if (!provider) throw new Error(`no provider for ${file}`)
return {
return {
file: provider.getPathFromUrl(file) || file, // in case an external URL is given as input, we resolve it to the right internal path
provider
}
}
/**
* Try to resolve the given file URl. opposite of getPathFromUrl *
* Try to resolve the given file URl. opposite of getPathFromUrl
* @param {string} file path we are trying to resolve
* @returns {{ string, provider }} file url resolved and its provider.
*/
getUrlFromPath (file) {
getUrlFromPath (file) {
const provider = this.fileProviderOf(file)
if (!provider) throw new Error(`no provider for ${file}`)
return {
return {
file: provider.getUrlFromPath(file) || file, // in case an external URL is given as input, we resolve it to the right internal path
provider
}

@ -40,7 +40,7 @@ class FileProvider {
}
getUrlFromPath (path) {
if (!path.startsWith(this.type)) path = this.type + '/' + path
if (!path.startsWith(this.type)) path = this.type + '/' + path
return this.providerExternalsStorage.get(path)
}

Loading…
Cancel
Save