From 3ad359d73c11eed46ceacd90b1cd2c5c2c9ec421 Mon Sep 17 00:00:00 2001 From: Joseph Izang Date: Wed, 5 Jul 2023 10:43:04 +0100 Subject: [PATCH] replace css selector with xpath in e2e --- .../src/tests/staticAnalysis.test.ts | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/apps/remix-ide-e2e/src/tests/staticAnalysis.test.ts b/apps/remix-ide-e2e/src/tests/staticAnalysis.test.ts index 37f1a87ef2..41c26c6a78 100644 --- a/apps/remix-ide-e2e/src/tests/staticAnalysis.test.ts +++ b/apps/remix-ide-e2e/src/tests/staticAnalysis.test.ts @@ -33,36 +33,36 @@ module.exports = { }, 'run analysis and filter results': function (browser: NightwatchBrowser) { browser - .clickLaunchIcon('filePanel') - .click('*[data-id="treeViewLitreeViewItemcontracts"]') - .click('*[data-id="treeViewLitreeViewItemcontracts/2_Owner.sol"]') - .clickLaunchIcon('solidity') - .click('*[id="compileBtn"]') - .pause(10000) - .clickLaunchIcon('solidityStaticAnalysis') - .click('div#staticAnalysisWrapper > *[id="staticAnalysisRunBtn"]') - .useXpath() - // .waitForElementPresent('div#staticanalysisresult .warning', 5000) - .waitForElementPresent('//*[@id="staticanalysisresult"]', 5000) - .useCss() - // Check warning count - .click('*[data-rb-event-key="remix"]') - .assert.containsText('span#ssaRemixtab > *[data-id="RemixStaticAnalysisErrorCount"]', '1') - .verify.elementPresent('input[name="showLibWarnings"]') - .verify.not.elementPresent('input[name="showLibWarnings"]:checked') - .verify.elementPresent('label[id="headingshowLibWarnings"]') - .click('label[id="headingshowLibWarnings"]') - .pause(1000) - .click('*[data-rb-event-key="remix"]') - .assert.containsText('span#ssaRemixtab > *[data-id="RemixStaticAnalysisErrorCount', '382') - .click('label[id="headingshowLibWarnings"]') - .pause(1000) - .assert.containsText('span#ssaRemixtab > *[data-id="RemixStaticAnalysisErrorCount', '1') - .end() + .clickLaunchIcon('filePanel') + .click('*[data-id="treeViewLitreeViewItemcontracts"]') + .click('*[data-id="treeViewLitreeViewItemcontracts/2_Owner.sol"]') + .clickLaunchIcon('solidity') + .click('*[id="compileBtn"]') + .pause(10000) + .clickLaunchIcon('solidityStaticAnalysis') + .useXpath() + .click('//*[@id="staticAnalysisRunBtn"]') + // .waitForElementPresent('div#staticanalysisresult .warning', 5000) + .waitForElementPresent('//*[@id="staticanalysisresult"]', 5000) + .useCss() + // Check warning count + .click('*[data-rb-event-key="remix"]') + .assert.containsText('span#ssaRemixtab > *[data-id="RemixStaticAnalysisErrorCount"]', '1') + .verify.elementPresent('input[name="showLibWarnings"]') + .verify.not.elementPresent('input[name="showLibWarnings"]:checked') + .verify.elementPresent('label[id="headingshowLibWarnings"]') + .click('label[id="headingshowLibWarnings"]') + .pause(1000) + .click('*[data-rb-event-key="remix"]') + .assert.containsText('span#ssaRemixtab > *[data-id="RemixStaticAnalysisErrorCount', '382') + .click('label[id="headingshowLibWarnings"]') + .pause(1000) + .assert.containsText('span#ssaRemixtab > *[data-id="RemixStaticAnalysisErrorCount', '1') + .end() } } -function runTests (browser: NightwatchBrowser) { +function runTests(browser: NightwatchBrowser) { browser .waitForElementVisible('#icon-panel', 10000) .clickLaunchIcon('solidity') @@ -75,13 +75,13 @@ function runTests (browser: NightwatchBrowser) { '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 + '#staticanalysisresult .warning', + browser ) }) } -function listSelectorContains (textsToFind: string[], selector: string, browser: NightwatchBrowser) { +function listSelectorContains(textsToFind: string[], selector: string, browser: NightwatchBrowser) { browser.execute(function (selector) { const items = document.querySelectorAll(selector) const ret = []