From 5f9732e18b784bb346a9402f8e720b8b18dd6105 Mon Sep 17 00:00:00 2001 From: yann300 Date: Fri, 26 Jun 2020 12:51:43 +0200 Subject: [PATCH] fix e2e tests --- .../app/compiler/compiler-sourceVerifier-fetchAndCompile.js | 2 +- apps/remix-ide/src/app/tabs/debugger-tab.js | 2 +- apps/remix-ide/test-browser/tests/debugger.test.js | 4 ++-- apps/remix-ide/test-browser/tests/runAndDeploy.js | 2 +- apps/remix-ide/test-browser/tests/staticAnalysis.test.js | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/remix-ide/src/app/compiler/compiler-sourceVerifier-fetchAndCompile.js b/apps/remix-ide/src/app/compiler/compiler-sourceVerifier-fetchAndCompile.js index d608a8d061..566a5047ee 100644 --- a/apps/remix-ide/src/app/compiler/compiler-sourceVerifier-fetchAndCompile.js +++ b/apps/remix-ide/src/app/compiler/compiler-sourceVerifier-fetchAndCompile.js @@ -72,7 +72,7 @@ export default class FetchAndCompile extends Plugin { name === 'main' ? 'mainnet' : name // source-verifier api expect "mainnet" and not "main" let data try { - data = await this.call('source-verification', 'fetchByNetwork', contractAddress, name.toLowerCase()) + data = await this.call('sourcify', 'fetchByNetwork', contractAddress, name.toLowerCase()) } catch (e) { setTimeout(_ => this.emit('notFound', contractAddress), 0) // plugin framework returns a time out error although it actually didn't find the source... this.unresolvedAddresses.push(contractAddress) diff --git a/apps/remix-ide/src/app/tabs/debugger-tab.js b/apps/remix-ide/src/app/tabs/debugger-tab.js index 132cf7d1ae..3c15b4a5c9 100644 --- a/apps/remix-ide/src/app/tabs/debugger-tab.js +++ b/apps/remix-ide/src/app/tabs/debugger-tab.js @@ -64,7 +64,7 @@ class DebuggerTab extends ViewPlugin { } ) - this.call('manager', 'activatePlugin', 'source-verification') + this.call('manager', 'activatePlugin', 'sourcify') // this.call('manager', 'activatePlugin', 'udapp') return this.el diff --git a/apps/remix-ide/test-browser/tests/debugger.test.js b/apps/remix-ide/test-browser/tests/debugger.test.js index 65353b055f..4c15e943ac 100644 --- a/apps/remix-ide/test-browser/tests/debugger.test.js +++ b/apps/remix-ide/test-browser/tests/debugger.test.js @@ -70,8 +70,8 @@ module.exports = { .assert.containsText('*[data-id="stepdetail"]', 'execution step: 0') .click('*[data-id="buttonNavigatorJumpNextBreakpoint"]') .pause(2000) - .assert.containsText('*[data-id="stepdetail"]', 'vm trace step: 140') - .assert.containsText('*[data-id="stepdetail"]', 'execution step: 140') + .assert.containsText('*[data-id="stepdetail"]', 'vm trace step: 184') + .assert.containsText('*[data-id="stepdetail"]', 'execution step: 184') .end() }, diff --git a/apps/remix-ide/test-browser/tests/runAndDeploy.js b/apps/remix-ide/test-browser/tests/runAndDeploy.js index 884f54ea11..fb28411e28 100644 --- a/apps/remix-ide/test-browser/tests/runAndDeploy.js +++ b/apps/remix-ide/test-browser/tests/runAndDeploy.js @@ -156,7 +156,7 @@ module.exports = { * - Source Verifier service for fetching the contract code * - Ropsten node for retrieving the trace and storage * - */ + */ 'Should debug Ropsten transaction with source highlighting using the source verifier service and MetaMask': function (browser) { browser.waitForElementPresent('*[data-id="remixIdeSidePanel"]') .waitForElementVisible('*[data-id="remixIdeIconPanel"]', 10000) diff --git a/apps/remix-ide/test-browser/tests/staticAnalysis.test.js b/apps/remix-ide/test-browser/tests/staticAnalysis.test.js index 4ee4183475..33ece096bb 100644 --- a/apps/remix-ide/test-browser/tests/staticAnalysis.test.js +++ b/apps/remix-ide/test-browser/tests/staticAnalysis.test.js @@ -41,7 +41,7 @@ function runTests (browser) { .waitForElementPresent('#staticanalysisresult .warning', 2000, true, function () { listSelectorContains(['Use of tx.origin', 'Fallback function of contract TooMuchGas requires too much gas', - 'TooMuchGas.() : Variables have very similar names test and test1.'], + 'TooMuchGas.() : Variables have very similar names "test" and "test1".'], '#staticanalysisresult .warning', browser, function () { browser.end()